Author: solomax
Date: Fri Dec 9 04:55:41 2016
New Revision: 1773320
URL: http://svn.apache.org/viewvc?rev=1773320&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Fri Dec 9 04:55:41 2016
@@ -292,13 +292,13 @@
<!-- This Function is just for refreshing the Session -->
<netRemoteCallHib name="refreshSession"
funcname="userservice.refreshSession" showLoading="false" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<handler name="ondata" args="value">
//if ($debug)
Debug.write("hibRtmpConnection/refreshSession [",value,"]");
lz.Timer.addTimer(parent.refreshDelegate,
canvas.refreshSession);
</handler>
</netRemoteCallHib>
-
+
<netRemoteCallHib name="getsessiondata"
funcname="xmlcrm.getsessiondata" >
<handler name="ondata" args="value">
//The onResult-Handler will be called be the
rtmpconnection
@@ -695,43 +695,43 @@
<netRemoteCallHib name="getCurrentModeratorList"
funcname="getCurrentModeratorList">
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("############
getCurrentModeratorList: ", value);
-
- canvas.analyzeModerationList(value);
-
- canvas.currentModeratorList = value;
- //Update Moderation Flag
- canvas.updateModerationFlag();
-
- var messageAlreadyThrown = false;
-
- //if ($debug) Debug.write("throw event
to drawarea: ", canvas.moderatorStreamID, canvas.ismoderator);
-
- if (this.parent.modus == "conference") {
- if ($debug)
Debug.write("############## start broadcasting ");
-
parent.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
-
parent.setBroadCastingFlag.canVideo = !canvas.currentRoomObj.audioOnly;
-
parent.setBroadCastingFlag.isAllowedToBroadCastAV = true;
-
parent.setBroadCastingFlag.doCall();
- }
-
canvas._drawarea.onopenWhiteBoard.sendEvent();
-
- if ($debug) Debug.write("room ",
canvas.currentRoomObj);
- if ($debug) Debug.write("room.type ",
canvas.currentRoomObj.type);
-
- if (canvas.currentRoomObj.type !=
'restricted') {
- if
(canvas.currentRoomObj.moderated) {
- if (value.length == 0
&& !messageAlreadyThrown){
- new
lz.labelerrorPopup(canvas,{errorlabelid:641});
- }
- } else {
- if (value.length == 0
&& !messageAlreadyThrown){
- new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(498)});
- }
+ <![CDATA[
+ if ($debug) Debug.write("############
getCurrentModeratorList: ", value);
+
+ canvas.analyzeModerationList(value);
+
+ canvas.currentModeratorList = value;
+ //Update Moderation Flag
+ canvas.updateModerationFlag();
+
+ var messageAlreadyThrown = false;
+
+ //if ($debug) Debug.write("throw event to
drawarea: ", canvas.moderatorStreamID, canvas.ismoderator);
+
+ if (this.parent.modus == "conference") {
+ if ($debug) Debug.write("##############
start broadcasting ");
+
parent.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
+ parent.setBroadCastingFlag.canVideo =
!canvas.currentRoomObj.audioOnly;
+
parent.setBroadCastingFlag.isAllowedToBroadCastAV = true;
+ parent.setBroadCastingFlag.doCall();
+ }
+ canvas._drawarea.onopenWhiteBoard.sendEvent();
+
+ if ($debug) Debug.write("room ",
canvas.currentRoomObj);
+ if ($debug) Debug.write("room.type ",
canvas.currentRoomObj.type);
+
+ if (canvas.currentRoomObj.type != 'restricted')
{
+ if (canvas.currentRoomObj.moderated) {
+ if (value.length == 0 &&
!messageAlreadyThrown){
+ new
lz.labelerrorPopup(canvas,{errorlabelid:641});
+ }
+ } else {
+ if (value.length == 0 &&
!messageAlreadyThrown){
+ new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(498)});
}
}
- ]]>
+ }
+ ]]>
</handler>
</netRemoteCallHib>
@@ -810,32 +810,32 @@
this.roomDisconnectUser(value, value.publicSID);
]]>
</method>
-
+
<method name="stopRecordingMessage" args="value">
//The onResult-Handler will be called be the
rtmpconnection
canvas._mymod.recordingUser = null;
canvas._mymod.setMessage();
</method>
-
+
<method name="stopPublishingMessage" args="value">
//The onResult-Handler will be called be the
rtmpconnection
canvas._mymod.publishingObj = null;
canvas._mymod.setMessage();
</method>
-
+
<netRemoteCallHib name="setSyncFlag" funcname="setSyncFlag" >
<handler name="ondata" args="value">
if ($debug) Debug.write("setSyncFlag: ",value);
</handler>
</netRemoteCallHib>
-
+
<netRemoteCallHib name="logicalRoomLeaveDis"
funcname="logicalRoomLeaveDis" >
<handler name="ondata" args="value">
if ($debug) Debug.write("logicalRoomLeaveDis:
",value);
parent.roomDisconnectUser(value,
value.broadCastID);
</handler>
</netRemoteCallHib>
-
+
<method name="setUserStatus" args="ctx,user,o">
<![CDATA[
if (!o || !user) return;
@@ -898,7 +898,7 @@
canvas._drawarea.parent.parent.parent.loadWmlToWhiteboardById(value);
]]>
</method>
-
+
<!--
Adds this User to the List of current Moderators
-->
@@ -1182,11 +1182,11 @@
<netRemoteCallHib name="sendVarsModeratorGeneral"
funcname="sendVarsModeratorGeneral">
<netparam name="vars"><method name="getValue">return
canvas.VarsModeratorGeneral;</method></netparam>
<handler name="ondata" args="value">
- <![CDATA[
+ <![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
//Debug.write("sendVarsModeratorGeneral :
",value);
- ]]>
+ ]]>
</handler>
</netRemoteCallHib>
@@ -1200,15 +1200,15 @@
this.doCall();
</method>
<handler name="ondata" args="value">
- <![CDATA[
+ <![CDATA[
//The onResult-Handler will be called
be the rtmpconnection
if ($debug)
Debug.write("chatservice.sendMessageWithClient getValue : ",value);
- ]]>
+ ]]>
</handler>
</netRemoteCallHib>
-
+
<netRemoteCallHib name="sendMessageWithClient"
funcname="sendMessageWithClient"
- remotecontext="$once{
canvas.thishib }" >
+ remotecontext="$once{ canvas.thishib }" >
<attribute name="messageObj" value="null" />
<method name="sendMessage"
args="typeName,messageObject">
@@ -1236,7 +1236,7 @@
<method name="sendVarsToMessageWithClient" args="value">
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("sendVarsToMessageWithClient :
", value,value.message, value.message[0]);
+ if ($debug) Debug.write("sendVarsToMessageWithClient :
", value, value.message, value.message[0]);
if (value[0] == 'kick' || value.message[0] == 'kick') {
if ($debug) Debug.write("!!!!!! THIS USER GOING
TO BE KICKED");
this.showKickMessage = true;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Fri Dec 9 04:55:41 2016
@@ -236,7 +236,9 @@ the LAST RoomClient Object that has been
<attribute name="echoSuppression" value="true" type="string" />
<!--- Reference to the current active drawarea -->
-<attribute name="_drawarea" value="null" />
+<attribute name="_drawarea" value="null" />
+<attribute name="_wb" value="null" />
+<attribute name="_wbBar" value="null" />
<!--- Username of current user -->
<attribute name="userId" value="0" type="number" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Dec 9 04:55:41 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,11 +30,11 @@
Loads a SWFPresenation to the whiteBoard
-->
<method name="loadSWFPresentationSynced"
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
- var now = new Date();
- //This invokes a Method which is in the remoteWhiteboard.lzx
- this.startNewObjectSyncProcess.isStarting = true;
- this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName
+ now.getTime();
- this.startNewObjectSyncProcess.doCall();
+ var now = new Date();
+ //This invokes a Method which is in the remoteWhiteboard.lzx
+ this.startNewObjectSyncProcess.isStarting = true;
+ this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName
+ now.getTime();
+ this.startNewObjectSyncProcess.doCall();
//if ($debug)
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),
0,0,0,0,
@@ -44,7 +44,7 @@
this.startNewObjectSyncProcess.uniqueObjectSyncName,
standardFileName,this.fullFit);
</method>
-
+
<method name="setCurrentScaleByFullFit" args="scaleFactor">
<![CDATA[
var tScale = Math.round(scaleFactor*100);
@@ -62,7 +62,7 @@
parent.parent.zoombox.setCurrentScaleByFullFit(tScale);
]]>
</method>
-
+
<method name="doUpdateFullFit" args="fullFit,zoom">
<![CDATA[
if (canvas.ismoderator) {
@@ -81,7 +81,7 @@
}
]]>
</method>
-
+
<method name="doUpdateZoom" args="fullFit,zoom">
<![CDATA[
if ($debug) Debug.write("doUpdateZoom ",this.fullFit,zoom);
@@ -101,7 +101,7 @@
}
]]>
</method>
-
+
<method name="doUpdateFullFitAndZoomRemote" args="actionObject">
<![CDATA[
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
@@ -116,7 +116,7 @@
}
]]>
</method>
-
+
<method name="doFullFit" args="v">
<![CDATA[
if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v,
this.ObjectByName);
@@ -132,7 +132,7 @@
}
]]>
</method>
-
+
<method name="checkSWFPresentation"
args="url,fileName,moduleName,parentPath,room,domain,slideNumber">
<![CDATA[
for (var i=0;i<this.baseactionobjectList.length;i++){
@@ -149,13 +149,13 @@
return false;
]]>
</method>
-
+
<!--
alterModus => this is added by the mod not remotely
adds the SWF-Object to the Layer
-->
- <method name="addPresentationToLayer"
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
+ <method name="addPresentationToLayer"
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
<![CDATA[
if ($debug)
Debug.write("addPresentationToLayer",standardFileName);
@@ -178,16 +178,14 @@
, swfUrl: downloadurl
});
- //this.currentlayer._swfView.setSource(downloadurl);
-
- this.addItemToDocumentToolBar();
+ this.getDocumentToolBar().addCurrentObject(this.currentlayer);
this.doUpdateDocumentToolBar();
]]>
- </method>
-
+ </method>
+
<method name="addSWFToLayerHistory"
args="actionObject,refObj,isWmlLoader">
this.isWmlLoaderImage = isWmlLoader;
- this.baseactionobjectList.push(actionObject);
+ this.baseactionobjectList.push(actionObject);
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
actionObject[actionObject.length-5],actionObject[actionObject.length-4],actionObject[actionObject.length-3],
actionObject[actionObject.length-2],false,actionObject[2],actionObject[3],actionObject[4],actionObject[5],
@@ -195,42 +193,42 @@
actionObject[8],actionObject[16],actionObject[11],actionObject[12],actionObject[9],actionObject[10],
actionObject[17],actionObject[18],actionObject[19]);
</method>
-
+
<!--
Invoked by the remote Host, see sendWatchObject in baseDraw.lzx
-->
<method name="addSWFToLayerHistorySynced" args="actionObject,refObj">
- this.baseactionobjectList.push(actionObject);
- this.startNewObjectSyncProcess.isStarting = false;
- this.startNewObjectSyncProcess.uniqueObjectSyncName =
actionObject[17];
- this.startNewObjectSyncProcess.doCall();
-
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
-
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
-
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
- false,
-
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
-
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
-
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
- </method>
-
+ this.baseactionobjectList.push(actionObject);
+ this.startNewObjectSyncProcess.isStarting = false;
+ this.startNewObjectSyncProcess.uniqueObjectSyncName =
actionObject[17];
+ this.startNewObjectSyncProcess.doCall();
+
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
+
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
+ false,
+
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
+
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
+
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
+ </method>
+
<!---
invoke by the initial Loading process in remoteWhiteboard.lzx,
does not invoke any Update Handler
once this object is loaded, it will throw an Update event of
kind
addSWFToLayerHistoryToLocalLoaded
- -->
- <method name="addSWFToLayerHistoryToLocal" args="actionObject,refObj">
- this.baseactionobjectList.push(actionObject);
-
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
-
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
-
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
- false,
-
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
-
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
-
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
- </method>
-
- <method name="registerNewSWF"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
+ -->
+ <method name="addSWFToLayerHistoryToLocal" args="actionObject,refObj">
+ this.baseactionobjectList.push(actionObject);
+
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
+
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
+ false,
+
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
+
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
+
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
+ </method>
+
+ <method name="registerNewSWF"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
var actionObject = new Array();
actionObject.push('swf');//0
actionObject.push(urlname);//1
@@ -262,9 +260,9 @@
actionObject.push(this.currentlayer.name);//-1
this.baseactionobjectList.push(actionObject);
this.checkStepLayers();
- if (doUpdateMessage) this.onsharedMessage('draw',actionObject);
- </method>
-
+ if (doUpdateMessage) this.onsharedMessage('draw',actionObject);
+ </method>
+
<!--
Invoked by the swfResource, if the alterModus = true,
throws an Update-Event to all connected Clients
@@ -274,8 +272,8 @@
this.doRegisterNewSwf(true);
this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
this.sendCompletedObjectSyncEvent.doCall();
- </method>
-
+ </method>
+
<!--
Invoked by the swfResource, if the alterModus = false,
throws NO Update-Event to all connected Clients
@@ -286,21 +284,19 @@
this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
this.sendCompletedObjectSyncEvent.doCall();
</method>
-
- <!--
- TODO: Check Recording
- -->
+
+ <!-- TODO: Check Recording -->
<method name="storeTempValsAndLoadSyncListSWFRecording" args="objRef">
this.syncImageRefObj = objRef;
//This invokes a Method which is in the remoteWhiteboard.lzx
this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
this.sendCompletedObjectSyncEvent.doCall();
- </method>
-
+ </method>
+
<method name="doRegisterNewSwf" args="doUpdateMessage">
//now send notifications to connected clients
this.setAttribute('drawmodus','hand');
-
+
this.registerNewSWF(this.syncImageRefObj.baseurl,this.syncImageRefObj.x,
this.syncImageRefObj.y,this.syncImageRefObj._swfView.width,
this.syncImageRefObj._swfView.height,this.syncImageRefObj.baseurl,
@@ -315,17 +311,17 @@
this.syncImageRefObj.standardFileName,
this.syncImageRefObj.fullFit,
this.getZIndex());
-
+
//set modus to hand so users can directly select that image
this.setModus('swf');
</method>
-
+
<method name="sendSyncNotificationSWF">
this.imageLoadingCompleteMessage = new Array();
this.imageLoadingCompleteMessage[0] = "whiteboard";
this.imageLoadingCompleteMessage[1] = "swfsynccomplete";
this.sendMessageWithClientSWF.doCall();
- </method>
+ </method>
<method name="doDocumentAction" args="action">
<![CDATA[
@@ -385,11 +381,7 @@
}
]]>
</method>
-
- <method name="addItemToDocumentToolBar">
- this.getDocumentToolBar().addCurrentObject(this.currentlayer);
- </method>
-
+
<method name="setCurrentDocumentByToolBar" args="itemRefName">
if (this.boundingIsActive){
if (this.boundingref.objRef.name != itemRefName) {
@@ -398,7 +390,7 @@
}
this.setCurrentDocument(null);
</method>
-
+
<method name="setCurrentDocument" args="itemRefName">
var t = this.getObjectByName(itemRefName);
if (t==null) {
@@ -406,27 +398,27 @@
}
this.ObjectByName = t;
this.doUpdateDocumentToolBar();
-
- if ($debug) Debug.write("setCurrentDocument
",itemRefName,this.ObjectByName);
+
+ if ($debug)
Debug.write("setCurrentDocument",itemRefName,this.ObjectByName);
</method>
-
+
<method name="sendItemToFront" args="itemRefName">
var actionObject = new Array();
actionObject[0] = 'item';
actionObject[1] = itemRefName;
this.onsharedMessage('sendItemToFront',actionObject);
- </method>
-
+ </method>
+
<method name="bringItemToFrontByName" args="itemRefName">
this.ObjectByName = this.getObjectByName(itemRefName);
this.ObjectByName.bringToFront();
</method>
-
+
<method name="doUpdateDocumentToolBarByParticipant" args="itemObjName">
this.ObjectByName = this.getObjectByName(itemObjName);
this.doUpdateDocumentToolBar();
</method>
-
+
<method name="doUpdateDocumentToolBar">
<![CDATA[
var docToolbar = this.getDocumentToolBar();
@@ -435,7 +427,6 @@
docToolbar.parent.parent.ignoreUpdates = true;
if (this["ObjectByName"] && this.ObjectByName != null &&
this.ObjectByName._swfView) {
-
if ($debug) Debug.warn("doUpdateDocumentToolBar
",this.ObjectByName.fullFit);
docToolbar._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
@@ -448,15 +439,15 @@
docToolbar.parent.parent.ignoreUpdates = false;
]]>
</method>
-
+
<method name="doDeleteFromDocumentsBar" args="itemRefName">
this.getDocumentToolBar().removeDocument(itemRefName);
</method>
-
+
<method name="clearDocumentsBar">
this.getDocumentToolBar().clearDocumentsBar();
</method>
-
+
<method name="sendCurrentSWFObject" args="objRef">
<![CDATA[
if ($debug) Debug.write("sendCurrentSWFObject ::
",objRef,objRef.name);
@@ -487,7 +478,7 @@
}
]]>
</method>
-
+
<method name="remoteObjectUpdate" args="lastactionObject">
<![CDATA[
var obj =
this.getObjectByName(lastactionObject[lastactionObject.length-1]);
@@ -524,7 +515,7 @@
}
]]>
</method>
-
+
<method name="remoteUpdateBaseObjectList" args="actionObject">
<![CDATA[
////Debug.write("remoteUpdateBaseObjectList : ",actionObject);
@@ -536,7 +527,7 @@
}
]]>
</method>
-
+
<method name="playVideoSynced"
args="fileId,fileName,flv_width,flv_height">
<![CDATA[
if ($debug) Debug.write("playVideoSynced : ",
fileId,fileName,flv_width,flv_height);
@@ -553,7 +544,7 @@
this.layers.push(this.currentlayer);
]]>
</method>
-
+
<method name="sendNewVideoRemote" args="refObj">
<![CDATA[
if ($debug) Debug.write("sendNewVideoRemote :
",refObj.fileId,refObj.title);
@@ -566,15 +557,15 @@
this.getZIndex());
]]>
</method>
-
+
<method name="flvregisterFinal"
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
var actionObject = new Array();
actionObject[0] = 'flv';
actionObject[1] = fileId;
actionObject[2] = fileName;
actionObject[3] = isPlaying;
- actionObject[4] = flv_width;
- actionObject[5] = flv_height;
+ actionObject[4] = flv_width;
+ actionObject[5] = flv_height;
actionObject[6] = zIndex;//-8
actionObject[7] = null;//-7
actionObject[8] = this.counter;//-6
@@ -583,10 +574,10 @@
actionObject[11] = width;//-3
actionObject[12] = height;//-2
actionObject[13] = newName;//-1
- this.baseactionobjectList.push(actionObject);
+ this.baseactionobjectList.push(actionObject);
this.onsharedMessage('draw',actionObject);
- </method>
-
+ </method>
+
<method name="drawFlvToHistory" args="lastActionObject,parentView">
<![CDATA[
if ($debug) Debug.write("drawFlvToHistory PLAY ::
",lastActionObject[3]);
@@ -604,7 +595,7 @@
this.layers.push(this.currentlayer);
]]>
</method>
-
+
<method name="playFLV" args="refObj,play">
<![CDATA[
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
@@ -619,10 +610,10 @@
}
]]>
</method>
-
+
<method name="playFLVRemote" args="actionObject">
var tObj =
this.getObjectByName(actionObject[actionObject.length-1]);
-
+
if (actionObject[3]) {
tObj.playRemote();
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Fri Dec 9 04:55:41 2016
@@ -68,19 +68,18 @@
showLoading="false" remotecontext="$once{
canvas.thishib }" >
<netparam><method name="getValue">return
parent.parent.objMessage;</method></netparam>
<handler name="ondata" args="value">
- <![CDATA[
+ <![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("sendMessageToMembers
:: ",value);
- ]]>
+ if ($debug) Debug.write("sendMessageToMembers ::
",value);
+ ]]>
</handler>
</netRemoteCallHib>
</class>
<class name="fixedFileExplorerWhiteboardPanel"
extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard
}">
- <attribute name="_bar" value="null" />
-
<handler name="oninit">
canvas._drawarea = this;
+ canvas._wb = this;
</handler>
<handler name="onopenWhiteBoard" >
@@ -114,21 +113,21 @@
</netRemoteCallHib>
<method name="addNewItemSynced" args="whiteboardId, wbName">
- for (var eg in this._bar.subviews) {
- this._bar.subviews[eg].isactive = false;
- this._bar.subviews[eg].onmouseout.sendEvent(null);
-
this._bar.subviews[eg].objRef.setAttribute("visibility","hidden");
+ for (var eg in canvas._wbBar.subviews) {
+ canvas._wbBar.subviews[eg].isactive = false;
+ canvas._wbBar.subviews[eg].onmouseout.sendEvent(null);
+
canvas._wbBar.subviews[eg].objRef.setAttribute("visibility","hidden");
}
var whiteboard = new lz.multiWhiteboardPanel(this,{
whiteboardId:whiteboardId
});
- var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
+ var tWhiteboardBtn = new lz.whiteboardMiniButton(canvas._wbBar,{
objRef:
whiteboard,
- width:
_bar.staticwidth,
+ width:
canvas._wbBar.staticwidth,
isactive: true,
btnName: wbName
});
- this._bar.currentBtn = tWhiteboardBtn;
+ canvas._wbBar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
canvas.whiteboardCount++;
return whiteboard;
@@ -171,9 +170,9 @@
<method name="removeWindow" args="obj">
if ($debug) Debug.write("removeWindow :: ",obj);
- for (var eg in this._bar.subviews) {
- if (this._bar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
-
this._bar.removeObjectSynced(this._bar.subviews[eg]);
+ for (var eg in canvas._wbBar.subviews) {
+ if (canvas._wbBar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
+
canvas._wbBar.removeObjectSynced(canvas._wbBar.subviews[eg]);
canvas.whiteboardCount--;
return;
}
@@ -182,11 +181,11 @@
<method name="renameWhiteboard" args="obj">
if ($debug) Debug.write("renameWhiteboard :: ", obj);
- for (var eg in this._bar.subviews) {
- var btn = this._bar.subviews[eg];
+ for (var eg in canvas._wbBar.subviews) {
+ var btn = canvas._wbBar.subviews[eg];
if (btn.objRef.whiteboardId == obj[1]) {
btn.setAttribute('btnName', obj[2]);
- return;
+ break;
}
}
</method>
@@ -224,9 +223,9 @@
<method name="activateWhiteboard" args="obj">
if ($debug) Debug.write("activateWhiteboard :: ",obj);
- for (var eg in this._bar.subviews) {
- if (this._bar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
- this._bar.subviews[eg].activateSynced();
+ for (var eg in canvas._wbBar.subviews) {
+ if (canvas._wbBar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
+ canvas._wbBar.subviews[eg].activateSynced();
return;
}
}
@@ -274,7 +273,7 @@
<attribute name="whiteboardId" value="-1" type="number"
/>
<handler name="oninit">
- parent.parent._bar = this;
+ canvas._wbBar = this;
</handler>
</whiteboardBarMenu>
<om_hscrollbar name="_scroll" height="0" stepsize="50"/>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Fri Dec 9 04:55:41 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +19,7 @@
-->
<library>
-
+
<class name="propertyPanel" extends="basePropertyPanel"
width="${ parent.parent.width-1 }" height="80" labelid="843" >
@@ -32,7 +32,7 @@
this._content._widthvalue.setAttribute('text',width);
this._content._heightvalue.setAttribute('text',height);
</method>
-
+
<method name="onUpdateBoundByText">
if (canvas._drawarea.boundingref!=null){
if ($debug) Debug.write("onUpdateBoundByText
boundingref: ",canvas._drawarea.boundingref);
@@ -42,7 +42,7 @@
canvas._drawarea.boundingref.setAttribute('height',Number(this._content._heightvalue.getText()));
}
</method>
-
+
<method name="loadPanelByModus" args="drawArea">
if ($debug) Debug.write("loadPanelByModus drawmodus:
",drawArea.drawmodus);
this.ignoreUpdates = true;
@@ -64,10 +64,10 @@
this._content.changeOpacitySlider.setSliderValue(drawArea.currentulineOpacity*100);
} else if (drawArea.drawmodus == 'drawarrow') {
this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentdrawarrowlinestroke,
- drawArea.currentdrawarrowlinestrokeDis);
+ drawArea.currentdrawarrowlinestrokeDis);
this._content.changeWidthSlider.setSliderValue(drawArea.currentdrawarrowlinelineWidth);
this._content.fillColorChoose.setSelectedColorWithDis(drawArea.currentdrawarrowlinestrokeFill,
- drawArea.currentdrawarrowlinestrokeFillDis);
+ drawArea.currentdrawarrowlinestrokeFillDis);
this._content.changeOpacitySlider.setSliderValue(drawArea.currentdrawarrowOpacity*100);
} else if (drawArea.drawmodus == 'rectangle') {
this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestroke,
@@ -98,36 +98,33 @@
this._content.fillColorChoose.setEnabled(false);
this._content.changeOpacitySlider.setEnabled(false);
}
-
+
if (drawArea.drawmodus == 'letter'){
- this._content._italic.setAttribute('enabled',true);
- this._content._bold.setAttribute('enabled',true);
- } else {
- this._content._italic.setAttribute('enabled',false);
- this._content._bold.setAttribute('enabled',false);
- }
-
+ this._content._italic.setAttribute('enabled',true);
+ this._content._bold.setAttribute('enabled',true);
+ } else {
+ this._content._italic.setAttribute('enabled',false);
+ this._content._bold.setAttribute('enabled',false);
+ }
+
this.ignoreUpdates = false;
</method>
-
+
<method name="loadPanelByBoundingBox" args="drawArea,objRef">
if ($debug) Debug.write("loadPanelByBoundingBox objRef:
",objRef);
-
- this.loadPanelByModus(drawArea);
-
- this.ignoreUpdates = true;
-
- if (objRef.name.indexOf('swf') >= 0) {
-
-
this._content._documentsPanel._currentSlideNo.setAttribute("text",objRef.slideNumber);
-
//this._content._documentsPanel._zoom.setAttribute("text",objRef.currentzoomFactor);
- //this._content._fullFit.setValue(objRef.fullFit);
-
- }
-
+
+ this.loadPanelByModus(drawArea);
+ this.ignoreUpdates = true;
+
+ if (objRef.name.indexOf('swf') >= 0) {
+
this._content._documentsPanel._currentSlideNo.setAttribute("text",objRef.slideNumber);
+
//this._content._documentsPanel._zoom.setAttribute("text",objRef.currentzoomFactor);
+ //this._content._fullFit.setValue(objRef.fullFit);
+ }
+
this.ignoreUpdates = false;
</method>
-
+
<method name="updateProperties">
if (!this.ignoreUpdates){
if (canvas._drawarea.drawmodus == 'paint'){
@@ -144,10 +141,10 @@
canvas._drawarea.currentulineOpacity =
this._content.changeOpacitySlider.initialNumber/100;
} else if (canvas._drawarea.drawmodus == 'drawarrow'){
canvas._drawarea.currentdrawarrowlinestroke =
this._content.lineColorChoose.selectedColor;
- canvas._drawarea.currentdrawarrowlinestrokeDis =
this._content.lineColorChoose.selectedColorDis;
- canvas._drawarea.currentdrawarrowlinestrokeFill =
this._content.fillColorChoose.selectedColor;
- canvas._drawarea.currentdrawarrowlinestrokeFillDis =
this._content.fillColorChoose.selectedColorDis;
- canvas._drawarea.currentdrawarrowlinelineWidth =
this._content.changeWidthSlider.initialNumber;
+ canvas._drawarea.currentdrawarrowlinestrokeDis
= this._content.lineColorChoose.selectedColorDis;
+ canvas._drawarea.currentdrawarrowlinestrokeFill
= this._content.fillColorChoose.selectedColor;
+
canvas._drawarea.currentdrawarrowlinestrokeFillDis =
this._content.fillColorChoose.selectedColorDis;
+ canvas._drawarea.currentdrawarrowlinelineWidth
= this._content.changeWidthSlider.initialNumber;
canvas._drawarea.currentdrawarrowOpacity =
this._content.changeOpacitySlider.initialNumber/100;
} else if (canvas._drawarea.drawmodus == 'rectangle'){
canvas._drawarea.currentrectanglestroke =
this._content.lineColorChoose.selectedColor;
@@ -176,62 +173,57 @@
</method>
<view name="_content" visible="${this.parent.isopen}" >
- <labelTextWidthTooltip name="_xvalueLabel" x="4" y="24"
- labelid="545" labelLabelid="546" />
+ <labelTextWidthTooltip name="_xvalueLabel" x="4" y="24"
labelid="545" labelLabelid="546" />
<customEdittext name="_xvalue" x="24" y="24"
regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_yvalueLabel" x="4" y="52"
- labelid="547" labelLabelid="548" />
+ width="40" text="0" height="24"
+
onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_yvalueLabel" x="4" y="52"
labelid="547" labelLabelid="548" />
<customEdittext name="_yvalue" x="24" y="52" regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_widthvalueLabel" x="68" y="24"
- labelid="549" labelLabelid="550" />
+ width="40" text="0" height="24"
+
onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_widthvalueLabel" x="68" y="24"
labelid="549" labelLabelid="550" />
<customEdittext name="_widthvalue" x="88" y="24"
regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_heightvalueLabel" x="68" y="52"
- labelid="551" labelLabelid="552" />
+ width="40" text="0" height="24"
+
onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_heightvalueLabel" x="68" y="52"
labelid="551" labelLabelid="552" />
<customEdittext name="_heightvalue" x="88" y="52"
regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
-
+ width="40" text="0" height="24"
+
onafterCheck="parent.parent.onUpdateBoundByText()" />
+
<lineColorChoose x="132" y="24" name="lineColorChoose"
boxPosition="up" >
<handler name="onselectedColor" args="sel">
if ($debug) Debug.write("lineColorChoose sel:
",sel);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
</lineColorChoose>
-
+
<fillColorChoose x="132" y="52" name="fillColorChoose"
boxPosition="up" >
<handler name="onselectedColor" args="sel">
if ($debug) Debug.write("fillColorChoose sel:
",sel);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
</fillColorChoose>
-
+
<changeWidthSlider x="222" y="24" name="changeWidthSlider"
boxPosition="up"
initialNumber="2" >
<handler name="oninitialNumber" args="i">
//this.parent.parent.parent._drawareaMask._drawarea.setAttribute('currentlayersize',i);
if ($debug) Debug.write("changeWidthSlider
oninitialNumber sel: ",i);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
- </changeWidthSlider>
-
+ </changeWidthSlider>
+
<changeWidthSlider x="222" y="52" name="changeOpacitySlider"
labelid="553" boxPosition="up"
initialNumber="100" >
<handler name="oninitialNumber" args="i">
//this.parent.parent.parent._drawareaMask._drawarea.setAttribute('currentlayersize',i);
if ($debug) Debug.write("changeOpacitySlider
oninitialNumber sel: ",i);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
- </changeWidthSlider>
+ </changeWidthSlider>
<propertyPanelLetterButton name="_italic" x="286" y="24"
labelid="86" itemResourceName="italic" />
@@ -247,84 +239,78 @@
<attribute name="sendSelection" value="true"
type="boolean"/>
<handler name="onselect" args="sel">
if (this.sendSelection) {
-
parent.parent.parent._drawareaMask._drawarea.setCurrentDocument(sel.value);
+
canvas._drawarea.setCurrentDocument(sel.value);
}
</handler>
</resetCombobox>
<view name="_documentsPanel" x="480" y="52"
layout="axis:x;spacing:2">
<handler name="oninit">
- //if ($debug) Debug.write("oninit: ",this);
-
this._currentSlideNo.setAttribute('text',canvas.currentSlideNo);
-
this._totalSlideNo.setAttribute('text',canvas.currentSlideTotal);
- //this._zoom.setAttribute('text',canvas.currentSlideZoom);
- </handler>
- <handler name="preclose">
- //if ($debug) Debug.write("onclose: ",this);
- canvas.currentSlideNo = Number(this._currentSlideNo.getText());
- canvas.currentSlideTotal =
Number(this._totalSlideNo.getText());
- //canvas.currentSlideZoom = Number(this._zoom.getText());
- </handler>
-
+ //if ($debug) Debug.write("oninit: ",this);
+
this._currentSlideNo.setAttribute('text',canvas.currentSlideNo);
+
this._totalSlideNo.setAttribute('text',canvas.currentSlideTotal);
+
//this._zoom.setAttribute('text',canvas.currentSlideZoom);
+ </handler>
+ <handler name="preclose">
+ //if ($debug) Debug.write("onclose: ",this);
+ canvas.currentSlideNo =
Number(this._currentSlideNo.getText());
+ canvas.currentSlideTotal =
Number(this._totalSlideNo.getText());
+ //canvas.currentSlideZoom =
Number(this._zoom.getText());
+ </handler>
+
<method name="addCurrentObject" args="itemObj">
- //if ($debug) Debug.write("addCurrentObject
",itemObj.fileName,itemObj.name);
- var docName = itemObj.standardFileName;
- if (docName.length == 0) {
- docName = itemObj.fileName;
- }
-
- parent.currentDocument.addItem(docName,itemObj.name);
- parent.currentDocument.sendSelection = false;
- parent.currentDocument.selectItem(itemObj.name);
- parent.currentDocument.sendSelection = true;
-
- parent._clickLayer.setAttribute("visibility","hidden");
- </method>
-
- <method name="removeDocument" args="refItemName">
-
- if ($debug) Debug.warn("removeDocument ",refItemName);
-
- parent.currentDocument.removeItem(refItemName);
- if (parent.currentDocument.getNumItems() != 0) {
- parent.currentDocument.selectItemAt(0);
- parent._clickLayer.setAttribute("visibility","hidden");
- } else {
- parent.currentDocument.clearSelection();
- parent._clickLayer.setAttribute("visibility","visible");
- }
- </method>
-
- <method name="clearDocumentsBar">
- parent.currentDocument.reset();
- parent._clickLayer.setAttribute("visibility","visible");
- </method>
-
- <drawDocumentPanelItem name="b3" modi="doc_first"
resourceItem="doc_first"
- labelid="255" />
- <drawDocumentPanelItem name="b4" modi="doc_pre"
resourceItem="doc_pre"
- labelid="256" />
- <drawDocumentPanelItem name="b5" modi="doc_next"
resourceItem="doc_next"
- labelid="257" />
- <drawDocumentPanelItem name="b6" modi="doc_last"
resourceItem="doc_last"
- labelid="258" />
-
- <customEdittext name="_currentSlideNo" width="40" height="24"
regexpType="number" >
- <handler name="onblur">
- if (parent.parent.parent.ignoreUpdates) {
- if ($debug) Debug.write("ignoreUpdates -- ");
- return;
- }
-
parent.parent.parent.parent._drawareaMask._drawarea.setCurrentDocumentByToolBar(parent.parent.currentDocument.getValue());
-
parent.parent.parent.parent._drawareaMask._drawarea.newSlideNumber =
Number(this.getText());
-
parent.parent.parent.parent._drawareaMask._drawarea.doDocumentAction("setSlideNumber");
- </handler>
- </customEdittext>
- <labelText y="6" labelid="254" />
- <labelText name="_totalSlideNo" y="6" width="40" />
-
+ //if ($debug) Debug.write("addCurrentObject
",itemObj.fileName,itemObj.name);
+ var docName = itemObj.standardFileName;
+ if (docName.length == 0) {
+ docName = itemObj.fileName;
+ }
+
+
parent.currentDocument.addItem(docName,itemObj.name);
+ parent.currentDocument.sendSelection = false;
+ parent.currentDocument.selectItem(itemObj.name);
+ parent.currentDocument.sendSelection = true;
+
+
parent._clickLayer.setAttribute("visibility","hidden");
+ </method>
+
+ <method name="removeDocument" args="refItemName">
+ if ($debug) Debug.warn("removeDocument
",refItemName);
+
+ parent.currentDocument.removeItem(refItemName);
+ if (parent.currentDocument.getNumItems() != 0) {
+ parent.currentDocument.selectItemAt(0);
+
parent._clickLayer.setAttribute("visibility","hidden");
+ } else {
+
parent.currentDocument.clearSelection();
+
parent._clickLayer.setAttribute("visibility","visible");
+ }
+ </method>
+
+ <method name="clearDocumentsBar">
+ parent.currentDocument.reset();
+
parent._clickLayer.setAttribute("visibility","visible");
+ </method>
+
+ <drawDocumentPanelItem name="b3" modi="doc_first"
resourceItem="doc_first" labelid="255" />
+ <drawDocumentPanelItem name="b4" modi="doc_pre"
resourceItem="doc_pre" labelid="256" />
+ <drawDocumentPanelItem name="b5" modi="doc_next"
resourceItem="doc_next" labelid="257" />
+ <drawDocumentPanelItem name="b6" modi="doc_last"
resourceItem="doc_last" labelid="258" />
+
+ <customEdittext name="_currentSlideNo" width="40"
height="24" regexpType="number" >
+ <handler name="onblur">
+ if (parent.parent.parent.ignoreUpdates)
{
+ if ($debug)
Debug.write("ignoreUpdates -- ");
+ return;
+ }
+
canvas._drawarea.setCurrentDocumentByToolBar(parent.parent.currentDocument.getValue());
+ canvas._drawarea.newSlideNumber =
Number(this.getText());
+
canvas._drawarea.doDocumentAction("setSlideNumber");
+ </handler>
+ </customEdittext>
+ <labelText y="6" labelid="254" />
+ <labelText name="_totalSlideNo" y="6" width="40" />
</view>
-
+
<!-- 340 -->
<view name="_clickLayer" clickable="true" opacity="0.75" x="340"
width="460" height="$once{ parent.height -
this.y }"
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
Fri Dec 9 04:55:41 2016
@@ -27,7 +27,7 @@
<method name="removeObject" args="btn">
var whiteboardId = btn.objRef.whiteboardId;
this.removeObjectSynced(btn);
- parent.sendRemoveWindow(whiteboardId);
+ canvas._wb.sendRemoveWindow(whiteboardId);
</method>
<method name="removeObjectSynced" args="btn">
@@ -50,17 +50,12 @@
<method name="sendActiveWindowSynced" args="btn">
<![CDATA[
if (this.currentBtn != null){
- this.currentBtn.isactive=false;
- if (this.currentBtn._minimizebtn_mo != null)
this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
- if (this.currentBtn._minimizebtn_dn != null)
this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
+ this.currentBtn.setActive(false);
}
this.currentBtn = btn;
this.currentBtn.objRef.setAttribute("visibility","visible");
this.currentBtn.objRef.bringToFront();
- //if ($debug) Debug.write("sendActiveWindow2:
",this.currentBtn);
-
this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
-
this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
- this.currentBtn.isactive=true;
+ this.currentBtn.setActive(true);
]]>
</method>
</class>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
Fri Dec 9 04:55:41 2016
@@ -52,6 +52,12 @@
this.isHidden = false;
</method>
+ <method name="setActive" args="val">
+ isactive = val;
+ if (!!_minimizebtn_mo) _minimizebtn_mo.setAttribute('visible',
!val);
+ if (!!_minimizebtn_dn) _minimizebtn_dn.setAttribute('visible',
val);
+ </method>
+
<method name="calcTextWidth">
<![CDATA[
if (this.isHidden) {
@@ -73,7 +79,9 @@
if (this.isHidden) {
return;
}
- rename();
+ if (this.isactive) {
+ rename();
+ }
this._minimizebtn_mo.setAttribute('visibility','visible');
this._minimizebtn_dn.setAttribute('visibility','hidden');
if ($debug) Debug.write(" :: onclick :: ");
@@ -119,11 +127,11 @@
</handler>
<method name="sendActiveWindow" args="win">
- this.parent.sendActiveWindow(this,win);
+ canvas._wbBar.sendActiveWindow(this,win);
</method>
<method name="activateSynced">
- this.parent.sendActiveWindowSynced(this);
+ canvas._wbBar.sendActiveWindowSynced(this);
</method>
<view name="_minimizebtn_mo" width="${ parent.width-2 }" height="16"
@@ -140,7 +148,7 @@
<method name="rename">
<![CDATA[
- if (this.isactive && canvas.ismoderator) {
+ if (canvas.ismoderator) {
var tWidth = this._text.width;
var _y = this._text.getAttributeRelative("y", canvas);
var _x = this._text.getAttributeRelative("x", canvas);
@@ -201,7 +209,7 @@
<method name="closeWhiteboardConfirmMethod"
args="bool,sharedObjectData">
if ($debug) Debug.write("confirm closeWhiteboard:",
bool);
if (bool) {
- parent.parent.removeObject(parent);
+ canvas._wbBar.removeObject(parent);
}
</method>
<labelTooltip labelid="1364" />
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Fri Dec 9 04:55:41 2016
@@ -509,36 +509,36 @@
<netRemoteCallHib name="getCurrentModeratorList"
funcname="getCurrentModeratorList">
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("############
getCurrentModeratorList: ", value);
-
- canvas.analyzeModerationList(value);
-
- canvas.currentModeratorList = value;
- //Update Moderation Flag
- canvas.updateModerationFlag();
-
- var messageAlreadyThrown = false;
-
- //if ($debug) Debug.write("throw event
to drawarea: ", canvas.moderatorStreamID, canvas.ismoderator);
-
-
canvas._drawarea.onopenWhiteBoard.sendEvent();
-
- if ($debug) Debug.write("room ",
canvas.currentRoomObj);
- if ($debug) Debug.write("room.type ",
canvas.currentRoomObj.type);
-
- if (canvas.currentRoomObj.type !=
'restricted') {
- if
(canvas.currentRoomObj.moderated) {
- if (value.length == 0
&& !messageAlreadyThrown){
- new
lz.labelerrorPopup(canvas,{errorlabelid:641});
- }
- } else {
- if (value.length == 0
&& !messageAlreadyThrown){
- new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(498)});
- }
+ <![CDATA[
+ if ($debug) Debug.write("############
getCurrentModeratorList: ", value);
+
+ canvas.analyzeModerationList(value);
+
+ canvas.currentModeratorList = value;
+ //Update Moderation Flag
+ canvas.updateModerationFlag();
+
+ var messageAlreadyThrown = false;
+
+ //if ($debug) Debug.write("throw event to
drawarea: ", canvas.moderatorStreamID, canvas.ismoderator);
+
+ canvas._drawarea.onopenWhiteBoard.sendEvent();
+
+ if ($debug) Debug.write("room ",
canvas.currentRoomObj);
+ if ($debug) Debug.write("room.type ",
canvas.currentRoomObj.type);
+
+ if (canvas.currentRoomObj.type != 'restricted')
{
+ if (canvas.currentRoomObj.moderated) {
+ if (value.length == 0 &&
!messageAlreadyThrown){
+ new
lz.labelerrorPopup(canvas,{errorlabelid:641});
+ }
+ } else {
+ if (value.length == 0 &&
!messageAlreadyThrown){
+ new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(498)});
}
}
- ]]>
+ }
+ ]]>
</handler>
</netRemoteCallHib>
@@ -610,19 +610,19 @@
this.roomDisconnectUser(value, value.publicSID);
]]>
</method>
-
+
<method name="stopPublishingMessage" args="value">
//The onResult-Handler will be called be the
rtmpconnection
canvas._mymod.publishingObj = null;
canvas._mymod.setMessage();
</method>
-
+
<netRemoteCallHib name="setSyncFlag" funcname="setSyncFlag" >
<handler name="ondata" args="value">
if ($debug) Debug.write("setSyncFlag: ",value);
</handler>
</netRemoteCallHib>
-
+
<method name="setUserStatus" args="ctx,user,o">
<![CDATA[
if (!o || !user) return;
@@ -685,7 +685,7 @@
canvas._drawarea.parent.parent.parent.loadWmlToWhiteboardById(value);
]]>
</method>
-
+
<netRemoteCallHib name="giveExclusiveAudio"
funcname="giveExclusiveAudio">
<attribute name="publicSID" value="0" type="string" />
<netparam><method name="getValue">return
parent.publicSID;</method></netparam>
@@ -910,7 +910,7 @@
</netRemoteCallHib>
<netRemoteCallHib name="sendMessageWithClient"
funcname="sendMessageWithClient"
- remotecontext="$once{
canvas.thishib }" >
+ remotecontext="$once{ canvas.thishib }" >
<attribute name="messageObj" value="null" />
<method name="sendMessage"
args="typeName,messageObject">
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Fri Dec 9 04:55:41 2016
@@ -236,7 +236,9 @@ the LAST RoomClient Object that has been
<attribute name="echoSuppression" value="true" type="string" />
<!--- Reference to the current active drawarea -->
-<attribute name="_drawarea" value="null" />
+<attribute name="_drawarea" value="null" />
+<attribute name="_wb" value="null" />
+<attribute name="_wbBar" value="null" />
<!--- Username of current user -->
<attribute name="userId" value="0" type="number" />
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Dec 9 04:55:41 2016
@@ -1,42 +1,51 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
- language governing permissions and limitations under the License. -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<library>
- <class name="baseDrawObject" extends="baseDrawPointer">
- <!-- it uses some of the attribute's defined in baseDrawImage
-->
- <attribute name="newSlideNumber" value="1" type="number" />
- <attribute name="fullFit" value="true" type="boolean" />
-
- <!-- Invoked by the Library directly Loads a SWFPresenation to
the whiteBoard -->
- <method name="loadSWFPresentationSynced"
-
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
- var now = new Date();
- //This invokes a Method which is in the
remoteWhiteboard.lzx
- this.startNewObjectSyncProcess.isStarting = true;
- this.startNewObjectSyncProcess.uniqueObjectSyncName =
fileName +
- now.getTime();
- this.startNewObjectSyncProcess.doCall();
- //if ($debug)
-
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
-
this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),
+<class name="baseDrawObject" extends="baseDrawPointer">
+ <!-- it uses some of the attribute's defined in baseDrawImage -->
+ <attribute name="newSlideNumber" value="1" type="number" />
+ <attribute name="fullFit" value="true" type="boolean" />
+
+ <!--
+ Invoked by the Library directly
+ Loads a SWFPresenation to the whiteBoard
+ -->
+ <method name="loadSWFPresentationSynced"
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
+ var now = new Date();
+ //This invokes a Method which is in the remoteWhiteboard.lzx
+ this.startNewObjectSyncProcess.isStarting = true;
+ this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName
+ now.getTime();
+ this.startNewObjectSyncProcess.doCall();
+ //if ($debug)
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
+
this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),
0,0,0,0,
true,
url,fileName,moduleName,parentPath,room,domain,slideNumber,
100,0,0,0,0,
this.startNewObjectSyncProcess.uniqueObjectSyncName,
standardFileName,this.fullFit);
- </method>
+ </method>
- <method name="setCurrentScaleByFullFit" args="scaleFactor">
+ <method name="setCurrentScaleByFullFit" args="scaleFactor">
<![CDATA[
var tScale = Math.round(scaleFactor*100);
@@ -52,9 +61,9 @@
parent.parent.zoombox.setCurrentScaleByFullFit(tScale);
]]>
- </method>
+ </method>
- <method name="doUpdateFullFit" args="fullFit,zoom">
+ <method name="doUpdateFullFit" args="fullFit,zoom">
<![CDATA[
if (canvas.ismoderator) {
if ($debug) Debug.write("doUpdateFullFit
",fullFit,zoom);
@@ -71,9 +80,9 @@
this.onsharedMessage('whiteboardObj',actionObject);
}
]]>
- </method>
+ </method>
- <method name="doUpdateZoom" args="fullFit,zoom">
+ <method name="doUpdateZoom" args="fullFit,zoom">
<![CDATA[
if ($debug) Debug.write("doUpdateZoom ",this.fullFit,zoom);
@@ -91,9 +100,9 @@
this.onsharedMessage('whiteboardObj',actionObject);
}
]]>
- </method>
+ </method>
- <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
+ <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
<![CDATA[
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
if ($debug) Debug.write("doUpdateFullFitAndZoomRemote
",actionObject[1],actionObject[2]);
@@ -106,9 +115,9 @@
this.onupdateScale.sendEvent(null);
}
]]>
- </method>
+ </method>
- <method name="doFullFit" args="v">
+ <method name="doFullFit" args="v">
<![CDATA[
if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v,
this.ObjectByName);
@@ -122,10 +131,9 @@
}
}
]]>
- </method>
+ </method>
- <method name="checkSWFPresentation"
-
args="url,fileName,moduleName,parentPath,room,domain,slideNumber">
+ <method name="checkSWFPresentation"
args="url,fileName,moduleName,parentPath,room,domain,slideNumber">
<![CDATA[
for (var i=0;i<this.baseactionobjectList.length;i++){
if (fileName==this.baseactionobjectList[i][3]){
@@ -140,12 +148,14 @@
}
return false;
]]>
- </method>
+ </method>
- <!-- alterModus => this is added by the mod not remotely adds
the SWF-Object
- to the Layer -->
- <method name="addPresentationToLayer"
-
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
+ <!--
+ alterModus => this is added by the mod not remotely
+
+ adds the SWF-Object to the Layer
+ -->
+ <method name="addPresentationToLayer"
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
<![CDATA[
if ($debug) Debug.write("addPresentationToLayer",
standardFileName);
@@ -164,146 +174,152 @@
, swfUrl: downloadurl
});
- this.addItemToDocumentToolBar();
+ this.getDocumentToolBar().addCurrentObject(this.currentlayer);
this.doUpdateDocumentToolBar();
]]>
- </method>
+ </method>
- <method name="addSWFToLayerHistory"
args="actionObject,refObj,isWmlLoader">
- this.isWmlLoaderImage = isWmlLoader;
- this.baseactionobjectList.push(actionObject);
-
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+ <method name="addSWFToLayerHistory"
args="actionObject,refObj,isWmlLoader">
+ this.isWmlLoaderImage = isWmlLoader;
+ this.baseactionobjectList.push(actionObject);
+
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
actionObject[actionObject.length-5],actionObject[actionObject.length-4],actionObject[actionObject.length-3],
actionObject[actionObject.length-2],false,actionObject[2],actionObject[3],actionObject[4],actionObject[5],
actionObject[6],actionObject[7],
actionObject[8],actionObject[16],actionObject[11],actionObject[12],actionObject[9],actionObject[10],
actionObject[17],actionObject[18],actionObject[19]);
- </method>
+ </method>
- <!-- Invoked by the remote Host, see sendWatchObject in
baseDraw.lzx -->
- <method name="addSWFToLayerHistorySynced"
args="actionObject,refObj">
- this.baseactionobjectList.push(actionObject);
- this.startNewObjectSyncProcess.isStarting = false;
- this.startNewObjectSyncProcess.uniqueObjectSyncName =
- actionObject[17];
- this.startNewObjectSyncProcess.doCall();
-
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+ <!--
+ Invoked by the remote Host, see sendWatchObject in baseDraw.lzx
+ -->
+ <method name="addSWFToLayerHistorySynced" args="actionObject,refObj">
+ this.baseactionobjectList.push(actionObject);
+ this.startNewObjectSyncProcess.isStarting = false;
+ this.startNewObjectSyncProcess.uniqueObjectSyncName =
actionObject[17];
+ this.startNewObjectSyncProcess.doCall();
+
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
false,
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
- </method>
+ </method>
- <!--- invoke by the initial Loading process in
remoteWhiteboard.lzx, does
- not invoke any Update Handler once this object is
loaded, it will throw an
- Update event of kind addSWFToLayerHistoryToLocalLoaded
-->
- <method name="addSWFToLayerHistoryToLocal"
args="actionObject,refObj">
- this.baseactionobjectList.push(actionObject);
-
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+ <!---
+ invoke by the initial Loading process in remoteWhiteboard.lzx,
+ does not invoke any Update Handler
+ once this object is loaded, it will throw an Update event of
kind
+ addSWFToLayerHistoryToLocalLoaded
+ -->
+ <method name="addSWFToLayerHistoryToLocal" args="actionObject,refObj">
+ this.baseactionobjectList.push(actionObject);
+
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
false,
actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],
actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
- </method>
+ </method>
- <method name="registerNewSWF"
-
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
- var actionObject = new Array();
- actionObject.push('swf');//0
- actionObject.push(urlname);//1
- actionObject.push(baseurl);//2
- actionObject.push(fileName);//3
- actionObject.push(moduleName);//4
- actionObject.push(parentPath);//5
- actionObject.push(room);//6
- actionObject.push(domain);//7
- actionObject.push(slideNumber);//8
- actionObject.push(innerx);//9
- actionObject.push(innery);//10
- actionObject.push(innerwidth);//11
- actionObject.push(innerheight);//12
- actionObject.push(zoomlevel);//13
- actionObject.push(initwidth);//14
- actionObject.push(initheight);//15
- actionObject.push(currentzoom);//16
- actionObject.push(uniquObjectSyncName);//17
- actionObject.push(standardFileName);//18
- actionObject.push(fullFit);//19
- actionObject.push(zIndex);//-8
- actionObject.push(null);//-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 (doUpdateMessage)
this.onsharedMessage('draw',actionObject);
- </method>
-
- <!-- Invoked by the swfResource, if the alterModus = true,
throws an Update-Event
- to all connected Clients -->
- <method name="storeTempValsAndLoadSyncListSWF" args="objRef">
- this.syncImageRefObj = objRef;
- this.doRegisterNewSwf(true);
- this.sendCompletedObjectSyncEvent.uniqueObjectSyncName
= this.syncImageRefObj.uniqueObjectSyncName;
- this.sendCompletedObjectSyncEvent.doCall();
- </method>
-
- <!-- Invoked by the swfResource, if the alterModus = false,
throws NO Update-Event
- to all connected Clients -->
- <method name="sendLoadNotificationSWF" args="objRef">
- this.syncImageRefObj = objRef;
- this.doRegisterNewSwf(false);
- this.sendCompletedObjectSyncEvent.uniqueObjectSyncName
= this.syncImageRefObj.uniqueObjectSyncName;
- this.sendCompletedObjectSyncEvent.doCall();
- </method>
-
- <!-- TODO: Check Recording -->
- <method name="storeTempValsAndLoadSyncListSWFRecording"
args="objRef">
- this.syncImageRefObj = objRef;
- //This invokes a Method which is in the
remoteWhiteboard.lzx
- this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
- this.syncImageRefObj.uniqueObjectSyncName;
- this.sendCompletedObjectSyncEvent.doCall();
- </method>
-
- <method name="doRegisterNewSwf" args="doUpdateMessage">
- //now send notifications to connected clients
- this.setAttribute('drawmodus','hand');
-
-
this.registerNewSWF(this.syncImageRefObj.baseurl,this.syncImageRefObj.x,
-
this.syncImageRefObj.y,this.syncImageRefObj._swfView.width,
-
this.syncImageRefObj._swfView.height,this.syncImageRefObj.baseurl,
-
this.syncImageRefObj.fileName,this.syncImageRefObj.moduleName,
-
this.syncImageRefObj.parentPath,this.syncImageRefObj.room,
-
this.syncImageRefObj.domain,this.syncImageRefObj.slideNumber,
-
this.syncImageRefObj._swfView.x,this.syncImageRefObj._swfView.y,
-
this.syncImageRefObj._swfView.width,this.syncImageRefObj._swfView.height,
-
this.syncImageRefObj.zoomlevel,this.syncImageRefObj.currentzoomFactor,
-
this.syncImageRefObj.initwidth,this.syncImageRefObj.initheight,
-
this.syncImageRefObj.uniqueObjectSyncName,doUpdateMessage,
- this.syncImageRefObj.standardFileName,
- this.syncImageRefObj.fullFit,
- this.getZIndex());
-
- //set modus to hand so users can directly select that
image
- this.setModus('swf');
- </method>
-
- <method name="sendSyncNotificationSWF">
- this.imageLoadingCompleteMessage = new Array();
- this.imageLoadingCompleteMessage[0] = "whiteboard";
- this.imageLoadingCompleteMessage[1] = "swfsynccomplete";
- this.sendMessageWithClientSWF.doCall();
- </method>
+ <method name="registerNewSWF"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
+ var actionObject = new Array();
+ actionObject.push('swf');//0
+ actionObject.push(urlname);//1
+ actionObject.push(baseurl);//2
+ actionObject.push(fileName);//3
+ actionObject.push(moduleName);//4
+ actionObject.push(parentPath);//5
+ actionObject.push(room);//6
+ actionObject.push(domain);//7
+ actionObject.push(slideNumber);//8
+ actionObject.push(innerx);//9
+ actionObject.push(innery);//10
+ actionObject.push(innerwidth);//11
+ actionObject.push(innerheight);//12
+ actionObject.push(zoomlevel);//13
+ actionObject.push(initwidth);//14
+ actionObject.push(initheight);//15
+ actionObject.push(currentzoom);//16
+ actionObject.push(uniquObjectSyncName);//17
+ actionObject.push(standardFileName);//18
+ actionObject.push(fullFit);//19
+ actionObject.push(zIndex);//-8
+ actionObject.push(null);//-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 (doUpdateMessage) this.onsharedMessage('draw',actionObject);
+ </method>
+
+ <!--
+ Invoked by the swfResource, if the alterModus = true,
+ throws an Update-Event to all connected Clients
+ -->
+ <method name="storeTempValsAndLoadSyncListSWF" args="objRef">
+ this.syncImageRefObj = objRef;
+ this.doRegisterNewSwf(true);
+ this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
+ this.sendCompletedObjectSyncEvent.doCall();
+ </method>
+
+ <!--
+ Invoked by the swfResource, if the alterModus = false,
+ throws NO Update-Event to all connected Clients
+ -->
+ <method name="sendLoadNotificationSWF" args="objRef" >
+ this.syncImageRefObj = objRef;
+ this.doRegisterNewSwf(false);
+ this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
+ this.sendCompletedObjectSyncEvent.doCall();
+ </method>
+
+ <!-- TODO: Check Recording -->
+ <method name="storeTempValsAndLoadSyncListSWFRecording" args="objRef">
+ this.syncImageRefObj = objRef;
+ //This invokes a Method which is in the remoteWhiteboard.lzx
+ this.sendCompletedObjectSyncEvent.uniqueObjectSyncName =
this.syncImageRefObj.uniqueObjectSyncName;
+ this.sendCompletedObjectSyncEvent.doCall();
+ </method>
+
+ <method name="doRegisterNewSwf" args="doUpdateMessage">
+ //now send notifications to connected clients
+ this.setAttribute('drawmodus','hand');
+
+
this.registerNewSWF(this.syncImageRefObj.baseurl,this.syncImageRefObj.x,
+
this.syncImageRefObj.y,this.syncImageRefObj._swfView.width,
+
this.syncImageRefObj._swfView.height,this.syncImageRefObj.baseurl,
+
this.syncImageRefObj.fileName,this.syncImageRefObj.moduleName,
+
this.syncImageRefObj.parentPath,this.syncImageRefObj.room,
+
this.syncImageRefObj.domain,this.syncImageRefObj.slideNumber,
+
this.syncImageRefObj._swfView.x,this.syncImageRefObj._swfView.y,
+
this.syncImageRefObj._swfView.width,this.syncImageRefObj._swfView.height,
+
this.syncImageRefObj.zoomlevel,this.syncImageRefObj.currentzoomFactor,
+
this.syncImageRefObj.initwidth,this.syncImageRefObj.initheight,
+
this.syncImageRefObj.uniqueObjectSyncName,doUpdateMessage,
+ this.syncImageRefObj.standardFileName,
+ this.syncImageRefObj.fullFit,
+ this.getZIndex());
+
+ //set modus to hand so users can directly select that image
+ this.setModus('swf');
+ </method>
+
+ <method name="sendSyncNotificationSWF">
+ this.imageLoadingCompleteMessage = new Array();
+ this.imageLoadingCompleteMessage[0] = "whiteboard";
+ this.imageLoadingCompleteMessage[1] = "swfsynccomplete";
+ this.sendMessageWithClientSWF.doCall();
+ </method>
- <method name="doDocumentAction" args="action">
+ <method name="doDocumentAction" args="action">
<![CDATA[
if ($debug) Debug.info("doDocumentAction :1:
sendCurrentSWFObject ",action);
if (this.ObjectByName.typeOfObject=="swf") {
@@ -360,51 +376,46 @@
this.sendCurrentSWFObject(this.ObjectByName);
}
]]>
- </method>
+ </method>
- <method name="addItemToDocumentToolBar">
-
this.getDocumentToolBar().addCurrentObject(this.currentlayer);
- </method>
-
- <method name="setCurrentDocumentByToolBar" args="itemRefName">
- if (this.boundingIsActive){
- if (this.boundingref.objRef.name !=
- itemRefName) {
- this.boundingref._innerDrag.onmouseup.sendEvent();
- }
+ <method name="setCurrentDocumentByToolBar" args="itemRefName">
+ if (this.boundingIsActive){
+ if (this.boundingref.objRef.name != itemRefName) {
+
this.boundingref._innerDrag.onmouseup.sendEvent();
}
- this.setCurrentDocument(null);
- </method>
+ }
+ this.setCurrentDocument(null);
+ </method>
- <method name="setCurrentDocument" args="itemRefName">
- var t = this.getObjectByName(itemRefName);
- if (t==null) {
+ <method name="setCurrentDocument" args="itemRefName">
+ var t = this.getObjectByName(itemRefName);
+ if (t==null) {
return;
- }
- this.ObjectByName = t;
- this.doUpdateDocumentToolBar();
+ }
+ this.ObjectByName = t;
+ this.doUpdateDocumentToolBar();
- if ($debug)
Debug.write("setCurrentDocument",itemRefName,this.ObjectByName);
- </method>
+ if ($debug)
Debug.write("setCurrentDocument",itemRefName,this.ObjectByName);
+ </method>
- <method name="sendItemToFront" args="itemRefName">
- var actionObject = new Array();
- actionObject[0] = 'item';
- actionObject[1] = itemRefName;
- this.onsharedMessage('sendItemToFront',actionObject);
- </method>
-
- <method name="bringItemToFrontByName" args="itemRefName">
- this.ObjectByName = this.getObjectByName(itemRefName);
- this.ObjectByName.bringToFront();
- </method>
+ <method name="sendItemToFront" args="itemRefName">
+ var actionObject = new Array();
+ actionObject[0] = 'item';
+ actionObject[1] = itemRefName;
+ this.onsharedMessage('sendItemToFront',actionObject);
+ </method>
+
+ <method name="bringItemToFrontByName" args="itemRefName">
+ this.ObjectByName = this.getObjectByName(itemRefName);
+ this.ObjectByName.bringToFront();
+ </method>
- <method name="doUpdateDocumentToolBarByParticipant"
args="itemObjName">
- this.ObjectByName = this.getObjectByName(itemObjName);
- this.doUpdateDocumentToolBar();
- </method>
+ <method name="doUpdateDocumentToolBarByParticipant" args="itemObjName">
+ this.ObjectByName = this.getObjectByName(itemObjName);
+ this.doUpdateDocumentToolBar();
+ </method>
- <method name="doUpdateDocumentToolBar">
+ <method name="doUpdateDocumentToolBar">
<![CDATA[
var docToolbar = this.getDocumentToolBar();
@@ -412,7 +423,6 @@
docToolbar.parent.parent.ignoreUpdates = true;
if (this["ObjectByName"] && this.ObjectByName != null &&
this.ObjectByName._swfView) {
-
if ($debug) Debug.warn("doUpdateDocumentToolBar
",this.ObjectByName.fullFit);
docToolbar._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
@@ -424,17 +434,17 @@
docToolbar.parent.parent.ignoreUpdates = false;
]]>
- </method>
+ </method>
- <method name="doDeleteFromDocumentsBar" args="itemRefName">
- this.getDocumentToolBar().removeDocument(itemRefName);
- </method>
+ <method name="doDeleteFromDocumentsBar" args="itemRefName">
+ this.getDocumentToolBar().removeDocument(itemRefName);
+ </method>
- <method name="clearDocumentsBar">
- this.getDocumentToolBar().clearDocumentsBar();
- </method>
+ <method name="clearDocumentsBar">
+ this.getDocumentToolBar().clearDocumentsBar();
+ </method>
- <method name="sendCurrentSWFObject" args="objRef">
+ <method name="sendCurrentSWFObject" args="objRef">
<![CDATA[
if ($debug) Debug.write("sendCurrentSWFObject ::
",objRef,objRef.name);
var objName = objRef.name;
@@ -463,9 +473,9 @@
}
}
]]>
- </method>
+ </method>
- <method name="remoteObjectUpdate" args="lastactionObject">
+ <method name="remoteObjectUpdate" args="lastactionObject">
<![CDATA[
var obj =
this.getObjectByName(lastactionObject[lastactionObject.length-1]);
@@ -500,9 +510,9 @@
this.updateObjectsToSlideNumber(lastactionObject);
}
]]>
- </method>
+ </method>
- <method name="remoteUpdateBaseObjectList" args="actionObject">
+ <method name="remoteUpdateBaseObjectList" args="actionObject">
<![CDATA[
////Debug.write("remoteUpdateBaseObjectList : ",actionObject);
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
@@ -512,9 +522,9 @@
}
}
]]>
- </method>
+ </method>
- <method name="playVideoSynced"
args="fileId,fileName,flv_width,flv_height">
+ <method name="playVideoSynced"
args="fileId,fileName,flv_width,flv_height">
<![CDATA[
if ($debug) Debug.write("playVideoSynced : ",
fileId,fileName,flv_width,flv_height);
@@ -529,9 +539,9 @@
});
this.layers.push(this.currentlayer);
]]>
- </method>
+ </method>
- <method name="sendNewVideoRemote" args="refObj">
+ <method name="sendNewVideoRemote" args="refObj">
<![CDATA[
if ($debug) Debug.write("sendNewVideoRemote :
",refObj.fileId,refObj.title);
@@ -542,30 +552,29 @@
refObj.flv_height,
this.getZIndex());
]]>
- </method>
+ </method>
- <method name="flvregisterFinal"
-
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
- var actionObject = new Array();
- actionObject[0] = 'flv';
- actionObject[1] = fileId;
- actionObject[2] = fileName;
- actionObject[3] = isPlaying;
- actionObject[4] = flv_width;
- actionObject[5] = flv_height;
- actionObject[6] = zIndex;//-8
- actionObject[7] = null;//-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>
+ <method name="flvregisterFinal"
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
+ var actionObject = new Array();
+ actionObject[0] = 'flv';
+ actionObject[1] = fileId;
+ actionObject[2] = fileName;
+ actionObject[3] = isPlaying;
+ actionObject[4] = flv_width;
+ actionObject[5] = flv_height;
+ actionObject[6] = zIndex;//-8
+ actionObject[7] = null;//-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>
- <method name="drawFlvToHistory"
args="lastActionObject,parentView">
+ <method name="drawFlvToHistory" args="lastActionObject,parentView">
<![CDATA[
if ($debug) Debug.write("drawFlvToHistory PLAY ::
",lastActionObject[3]);
@@ -582,9 +591,9 @@
}
this.layers.push(this.currentlayer);
]]>
- </method>
+ </method>
- <method name="playFLV" args="refObj,play">
+ <method name="playFLV" args="refObj,play">
<![CDATA[
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==refObj.name)
{
@@ -597,18 +606,18 @@
}
}
]]>
- </method>
+ </method>
- <method name="playFLVRemote" args="actionObject">
- var tObj =
this.getObjectByName(actionObject[actionObject.length-1]);
+ <method name="playFLVRemote" args="actionObject">
+ var tObj =
this.getObjectByName(actionObject[actionObject.length-1]);
- if (actionObject[3]) {
+ if (actionObject[3]) {
tObj.playRemote();
- }
- if (!actionObject[3]) {
+ }
+ if (!actionObject[3]) {
tObj.stopRemote();
- }
- </method>
- </class>
+ }
+ </method>
+</class>
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Fri Dec 9 04:55:41 2016
@@ -68,19 +68,18 @@
showLoading="false" remotecontext="$once{
canvas.thishib }" >
<netparam><method name="getValue">return
parent.parent.objMessage;</method></netparam>
<handler name="ondata" args="value">
- <![CDATA[
+ <![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("sendMessageToMembers
:: ",value);
- ]]>
+ if ($debug) Debug.write("sendMessageToMembers ::
",value);
+ ]]>
</handler>
</netRemoteCallHib>
</class>
<class name="fixedFileExplorerWhiteboardPanel"
extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard
}">
- <attribute name="_bar" value="null" />
-
<handler name="oninit">
canvas._drawarea = this;
+ canvas._wb = this;
</handler>
<handler name="onopenWhiteBoard" >
@@ -114,21 +113,21 @@
</netRemoteCallHib>
<method name="addNewItemSynced" args="whiteboardId, wbName">
- for (var eg in this._bar.subviews) {
- this._bar.subviews[eg].isactive = false;
- this._bar.subviews[eg].onmouseout.sendEvent(null);
-
this._bar.subviews[eg].objRef.setAttribute("visibility","hidden");
+ for (var eg in canvas._wbBar.subviews) {
+ canvas._wbBar.subviews[eg].isactive = false;
+ canvas._wbBar.subviews[eg].onmouseout.sendEvent(null);
+
canvas._wbBar.subviews[eg].objRef.setAttribute("visibility","hidden");
}
var whiteboard = new lz.multiWhiteboardPanel(this,{
whiteboardId:whiteboardId
});
- var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
+ var tWhiteboardBtn = new lz.whiteboardMiniButton(canvas._wbBar,{
objRef:
whiteboard,
- width:
_bar.staticwidth,
+ width:
canvas._wbBar.staticwidth,
isactive: true,
btnName: wbName
});
- this._bar.currentBtn = tWhiteboardBtn;
+ canvas._wbBar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
canvas.whiteboardCount++;
return whiteboard;
@@ -171,9 +170,9 @@
<method name="removeWindow" args="obj">
if ($debug) Debug.write("removeWindow :: ",obj);
- for (var eg in this._bar.subviews) {
- if (this._bar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
-
this._bar.removeObjectSynced(this._bar.subviews[eg]);
+ for (var eg in canvas._wbBar.subviews) {
+ if (canvas._wbBar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
+
canvas._wbBar.removeObjectSynced(canvas._wbBar.subviews[eg]);
canvas.whiteboardCount--;
return;
}
@@ -182,11 +181,11 @@
<method name="renameWhiteboard" args="obj">
if ($debug) Debug.write("renameWhiteboard :: ", obj);
- for (var eg in this._bar.subviews) {
- var btn = this._bar.subviews[eg];
+ for (var eg in canvas._wbBar.subviews) {
+ var btn = canvas._wbBar.subviews[eg];
if (btn.objRef.whiteboardId == obj[1]) {
btn.setAttribute('btnName', obj[2]);
- return;
+ break;
}
}
</method>
@@ -224,9 +223,9 @@
<method name="activateWhiteboard" args="obj">
if ($debug) Debug.write("activateWhiteboard :: ",obj);
- for (var eg in this._bar.subviews) {
- if (this._bar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
- this._bar.subviews[eg].activateSynced();
+ for (var eg in canvas._wbBar.subviews) {
+ if (canvas._wbBar.subviews[eg].objRef.whiteboardId ==
obj[1]) {
+ canvas._wbBar.subviews[eg].activateSynced();
return;
}
}
@@ -274,7 +273,7 @@
<attribute name="whiteboardId" value="-1" type="number"
/>
<handler name="oninit">
- parent.parent._bar = this;
+ canvas._wbBar = this;
</handler>
</whiteboardBarMenu>
<om_hscrollbar name="_scroll" height="0" stepsize="50"/>
