Revision: 3225
Author: seba.wagner
Date: Fri Apr 23 05:28:28 2010
Log: Part of Issue 795
http://code.google.com/p/openmeetings/source/detail?r=3225
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Sat Jan 9 11:15:10 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Fri Apr 23 05:28:28 2010
@@ -86,22 +86,27 @@
<conferenceRoomSidebar name="_sidePanel" />
- <conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
+ <basePropertyPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height+22) }"
+ y="${ canvas.height - (this.height) - 28 }"
width="${ canvas.width - parent._sidePanel.width }">
- <!--
- <handler name="onwidth" args="w">
- if ($debug) Debug.write("ON WIDTH",w);
+ <handler name="onisopen" args="o">
+ if ($debug) Debug.write("onisopen",o);
+ if (o) {
+ canvas._chatcontent.doInitByOpen();
+ this.content.setAttribute("visibility","visible");
+ } else {
+ this.content.setAttribute("visibility","hidden");
+ }
</handler>
- -->
- <chatTab name="content" y="40" height="${ parent.height-40 }"
width="${ parent.width }" />
- </conferenceBox>
+ <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
+ width="${ parent.width }" />
+ </basePropertyPanel>
<fixedWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }"
+ y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height+22) }"
/>
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28
}" />
<!--
###############################
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Sat Jan 9 11:15:10 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Fri Apr 23 05:28:28 2010
@@ -86,22 +86,27 @@
<eventRoomSidebar name="_sidePanel" />
- <conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
+ <basePropertyPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height+22) }"
+ y="${ canvas.height - (this.height) - 28 }"
width="${ canvas.width - parent._sidePanel.width }">
- <!--
- <handler name="onwidth" args="w">
- if ($debug) Debug.write("ON WIDTH",w);
+ <handler name="onisopen" args="o">
+ if ($debug) Debug.write("onisopen",o);
+ if (o) {
+ canvas._chatcontent.doInitByOpen();
+ this.content.setAttribute("visibility","visible");
+ } else {
+ this.content.setAttribute("visibility","hidden");
+ }
</handler>
- -->
- <chatTab name="content" y="40" height="${ parent.height-40 }"
width="${ parent.width }" />
- </conferenceBox>
+ <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
+ width="${ parent.width }" />
+ </basePropertyPanel>
<fixedWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }"
+ y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height+22) }"
/>
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28
}" />
<!--
###############################
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Thu Feb 18 05:27:54 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Fri Apr 23 05:28:28 2010
@@ -92,14 +92,31 @@
<!--
Chat Box
- -->
<conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
height="350" x="${ parent._sidePanel.width }"
bgcolor="0xFFFFFF"
y="${ canvas.height - (this.height+22) }"
width="${ canvas.width - parent._sidePanel.width }">
<chatTab name="content" y="40" height="${ parent.height-40 }"
width="${ parent.width }" />
</conferenceBox>
-
+ -->
+
+ <basePropertyPanel name="_chatPanelStrict" labelid="616"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height) - 28 }"
+ width="${ canvas.width - parent._sidePanel.width }">
+ <handler name="onisopen" args="o">
+ if ($debug) Debug.write("onisopen",o);
+ if (o) {
+ canvas._chatcontent.doInitByOpen();
+ this.content.setAttribute("visibility","visible");
+ } else {
+ this.content.setAttribute("visibility","hidden");
+ }
+ </handler>
+ <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
+ width="${ parent.width }" />
+ </basePropertyPanel>
+
</class>
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Sat Apr 10 04:43:25 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Fri Apr 23 05:28:28 2010
@@ -90,22 +90,27 @@
<retrictedRoomSidebar name="_sidePanel" restricted="true"
listType="eventUserListTableWithNames" />
- <conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
+ <basePropertyPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height+22) }"
+ y="${ canvas.height - (this.height) - 28 }"
width="${ canvas.width - parent._sidePanel.width }">
- <!--
- <handler name="onwidth" args="w">
- if ($debug) Debug.write("ON WIDTH",w);
+ <handler name="onisopen" args="o">
+ if ($debug) Debug.write("onisopen",o);
+ if (o) {
+ canvas._chatcontent.doInitByOpen();
+ this.content.setAttribute("visibility","visible");
+ } else {
+ this.content.setAttribute("visibility","hidden");
+ }
</handler>
- -->
- <chatTab name="content" y="40" height="${ parent.height-40 }"
width="${ parent.width }" />
- </conferenceBox>
+ <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
+ width="${ parent.width }" />
+ </basePropertyPanel>
<fixedWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height+22) }"
/>
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28
}" />
<!--
###############################
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
Fri Apr 23 05:28:28 2010
@@ -6,14 +6,26 @@
<class name="chatOutput" extends="view" height="${ parent.height-2 }"
clip="true" bgcolor="0xFFFFFF" width="${ parent.width-2 }" >
+ <attribute name="isAlreadyLoaded" value="false" type="boolean"/>
<!---
Invoked from VideoContainer cause domain/room must be set first
-->
<method name="doInit">
//Debug.write("oninit");
<![CDATA[
- this._cbtext.clearChatOutput();
- this.getRoomChatHistory.doCall();
+ //this._cbtext.clearChatOutput();
+ //this.getRoomChatHistory.doCall();
+ ]]>
+ </method>
+
+ <method name="doInitByOpen">
+ //Debug.write("oninit");
+ <![CDATA[
+ if (!this.isAlreadyLoaded) {
+ this.isAlreadyLoaded = true;
+ this._cbtext.clearChatOutput();
+ this.getRoomChatHistory.doCall();
+ }
]]>
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Sun Jan 31 05:20:37 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Fri Apr 23 05:28:28 2010
@@ -203,6 +203,20 @@
return this[objName];
</method>
+ <method name="getBaseObjectByName" args="bName">
+ <![CDATA[
+
//Debug.write("getModusItems: ",modi,this.baseactionobjectList);
+ //Debug.write("this.baseactionobjectList: ",modi);
+ for (var eg=0;eg<this.baseactionobjectList.length;eg++){
+
//Debug.write("this.baseactionobjectList[eg][0]==modi",this.baseactionobjectList[eg][0],modi);
+ if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==bName)
{
+ return this.baseactionobjectList[eg];
+ }
+ }
+ return null;
+ ]]>
+ </method>
+
<method name="deleteItemByName" args="objName">
<![CDATA[
this[objName].destroy();
@@ -832,9 +846,129 @@
]]>
</method>
-
-
-
+ <method name="getSWFDocumentStatus">
+ <![CDATA[
+
+ for (var i=0;i<this.baseactionobjectList.length;i++) {
+
+ if (this.baseactionobjectList[i][0] == "swf") {
+
+ var tSWF = new Object();
+
+ tSWF.name =
this.baseactionobjectList[i][this.baseactionobjectList[i].length-1];
+ tSWF.slide = this.baseactionobjectList[i][8];
+ tSWF.isVisible = true;
+
+ return tSWF;
+ }
+
+ }
+
+ return null;
+ ]]>
+ </method>
+
+ <method name="checkSWFDocumentStatus" args="swfObj">
+ <![CDATA[
+
+ if (swfObj != null) {
+
+ var swfBaseObj = this.getBaseObjectByName(swfObj.name);
+
+ if (swfBaseObj != null) {
+
+ if (swfObj.slide == swfBaseObj[8]) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ }
+
+ return true;
+ ]]>
+ </method>
+
+ <method name="doSWFDocumentStatus" args="refObj,swfObj">
+ <![CDATA[
+
+ if (swfObj != null) {
+
+ if (swfObj.isVisible) {
+
+ refObj.setAttribute("visibility","visible");
+
+ } else {
+
+ refObj.setAttribute("visibility","hidden");
+
+ }
+
+ } else {
+
+ refObj.setAttribute("visibility","visible");
+
+ }
+
+ ]]>
+ </method>
+
+ <method name="updateObjectsToSlideNumber" args="baseObject">
+ <![CDATA[
+
+ var baseObjectName = baseObject[baseObject.length-1];
+ var slidesNumber = baseObject[8];
+
+ if ($debug)
Debug.write("updateObjectsToSlideNumber :: ",baseObjectName,slidesNumber)
+
+ for (var i=0;i<this.baseactionobjectList.length;i++) {
+
+ if (this.baseactionobjectList[i][0] == "ellipse"
+ || this.baseactionobjectList[i][0] == "drawarrow"
+ || this.baseactionobjectList[i][0] == "line"
+ || this.baseactionobjectList[i][0] == "paint"
+ || this.baseactionobjectList[i][0] == "rectangle"
+ || this.baseactionobjectList[i][0] == "uline"
+ || this.baseactionobjectList[i][0] == "image") {
+
+ var swfObj =
this.baseactionobjectList[i][this.baseactionobjectList[i].length-7];
+ if ($debug) Debug.write("swfObj :: ",swfObj);
+
+ if (swfObj != null) {
+
+ if (swfObj.name == baseObjectName) {
+
+ if (swfObj.slide == slidesNumber) {
+
+ swfObj.isVisible = true;
+
+
this.baseactionobjectList[i][this.baseactionobjectList[i].length-7] =
swfObj;
+
+
this[this.baseactionobjectList[i][this.baseactionobjectList[i].length-1]].setAttribute("visibility","visible");
+
+ } else {
+
+ swfObj.isVisible = false;
+
+
this.baseactionobjectList[i][this.baseactionobjectList[i].length-7] =
swfObj;
+
+
this[this.baseactionobjectList[i][this.baseactionobjectList[i].length-1]].setAttribute("visibility","hidden");
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ ]]>
+ </method>
+
</class>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
Fri Apr 16 00:31:19 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
Fri Apr 23 05:28:28 2010
@@ -244,7 +244,7 @@
this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,
this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,
this.syncImageRefObj.room,this.syncImageRefObj.domain,
- false,this.syncImageRefObj.uniqueObjectSyncName);
+
false,this.syncImageRefObj.uniqueObjectSyncName,this.getSWFDocumentStatus());
</handler>
<!--- @keywords deprecated
@@ -261,8 +261,9 @@
actionObject[6],actionObject[7]);
</method>
- <method name="registerNewImage"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,doCallUpdate,uniqueObjectSyncName">
+ <method name="registerNewImage"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,doCallUpdate,uniqueObjectSyncName,swfObj">
if ($debug) Debug.write("registerNewImage doCallUpdate:
",doCallUpdate);
+ if ($debug) Debug.write("registerNewImage swfObj: ",swfObj);
var actionObject = new Array();
actionObject.push('image');
actionObject.push(urlname);
@@ -273,12 +274,13 @@
actionObject.push(room);
actionObject.push(domain);
actionObject.push(uniqueObjectSyncName);
- actionObject.push(this.counter);
- actionObject.push(posx);
- actionObject.push(posy);
- actionObject.push(width);
- actionObject.push(height);
- actionObject.push(this.currentlayer.name);
+ actionObject.push(swfObj);//-7
+ actionObject.push(this.counter);//-6
+ actionObject.push(posx);//-5
+ actionObject.push(posy);//-4
+ actionObject.push(width);//-3
+ actionObject.push(height);//-2
+ actionObject.push(this.currentlayer.name);//-1
this.baseactionobjectList.push(actionObject);
this.checkStepLayers();
if (doCallUpdate) this.onsharedMessage('draw',actionObject);
@@ -303,7 +305,7 @@
this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,
this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,
this.syncImageRefObj.room,this.syncImageRefObj.domain,
- true,this.syncImageRefObj.uniqueObjectSyncName);
+
true,this.syncImageRefObj.uniqueObjectSyncName,this.getSWFDocumentStatus());
</method>
@@ -326,7 +328,7 @@
this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,
this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,
this.syncImageRefObj.room,this.syncImageRefObj.domain,
- false,this.syncImageRefObj.uniqueObjectSyncName);
+
false,this.syncImageRefObj.uniqueObjectSyncName,this.getSWFDocumentStatus());
//This invokes a Method which is in the remoteWhiteboard.lzx
this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
this.sendCompletedObjectSyncEvent.doCall();
@@ -383,7 +385,13 @@
this.imageSyncMessageText =
canvas.getLabelName(this.imageSyncMessageId);
//now send notifications to connected clients
this.setAttribute('drawmodus','image');
-
this.registerNewImage(this.syncImageRefObj.src,this.syncImageRefObj.x,this.syncImageRefObj.y,this.syncImageRefObj.width,this.syncImageRefObj.height,this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,this.syncImageRefObj.room,this.syncImageRefObj.domain);
+ this.registerNewImage(this.syncImageRefObj.src,
+ this.syncImageRefObj.x,this.syncImageRefObj.y,
+
this.syncImageRefObj.width,this.syncImageRefObj.height,
+
this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,
+
this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,
+
this.syncImageRefObj.room,this.syncImageRefObj.domain,
+ this.getSWFDocumentStatus());
</method>
<!-- after loading the objects check if all connected clients of that
conference
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Apr 16 00:31:19 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Apr 23 05:28:28 2010
@@ -208,13 +208,14 @@
actionObject.push(uniquObjectSyncName);//17
actionObject.push(standardFileName);//18
actionObject.push(fullFit);//19
- actionObject.push(this.counter);
- actionObject.push(posx);
- actionObject.push(posy);
- actionObject.push(width);
- actionObject.push(height);
- actionObject.push(this.currentlayer.name);
- this.baseactionobjectList.push(actionObject);
+ actionObject.push(null);//-8
+ actionObject.push(this.counter);//-7
+ actionObject.push(posx);//-6
+ actionObject.push(posy);//-5
+ actionObject.push(width);//-4
+ actionObject.push(height);//-3
+ actionObject.push(this.currentlayer.name);//-2
+ this.baseactionobjectList.push(actionObject);//-1
this.checkStepLayers();
if (doUpdateMessage) this.onsharedMessage('draw',actionObject);
</method>
@@ -425,6 +426,7 @@
if ($debug) Debug.info("doDocumentAction ::
sendCurrentSWFObject");
this.sendCurrentSWFObject(this.ObjectByName);
+
}
]]>
</method>
@@ -534,6 +536,10 @@
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==objName)
{
////Debug.write("Found
Object: ",this.baseactionobjectList[eg]);
+ var sendSlideObjectUpdate = false;
+ if (this.baseactionobjectList[eg][8] !=
objRef.slideNumber) {
+ sendSlideObjectUpdate = true;
+ }
this.baseactionobjectList[eg][8] = objRef.slideNumber;
this.baseactionobjectList[eg][9] = objRef._swfView.x;
this.baseactionobjectList[eg][10] = objRef._swfView.y;
@@ -545,6 +551,9 @@
var newA = this.baseactionobjectList[eg];
if (newA[0]=='paint') newA[1] = new Array();
this.onsharedMessage('swf',newA);
+ if (sendSlideObjectUpdate) {
+
this.updateObjectsToSlideNumber(this.baseactionobjectList[eg]);
+ }
break;
}
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
Fri Apr 23 05:28:28 2010
@@ -102,12 +102,12 @@
this.currentdrawarrowlinestrokeFill,this.currentdrawarrowlinestrokeDis,
this.currentdrawarrowlinestrokeFillDis,this.currentdrawarrowOpacity,
minx,miny,width,height,
- x1,y1,x2,y2,true);
+ x1,y1,x2,y2,true,this.getSWFDocumentStatus());
//Debug.write("t: ",t);
]]>
</method>
- <method name="drawarrowlineregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,opacity,x,y,width,height,x1,y1,x2,y2,doCall">
+ <method name="drawarrowlineregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,opacity,x,y,width,height,x1,y1,x2,y2,doCall,swfObj">
var actionObject = new Array();
actionObject[0] = 'drawarrow';
actionObject[1] = stroke;
@@ -120,12 +120,13 @@
actionObject[8] = y1;
actionObject[9] = x2;
actionObject[10] = y2;
- actionObject[11] = this.counter;
- actionObject[12] = x;
- actionObject[13] = y;
- actionObject[14] = width;
- actionObject[15] = height;
- actionObject[16] = newName;
+ actionObject[11] = swfObj;//-7
+ actionObject[12] = this.counter;//-6
+ actionObject[13] = x;//-5
+ actionObject[14] = y;//-4
+ actionObject[15] = width;//-3
+ actionObject[16] = height;//-2
+ actionObject[17] = newName;//-1
this.baseactionobjectList.push(actionObject);
if (doCall) this.onsharedMessage('draw',actionObject);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
Fri Apr 23 05:28:28 2010
@@ -63,11 +63,13 @@
this.currentellipsestrokeFill,this.currentellipsestrokeDis,
this.currentellipsestrokeFillDis)
+ //Draw On Object
+
this.drawellipseregisterFinal(this.currentlayer.name,
this.currentellipsestroke,this.currentellipselineWidth,
this.currentellipsestrokeFill,this.currentellipsestrokeDis,
this.currentellipsestrokeFillDis,
- x,y,width,height);
+ x,y,width,height,this.getSWFDocumentStatus());
this.layers.push(this.currentlayer);
this.checkStepLayers();
]]>
@@ -95,6 +97,7 @@
lastActionObject[3],lastActionObject[4],
lastActionObject[5]);
+
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-8]);
</method>
<method name="redrawEllipseItemByScaling" args="objRef">
@@ -112,6 +115,7 @@
<method name="drawellipseHistory"
args="parentObj,x1,y1,x2,y2,stroke,line,fill,strokeDis,fillDis">
<![CDATA[
+
//Debug.write("stroke,line: ",stroke,line);
var rx = (x1+x2)/2;
var ry = (y1+y2)/2;
@@ -158,7 +162,7 @@
]]>
</method>
- <method name="drawellipseregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,x,y,width,height" >
+ <method name="drawellipseregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,x,y,width,height,swfObj" >
var actionObject = new Array();
actionObject[0] = 'ellipse';
actionObject[1] = stroke;
@@ -167,12 +171,13 @@
actionObject[4] = strokeDis;
actionObject[5] = fillDis;
actionObject[6] = this.currentellipseOpacity;
- actionObject[7] = this.counter;
- actionObject[8] = x;
- actionObject[9] = y;
- actionObject[10] = width;
- actionObject[11] = height;
- actionObject[12] = newName;
+ actionObject[7] = swfObj;//-7
+ actionObject[8] = this.counter;//-6
+ actionObject[9] = x;//-5
+ actionObject[10] = y;//-4
+ actionObject[11] = width;//-3
+ actionObject[12] = height;//-2
+ actionObject[13] = newName;//-1
this.baseactionobjectList.push(actionObject);
this.onsharedMessage('draw',actionObject);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
Fri Apr 23 05:28:28 2010
@@ -85,12 +85,12 @@
this.currentlinelineWidth,this.currentlineOpacity,
this.currentlayer.x,this.currentlayer.y,
this.currentlayer.width,this.currentlayer.height,
- x1,y1,x2,y2,true);
+ x1,y1,x2,y2,true,this.getSWFDocumentStatus());
]]>
</method>
- <method name="lineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall">
+ <method name="lineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall,swfObj">
var actionObject = new Array();
actionObject[0] = 'line';
actionObject[1] = stroke;
@@ -100,12 +100,13 @@
actionObject[5] = y1;
actionObject[6] = x2;
actionObject[7] = y2;
- actionObject[8] = this.counter;
- actionObject[9] = x;
- actionObject[10] = y;
- actionObject[11] = width;
- actionObject[12] = height;
- actionObject[13] = newName;
+ actionObject[8] = swfObj;//-7
+ actionObject[9] = this.counter;//-6
+ actionObject[10] = x;//-5
+ actionObject[11] = y;//-4
+ actionObject[12] = width;//-3
+ actionObject[13] = height;//-2
+ actionObject[14] = newName;//-1
this.baseactionobjectList.push(actionObject);
if (doCall) this.onsharedMessage('draw',actionObject);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Fri Apr 23 05:28:28 2010
@@ -112,10 +112,10 @@
]]>
- this.registerFinal();
+ this.registerFinal(this.getSWFDocumentStatus());
</method>
- <method name="registerFinal">
+ <method name="registerFinal" args="swfObj">
var actionObject = new Array();
actionObject[0] = 'paint';
actionObject[1] = this.basetempactionobjectList;
@@ -123,12 +123,13 @@
actionObject[3] = currentlayer.lineWidth;
actionObject[4] = currentlayer.strokeStyle;
actionObject[5] = this.currentlayerOpacity;
- actionObject[6] = this.counter;
- actionObject[7] = currentlayer.x;
- actionObject[8] = currentlayer.y;
- actionObject[9] = currentlayer.width;
- actionObject[10] = currentlayer.height;
- actionObject[11] = this.currentlayer.name;
+ actionObject[6] = swfObj;//-7
+ actionObject[7] = this.counter;//-6
+ actionObject[8] = currentlayer.x;//-5
+ actionObject[9] = currentlayer.y;//-4
+ actionObject[10] = currentlayer.width;//-3
+ actionObject[11] = currentlayer.height;//-2
+ actionObject[12] = this.currentlayer.name;//-1
this.baseactionobjectList.push(actionObject);
this.onsharedMessage('draw',actionObject);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Fri Apr 23 05:28:28 2010
@@ -64,7 +64,7 @@
this.drawrectregisterFinal(this.currentlayer.name,this.currentrectanglestroke,
this.currentrectangleineWidth,this.currentrectanglestrokeFill,
this.currentrectanglestrokeDis,this.currentrectanglestrokeFillDis,
- x,y,width,height);
+ x,y,width,height,this.getSWFDocumentStatus());
this.layers.push(this.currentlayer);
this.checkStepLayers();
]]>
@@ -151,7 +151,7 @@
]]>
</method>
- <method name="drawrectregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,x,y,width,height" >
+ <method name="drawrectregisterFinal"
args="newName,stroke,line,fill,strokeDis,fillDis,x,y,width,height,swfObj" >
Debug.write("drawrectregisterFinal",newName,stroke,line,fill,strokeDis,fillDis,x,y,width,height);
var actionObject = new Array();
actionObject[0] = 'rectangle';
@@ -161,12 +161,13 @@
actionObject[4] = strokeDis;
actionObject[5] = fillDis;
actionObject[6] = this.currentrectangleOpacity;
- actionObject[7] = this.counter;
- actionObject[8] = x;
- actionObject[9] = y;
- actionObject[10] = width;
- actionObject[11] = height;
- actionObject[12] = newName;
+ actionObject[7] = swfObj;//-7
+ actionObject[8] = this.counter;//-6
+ actionObject[9] = x;//-5
+ actionObject[10] = y;//-4
+ actionObject[11] = width;//-3
+ actionObject[12] = height;//-2
+ actionObject[13] = newName;//-1
this.baseactionobjectList.push(actionObject);
this.onsharedMessage('draw',actionObject);
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
Fri Apr 23 05:28:28 2010
@@ -86,12 +86,12 @@
this.currentulinelineWidth,this.currentulineOpacity,
this.currentlayer.x,this.currentlayer.y,
this.currentlayer.width,this.currentlayer.height,
- x1,y1,x2,y2,true);
+ x1,y1,x2,y2,true,this.getSWFDocumentStatus());
]]>
</method>
- <method name="ulineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall">
+ <method name="ulineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall,swfObj">
var actionObject = new Array();
actionObject[0] = 'uline';
actionObject[1] = stroke;
@@ -100,13 +100,14 @@
actionObject[4] = x1
actionObject[5] = y1;
actionObject[6] = x2;
- actionObject[7] = y2;
- actionObject[8] = this.counter;
- actionObject[9] = x;
- actionObject[10] = y;
- actionObject[11] = width;
- actionObject[12] = height;
- actionObject[13] = newName;
+ actionObject[7] = y2;
+ actionObject[8] = swfObj;//-7
+ actionObject[9] = this.counter;//-6
+ actionObject[10] = x;//-5
+ actionObject[11] = y;//-4
+ actionObject[12] = width;//-3
+ actionObject[13] = height;//-2
+ actionObject[14] = newName;//-1
this.baseactionobjectList.push(actionObject);
if (doCall) this.onsharedMessage('draw',actionObject);
</method>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
