Author: solomax
Date: Tue Dec 1 12:05:28 2015
New Revision: 1717403
URL: http://svn.apache.org/viewvc?rev=1717403&view=rev
Log:
[OPENMEETINGS-1279] initial document loading is fixed; code clean-up
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1717403&r1=1717402&r2=1717403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Tue Dec 1 12:05:28 2015
@@ -187,8 +187,9 @@
client.sendVarsToMessageWithClient = this.sendVarsToMessageWithClient;
client.sendVarsToWhiteboardById = this.sendVarsToWhiteboardById;
client.sendVarsToModeratorGeneral = this.sendVarsToModeratorGeneral;
- client.sendObjectSyncFlag = this.sendObjectSyncFlag;
+ client.sendSyncFlag = this.sendSyncFlag;
client.sendSyncCompleteFlag = this.sendSyncCompleteFlag;
+ client.sendObjectSyncFlag = this.sendObjectSyncFlag;
client.sendObjectSyncCompleteFlag = this.sendObjectSyncCompleteFlag;
client.startedRecording = this.startedRecording;
client.loadWmlToWhiteboardById = this.loadWmlToWhiteboardById;
@@ -1566,18 +1567,15 @@
</netRemoteCallHib>
<!-- Whiteboard sync Events -->
- <netRemoteCallHib name="sendSyncFlag" funcname="sendSyncFlag">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("sendSyncFlag: ",value);
- if (canvas.syncWindow == null) {
- canvas.syncWindow = new
lz.syncWin(canvas.main_content._content.inner,{
- labelid:558,labeliderror:559});
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="sendSyncFlag" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("sendSyncFlag: ",value);
+ if (canvas.syncWindow == null) {
+ canvas.syncWindow = new
lz.syncWin(canvas.main_content._content.inner, {labelid: 558, labeliderror:
559});
+ }
+ ]]>
+ </method>
<method name="sendSyncCompleteFlag" args="value">
<![CDATA[
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1717403&r1=1717402&r2=1717403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Tue Dec 1 12:05:28 2015
@@ -441,70 +441,61 @@
</method>
<method name="deleteItemByNameSync" args="objName">
- <![CDATA[
- if ($debug) Debug.write("deleteItemByNameSync :: ",objName);
- this[objName].prepareForDelete.sendEvent();
- this[objName].destroy();
- if (this.boundingref!=null) this.boundingref.removeIt();
-
- var pos = -1;
- for (var eg=0;eg<this.layers.length;eg++){
- if (this.layers[eg]['name']==objName) {
- pos = eg;
- //Debug.write("Found Object in Layer: ",eg);
- this.layers[eg].prepareForDelete.sendEvent();
- this.layers[eg].destroy();
- }
- }
- if (pos!=-1) this.layers.splice(pos, 1);
- //get Item Position
- pos = -1;
- for (var eg=0;eg<this.baseactionobjectList.length;eg++){
- if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==objName)
{
- pos = eg;
- //Debug.write("Found Object: ",eg);
- break;
- }
- }
-
- if ($debug) Debug.write("deleteItemByNameSync Found Object:
",eg);
-
- var newA = this.baseactionobjectList[pos];
-
- for (var eg=0;eg<this.baseactionobjectList.length;eg++){
- if
(this.baseactionobjectList[eg][0]!="pointerWhiteBoard") {
- if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-8]>newA[newA.length-8])
{
-
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-8]-=1;
+ <![CDATA[
+ if ($debug) Debug.write("deleteItemByNameSync :: ", objName);
+ this[objName].prepareForDelete.sendEvent();
+ this[objName].destroy();
+ if (this.boundingref!=null) this.boundingref.removeIt();
+
+ var pos = -1;
+ for (var eg = 0; eg < this.layers.length; ++eg) {
+ if (this.layers[eg]['name'] == objName) {
+ pos = eg;
+ //Debug.write("Found Object in Layer: ",eg);
+ this.layers[eg].prepareForDelete.sendEvent();
+ this.layers[eg].destroy();
+ }
+ }
+ if (pos != -1) this.layers.splice(pos, 1);
+ //get Item Position
+ pos = -1;
+ for (var eg = 0; eg < this.baseactionobjectList.length; ++eg) {
+ if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length - 1] ==
objName) {
+ pos = eg;
+ //Debug.write("Found Object: ", eg);
+ break;
+ }
+ }
+ var newA = null;
+ if (pos != -1) {
+ newA = this.baseactionobjectList[pos];
+
+ for (var eg = 0; eg < this.baseactionobjectList.length;
++eg) {
+ if (this.baseactionobjectList[eg][0] !=
"pointerWhiteBoard") {
+ if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length - 8] >
newA[newA.length - 8]) {
+
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length - 8] -= 1;
}
- }
- }
-
- if (pos!=-1) this.baseactionobjectList.splice(pos, 1);
-
- //if ($debug) Debug.write("this.baseactionobjectList.length:
",this.baseactionobjectList.length);
- //if ($debug) Debug.write("this.layers.length:
",this.layers.length);
-
- if ($debug) Debug.warn("deleteItemByName :: ",objName);
-
- this.checkStepLayers();
-
- if (newA[0] == "swf") {
- this.doDeleteFromDocumentsBar(objName);
- }
-
- return newA;
- ]]>
+ }
+ }
+
+ this.baseactionobjectList.splice(pos, 1);
+
+ if ($debug) Debug.warn("deleteItemByName :: ", objName);
+
+ this.checkStepLayers();
+
+ if (newA[0] == "swf") {
+ this.doDeleteFromDocumentsBar(objName);
+ }
+ }
+ if ($debug) Debug.write("deleteItemByNameSync Found Object: ",
pos, newA);
+ return newA;
+ ]]>
</method>
<method name="UpdateByObject" args="objRef">
<![CDATA[
- //Debug.write("UpdateByObject : ",objRef,objRef.name);
var objName = objRef.name;
- //for (var eg=0;eg<this.layers.length;eg++){
- // if (this.layers[eg]['name']==objName) {
- // //Debug.write("Found Object in Layer:
",this.layers[eg]);
- // }
- //}
var tx = objRef.x;
var ty = objRef.y;
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx?rev=1717403&r1=1717402&r2=1717403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Tue Dec 1 12:05:28 2015
@@ -152,6 +152,7 @@
if ($debug) Debug.write("startNewSyncprocess: ",value);
if (value.publicSID == canvas.publicSID){
if ($debug) Debug.write("currentLoadingItem IS
mine");
+ parent.startInitialLoadingProcess();
}
]]>
</handler>
@@ -163,6 +164,7 @@
//The onResult-Handler will be called be the
rtmpconnection
if ($debug) Debug.write("startNewSyncprocess: ",value);
if ($debug) Debug.write("currentLoadingItem IS mine");
+ parent.startInitialLoadingProcess();
]]>
</handler>
</netRemoteCallHib>
@@ -176,10 +178,10 @@
</handler>
</netRemoteCallHib>
- <method name="startInitialLoadinProcess">
- this.loadObjectDelegate = new LzDelegate( this,
"loadRemoteObject" );
+ <method name="startInitialLoadingProcess">
+ this.loadObjectDelegate = new LzDelegate(this,
"loadRemoteObject");
if (this.loadingObjectList.length != 0){
- lz.Timer.addTimer( this.loadObjectDelegate, 250 );
+ lz.Timer.addTimer(this.loadObjectDelegate, 250);
}
</method>
@@ -187,8 +189,8 @@
<![CDATA[
this.sendRemoteWatchObject(this.loadingObjectList[this.loadingObjectListId]);
this.loadingObjectListId++;
- if (this.loadingObjectListId < this.loadingObjectList.length){
- lz.Timer.addTimer( this.loadObjectDelegate, 250 );
+ if (this.loadingObjectListId < this.loadingObjectList.length) {
+ lz.Timer.addTimer(this.loadObjectDelegate, 250);
} else {
this.sendCompletedSyncEvent.doCall();
this.updateAllObjectsToSlideNumber();
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx?rev=1717403&r1=1717402&r2=1717403&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
Tue Dec 1 12:05:28 2015
@@ -78,7 +78,9 @@
<handler name="onframe" args="i">
if ($debug) Debug.write("onframe",i);
- mc.gotoAndStop(i);
+ if (mc) {
+ mc.gotoAndStop(i);
+ }
</handler>
<handler name="onplay" args="i">
