You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/06/21 18:45:38 UTC
svn commit: r1749587 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/base/
3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/
3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
3.1.x/openmeetings-flash/sr...
Author: solomax
Date: Tue Jun 21 18:45:37 2016
New Revision: 1749587
URL: http://svn.apache.org/viewvc?rev=1749587&view=rev
Log:
[OPENMEETINGS-1422] appointment room is fixed for invited guest
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx
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/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.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/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/components/presenter/guiPresenter.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.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/mainMethods.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/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/components/presenter/guiPresenter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx Tue Jun 21 18:45:37 2016
@@ -160,10 +160,10 @@
<method name="close">
if (this.onclose) this.onclose.sendEvent();
- if (this._barmenuButtonRef!=null){
- this._barmenuButtonRef.destroy();
- this._barmenuButtonRef.parent.onwidth.sendEvent();
- }
+ if (this._barmenuButtonRef != null) {
+ this._barmenuButtonRef.destroy();
+ this._barmenuButtonRef.parent.onwidth.sendEvent();
+ }
this.destroy();
</method>
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -507,7 +507,7 @@
if (canvas.directUserLogin) {
canvas.directRoomObj = value;
canvas.thishib.loaderVar.close();
- } else {
+ } else if (parent.currentInvitation == null) {
canvas.setRoomValues(value);
}
} else {
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Tue Jun 21 18:45:37 2016
@@ -403,6 +403,7 @@
</method>
<method name="setRoomValues" args="roomObj">
+ <![CDATA[
if ($debug) Debug.warn("setRoomValues ",roomObj);
//this is needed cause in the rpc-method *getCurrentModeratorList* we check if its room.type == 'restricted'
//if so we will not show any *There is no Moderator* Warning Dialog
@@ -421,6 +422,7 @@
new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj:roomObj});
}
}
+ ]]>
</method>
<method name="roomClosed">
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx Tue Jun 21 18:45:37 2016
@@ -133,7 +133,7 @@
<handler name="ondata" args="roomStatus">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setRoomValues1: ",value);
+ if ($debug) Debug.write("setRoomValues1: ", roomStatus);
//if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
//if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -26,13 +26,13 @@
<attribute name="objWhiteboard" value="null" />
<attribute name="objMessage" value="null" />
- <handler name="onsharedMessage" args="obj">
- this.objWhiteboard = obj;
- if (this.sendVarsByWhiteboardId != null){
- if ($debug) Debug.write("send: ", obj, whiteboardId);
- this.sendVarsByWhiteboardId.doCall();
- }
- </handler>
+ <handler name="onsharedMessage" args="obj">
+ this.objWhiteboard = obj;
+ if (this.sendVarsByWhiteboardId != null){
+ if ($debug) Debug.write("multiWhiteboardPanel::onsharedMessage send: ", obj, whiteboardId);
+ this.sendVarsByWhiteboardId.doCall();
+ }
+ </handler>
<netRemoteCallHib name="sendVarsByWhiteboardId" funcname="sendVarsByWhiteboardId"
showLoading="false" remotecontext="$once{ canvas.thishib }" >
@@ -52,17 +52,17 @@
]]>
</handler>
- <method name="sendActiveWindow">
- if ($debug) Debug.warn("sendActiveWindow :: ");
- if (canvas.ismoderator || canvas.isAllowedToDraw) {
- if ($debug) Debug.warn("DO sendActiveWindow :: ");
- canvas._drawarea = this._drawareaMask._drawarea;
- this.objMessage = new Array();
- this.objMessage[0] = "activateWhiteboard";
- this.objMessage[1] = this.whiteboardId;
- this.sendMessageToMembers.doCall();
- }
- </method>
+ <method name="sendActiveWindow">
+ if ($debug) Debug.warn("sendActiveWindow :: ");
+ if (canvas.ismoderator || canvas.isAllowedToDraw) {
+ if ($debug) Debug.warn("DO sendActiveWindow :: ");
+ canvas._drawarea = this._drawareaMask._drawarea;
+ this.objMessage = new Array();
+ this.objMessage[0] = "activateWhiteboard";
+ this.objMessage[1] = this.whiteboardId;
+ this.sendMessageToMembers.doCall();
+ }
+ </method>
<netRemoteCallHib name="sendMessageToMembers" funcname="sendMessageToMembers"
showLoading="false" remotecontext="$once{ canvas.thishib }" >
@@ -79,7 +79,7 @@
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
- <attribute name="whiteboardCount" value="0" type="number" />
+ <attribute name="whiteboardCount" value="0" type="number" />
<!--
-->
@@ -138,7 +138,7 @@
btnName: whiteboardName
});
- this._bar.currentBtn = tWhiteboardBtn;
+ this._bar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
this.addNewItemButton.updatePosition();
@@ -269,22 +269,21 @@
</handler>
</netRemoteCallHib>
- <method name="loadWhiteboards" args="whiteboardObjects">
- <![CDATA[
- if ($debug) Debug.write("whiteboardObjects :: ",whiteboardObjects.length);
- var mainArray = new Array();
- for (var eg in whiteboardObjects) {
- mainArray.push(whiteboardObjects[eg]);
- }
- mainArray.reverse();
-
- for (var eg=0;eg<mainArray.length;eg++) {
- var whiteBoard = this.addNewItemSynced(mainArray[eg].whiteBoardId);
-
- whiteBoard._drawareaMask._drawarea.loadObjectList(mainArray[eg]);
- }
- ]]>
- </method>
+ <method name="loadWhiteboards" args="whiteboardObjects">
+ <![CDATA[
+ if ($debug) Debug.write("whiteboardObjects :: ", whiteboardObjects.length);
+ var mainArray = new Array();
+ for (var eg in whiteboardObjects) {
+ mainArray.push(whiteboardObjects[eg]);
+ }
+ mainArray.reverse();
+
+ for (var eg = 0; eg < mainArray.length; ++eg) {
+ var whiteBoard = this.addNewItemSynced(mainArray[eg].whiteBoardId);
+ whiteBoard._drawareaMask._drawarea.loadObjectList(mainArray[eg]);
+ }
+ ]]>
+ </method>
<whiteboardBarMenu name="_bar" height="20" y="21">
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -93,7 +93,7 @@
this.currentBtn = btn;
this.currentBtn.objRef.setAttribute("visibility","visible");
this.currentBtn.objRef.bringToFront();
- ////if ($debug) //Debug.write("sendActiveWindow2: ",this.currentBtn);
+ //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;
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -61,8 +61,8 @@
if (this.isHidden) {
return;
}
- ////////if ($debug) //Debug.write(this,this._text,this._text.getTextWidth());
- if (this._text.getTextWidth()>(this.width-24)) {
+ //if ($debug) Debug.write(this, this._text, this._text.getTextWidth());
+ if (this._text.getTextWidth() > (this.width-24)) {
this._long.setAttribute('visibility','visible');
this._text.setAttribute('width',this.width-26);
} else {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx Tue Jun 21 18:45:37 2016
@@ -160,10 +160,10 @@
<method name="close">
if (this.onclose) this.onclose.sendEvent();
- if (this._barmenuButtonRef!=null){
- this._barmenuButtonRef.destroy();
- this._barmenuButtonRef.parent.onwidth.sendEvent();
- }
+ if (this._barmenuButtonRef != null) {
+ this._barmenuButtonRef.destroy();
+ this._barmenuButtonRef.parent.onwidth.sendEvent();
+ }
this.destroy();
</method>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx Tue Jun 21 18:45:37 2016
@@ -26,29 +26,20 @@
</passthrough>
</when>
</switch>
-
<script>
<![CDATA[
-
-
ExternalInterface.addCallback("redirectToUrlCallback", redirectToUrlCallback);
ExternalInterface.addCallback("getBrowserInfoCallback", getBrowserInfoCallback);
ExternalInterface.addCallback("getBrowserLangCallback", getBrowserLangCallback);
-
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
var browserInfoReturnObject = null;
var browserLangReturnObject = null;
-
function redirectToUrl(url, returnObject) {
-
redirectToUrlReturnObject = returnObject;
-
ExternalInterface.call("redirectToUrl", url);
-
- //lz.Browser.callJS("redirectToUrl",callback,this.redirectURL);
}
function redirectToUrlCallback(returnValue) {
@@ -57,15 +48,10 @@
redirectToUrlReturnObject.callback(returnValue);
}
}
-
function getBrowserInfo(returnObject) {
-
browserInfoReturnObject = returnObject;
-
ExternalInterface.call("getBrowserInfo");
-
- //lz.Browser.callJS("getBrowserInfo",callback);
}
function getBrowserInfoCallback(returnValue) {
@@ -75,14 +61,9 @@
}
}
-
function getBrowserLang(returnObject) {
-
browserLangReturnObject = returnObject;
-
ExternalInterface.call("getBrowserLang");
-
- //lz.Browser.callJS("getBrowserLang",callback);
}
function getBrowserLangCallback(returnValue) {
@@ -91,8 +72,6 @@
browserLangReturnObject.callback(returnValue);
}
}
-
-
]]>
</script>
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -488,7 +488,7 @@
if (canvas.directUserLogin) {
canvas.directRoomObj = value;
canvas.thishib.loaderVar.close();
- } else {
+ } else if (parent.currentInvitation == null) {
canvas.setRoomValues(value);
}
} else {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Tue Jun 21 18:45:37 2016
@@ -253,6 +253,7 @@
</method>
<method name="setRoomValues" args="roomObj">
+ <![CDATA[
if ($debug) Debug.warn("setRoomValues ",roomObj);
//this is needed cause in the rpc-method *getCurrentModeratorList* we check if its room.type == 'restricted'
//if so we will not show any *There is no Moderator* Warning Dialog
@@ -271,6 +272,7 @@
new lz.interviewConferenceRoom(canvas.main_content._content.inner, {roomobj:roomObj});
}
}
+ ]]>
</method>
<method name="parseLanugageObject" args="obj">
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=1749587&r1=1749586&r2=1749587&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 Tue Jun 21 18:45:37 2016
@@ -26,13 +26,13 @@
<attribute name="objWhiteboard" value="null" />
<attribute name="objMessage" value="null" />
- <handler name="onsharedMessage" args="obj">
- this.objWhiteboard = obj;
- if (this.sendVarsByWhiteboardId != null){
- if ($debug) Debug.write("send: ", obj, whiteboardId);
- this.sendVarsByWhiteboardId.doCall();
- }
- </handler>
+ <handler name="onsharedMessage" args="obj">
+ this.objWhiteboard = obj;
+ if (this.sendVarsByWhiteboardId != null){
+ if ($debug) Debug.write("multiWhiteboardPanel::onsharedMessage send: ", obj, whiteboardId);
+ this.sendVarsByWhiteboardId.doCall();
+ }
+ </handler>
<netRemoteCallHib name="sendVarsByWhiteboardId" funcname="sendVarsByWhiteboardId"
showLoading="false" remotecontext="$once{ canvas.thishib }" >
@@ -52,17 +52,17 @@
]]>
</handler>
- <method name="sendActiveWindow">
- if ($debug) Debug.warn("sendActiveWindow :: ");
- if (canvas.ismoderator || canvas.isAllowedToDraw) {
- if ($debug) Debug.warn("DO sendActiveWindow :: ");
- canvas._drawarea = this._drawareaMask._drawarea;
- this.objMessage = new Array();
- this.objMessage[0] = "activateWhiteboard";
- this.objMessage[1] = this.whiteboardId;
- this.sendMessageToMembers.doCall();
- }
- </method>
+ <method name="sendActiveWindow">
+ if ($debug) Debug.warn("sendActiveWindow :: ");
+ if (canvas.ismoderator || canvas.isAllowedToDraw) {
+ if ($debug) Debug.warn("DO sendActiveWindow :: ");
+ canvas._drawarea = this._drawareaMask._drawarea;
+ this.objMessage = new Array();
+ this.objMessage[0] = "activateWhiteboard";
+ this.objMessage[1] = this.whiteboardId;
+ this.sendMessageToMembers.doCall();
+ }
+ </method>
<netRemoteCallHib name="sendMessageToMembers" funcname="sendMessageToMembers"
showLoading="false" remotecontext="$once{ canvas.thishib }" >
@@ -79,7 +79,7 @@
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
- <attribute name="whiteboardCount" value="0" type="number" />
+ <attribute name="whiteboardCount" value="0" type="number" />
<!--
-->
@@ -138,11 +138,12 @@
btnName: whiteboardName
});
- this._bar.currentBtn = tWhiteboardBtn;
+ this._bar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
this.addNewItemButton.updatePosition();
canvas.whiteboardCount++;
+ this._bar.setWhiteboardId(whiteboardId);
return whiteboard;
</method>
@@ -269,22 +270,21 @@
</handler>
</netRemoteCallHib>
- <method name="loadWhiteboards" args="whiteboardObjects">
- <![CDATA[
- if ($debug) Debug.write("whiteboardObjects :: ",whiteboardObjects.length);
- var mainArray = new Array();
- for (var eg in whiteboardObjects) {
- mainArray.push(whiteboardObjects[eg]);
- }
- mainArray.reverse();
-
- for (var eg=0;eg<mainArray.length;eg++) {
- var whiteBoard = this.addNewItemSynced(mainArray[eg].whiteBoardId);
-
- whiteBoard._drawareaMask._drawarea.loadObjectList(mainArray[eg]);
- }
- ]]>
- </method>
+ <method name="loadWhiteboards" args="whiteboardObjects">
+ <![CDATA[
+ if ($debug) Debug.write("whiteboardObjects :: ", whiteboardObjects.length);
+ var mainArray = new Array();
+ for (var eg in whiteboardObjects) {
+ mainArray.push(whiteboardObjects[eg]);
+ }
+ mainArray.reverse();
+
+ for (var eg = 0; eg < mainArray.length; ++eg) {
+ var whiteBoard = this.addNewItemSynced(mainArray[eg].whiteBoardId);
+ whiteBoard._drawareaMask._drawarea.loadObjectList(mainArray[eg]);
+ }
+ ]]>
+ </method>
<whiteboardBarMenu name="_bar" height="20" y="21">
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx Tue Jun 21 18:45:37 2016
@@ -22,6 +22,13 @@
<class name="whiteboardBarMenu" extends="view" width="${ parent.width }" x="0" y="21"
height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.external.ExternalInterface;
+ </passthrough>
+ </when>
+ </switch>
<attribute name="staticwidth" type="number" value="120" />
<attribute name="currentBtn" value="null" />
@@ -63,13 +70,12 @@
<method name="removeObjectSynced" args="btn">
<![CDATA[
- var removeCurrent = false;
- if (this.currentBtn == btn){
- removeCurrent = true;
- }
+ var removeCurrent = this.currentBtn == btn;
btn.objRef.destroy();
btn.destroy();
- if (this.subviews.length != 0 && removeCurrent) {
+ if (this.subviews.length == 0) {
+ setWhiteboardId(-1);//no WB
+ } else if (removeCurrent) {
this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
}
parent.addNewItemButton.updatePosition();
@@ -82,21 +88,26 @@
this.sendActiveWindowSynced(btn);
this.currentBtn.objRef.sendActiveWindow();
</method>
-
+
+ <method name="setWhiteboardId" args="wbId">
+ ExternalInterface.call("setActiveWbId", wbId);
+ </method>
+
<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.isactive = false;
+ if (this.currentBtn._minimizebtn_mo != null) this.currentBtn._minimizebtn_mo.setAttribute('visible', false);
+ if (this.currentBtn._minimizebtn_dn != null) this.currentBtn._minimizebtn_dn.setAttribute('visible', false);
}
this.currentBtn = btn;
- this.currentBtn.objRef.setAttribute("visibility","visible");
+ this.currentBtn.objRef.setAttribute("visible", true);
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;
+ //if ($debug) Debug.warn("sendActiveWindowSynced: ", this.currentBtn.objRef.whiteboardId);
+ setWhiteboardId(this.currentBtn.objRef.whiteboardId);
+ this.currentBtn._minimizebtn_mo.setAttribute('visible', false);
+ this.currentBtn._minimizebtn_dn.setAttribute('visible', true);
+ this.currentBtn.isactive = true;
]]>
</method>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1749587&r1=1749586&r2=1749587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx Tue Jun 21 18:45:37 2016
@@ -61,8 +61,8 @@
if (this.isHidden) {
return;
}
- ////////if ($debug) //Debug.write(this,this._text,this._text.getTextWidth());
- if (this._text.getTextWidth()>(this.width-24)) {
+ //if ($debug) Debug.write(this, this._text, this._text.getTextWidth());
+ if (this._text.getTextWidth() > (this.width-24)) {
this._long.setAttribute('visibility','visible');
this._text.setAttribute('width',this.width-26);
} else {