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 2015/11/20 11:53:52 UTC
svn commit: r1715337 - in /openmeetings:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/
branches/3.1.x/openmeetings-flash/src/main/sw...
Author: solomax
Date: Fri Nov 20 10:53:51 2015
New Revision: 1715337
URL: http://svn.apache.org/viewvc?rev=1715337&view=rev
Log:
[OPENMEETINGS-1279] room almost works (not receiving messages from server yet)
Removed:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/drawViewNew.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/backup_whiteboard/baseDrawArrow.lzx
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Fri Nov 20 10:53:51 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.core.remote;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.Arrays;
@@ -57,9 +59,7 @@ import org.springframework.beans.factory
*
*/
public class WhiteBoardService implements IPendingServiceCallback {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- WhiteBoardService.class, "openmeetings");
+ private static final Logger log = Red5LoggerFactory.getLogger(WhiteBoardService.class, webAppRootKey);
@Autowired
private UserDao userDao;
@Autowired
@@ -139,37 +139,22 @@ public class WhiteBoardService implement
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoomId();
+ Client currentClient = sessionManager.getClientByStreamId(streamid, null);
+ Long roomId = currentClient.getRoomId();
- log.debug("getRoomItems: " + room_id);
- WhiteboardObjectList whiteboardObjectList = this.whiteBoardObjectListManagerById
- .getWhiteBoardObjectListByRoomId(room_id);
+ log.debug("getRoomItems: " + roomId);
+ WhiteboardObjectList whiteboardObjectList = whiteBoardObjectListManagerById.getWhiteBoardObjectListByRoomId(roomId);
if (whiteboardObjectList.getWhiteboardObjects().size() == 0) {
+ Long whiteBoardId = whiteBoardObjectListManagerById.getNewWhiteboardId(roomId);
- Long whiteBoardId = this.whiteBoardObjectListManagerById
- .getNewWhiteboardId(room_id);
-
- this.whiteBoardObjectListManagerById
- .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
- new WhiteboardObject(), whiteBoardId);
+ whiteBoardObjectListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, new WhiteboardObject(), whiteBoardId);
log.debug("Init New Room List");
- whiteboardObjectList = this.whiteBoardObjectListManagerById
- .getWhiteBoardObjectListByRoomId(room_id);
-
- return whiteboardObjectList;
-
- } else {
-
- return whiteboardObjectList;
-
+ whiteboardObjectList = whiteBoardObjectListManagerById.getWhiteBoardObjectListByRoomId(roomId);
}
-
- // return completeList;
+ return whiteboardObjectList;
} catch (Exception err) {
log.error("[getRoomItemsBy]", err);
}
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java Fri Nov 20 10:53:51 2015
@@ -22,23 +22,24 @@ import java.util.HashMap;
import java.util.Map;
public class WhiteboardObjectList {
-
private Long roomId;
- private Map<Long,WhiteboardObject> whiteboardObjects = new HashMap<Long,WhiteboardObject>();
-
+ private Map<Long, WhiteboardObject> whiteboardObjects = new HashMap<Long, WhiteboardObject>();
+
public WhiteboardObjectList() {}
-
+
public Long getRoomId() {
return roomId;
}
+
public void setRoomId(Long roomId) {
this.roomId = roomId;
}
+
public Map<Long, WhiteboardObject> getWhiteboardObjects() {
return whiteboardObjects;
}
+
public void setWhiteboardObjects(Map<Long, WhiteboardObject> whiteboardObjects) {
this.whiteboardObjects = whiteboardObjects;
}
-
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx Fri Nov 20 10:53:51 2015
@@ -107,13 +107,12 @@
this.setAttribute('selectedColorTransformedString',col);
</method>
- <method name="numberToRGB" args="thisC">
+ <method name="numberToRGB" args="c">
<![CDATA[
- var c = thisC.getRGB();
var r = (c >> 16) & 0xff;
var g = (c >> 8) & 0xff;
var b = c & 0xff;
- ////Debug.write("r g b: ",r,g,b);
+ if ($debug) Debug.write("r g b: ",r,g,b);
var HEX_R = r.toString(16).toUpperCase();
var HEX_G = g.toString(16).toUpperCase();
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Nov 20 10:53:51 2015
@@ -228,6 +228,7 @@
canvas._loadingAll.hideContentOnly();
return;
} else if (this.reconnectionAction){
+ if ($debug) Debug.write("this.reconnectionAction: ", this.lastCalled);
this.connect();
} else if (this.reconnectAfterRoomleft) {
if ($debug) Debug.write("this.reconnectAfterRoomleft: ",this.reconnectAfterRoomleft);
@@ -249,12 +250,12 @@
var src = getUrl();
this.setAttribute('src',src);
//Debug.write("new src ",this.src);
- if (this.counterror<3){
+ if (this.counterror < 3) {
this.counterror++;
- //Debug.write("try ",this.counterror,"one");
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.error.setAttribute('text',"try "+this.counterror);
}
+ if ($debug) Debug.write("Reconnecting: ", this.counterror);
this.connect();
} else {
//Debug.write("connection failed");
@@ -827,8 +828,8 @@
}
canvas._drawarea.onopenWhiteBoard.sendEvent();
- if ($debug) Debug.write("room ",canvas.currentRoomObj);
- if ($debug) Debug.write("roomType_id ",canvas.currentRoomObj.type);
+ 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) {
@@ -1630,7 +1631,7 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="checkLzRecording" funcname="recorderservice.checkLzRecording" >
+ <netRemoteCallHib name="checkLzRecording" funcname="recordingservice.checkLzRecording" >
<handler name="ondata" args="value">
if ($debug) Debug.write("checkLzRecording: ",value);
if (value != null) {
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx Fri Nov 20 10:53:51 2015
@@ -416,6 +416,7 @@ and some more references to temp-objects
<attribute name="currentCamName" value="" type="string"/>
<attribute name="currentBaseConferenceRoom" value="null" />
+<attribute name="_menubar" value="null" />
<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> <!-- F12 -->
<attribute name="ARRANGE_WINDOWS_KEY" value="119"/> <!-- F8 -->
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Nov 20 10:53:51 2015
@@ -26,6 +26,7 @@
<when property="$as3">
<passthrough>
import flash.external.ExternalInterface;
+ import flash.net.*;
</passthrough>
</when>
</switch>
@@ -138,14 +139,20 @@
]]>
</method>
- <method name="remoteLogWrite" args="message">
- if ($debug) Debug.write(message);
- var remoteLog = new lz.dataset();
- remoteLog.setQueryType("POST");
- remoteLog.setAttribute("src", canvas.getUrl() + "remotelog.upload");
- remoteLog.setQueryParam("message", message);
- remoteLog.setQueryParam("sid", canvas.sessionId);
- remoteLog.doRequest();
+ <method name="remoteLogWrite" args="message">
+ if ($debug) Debug.warn("remoteLogWrite:: ", message);
+ var request:URLRequest = new URLRequest(canvas.getUrl() + "remotelog.upload");
+ var requestVars:URLVariables = new URLVariables();
+ requestVars.message = message;
+ requestVars.sid = canvas.sessionId;
+ request.data = requestVars;
+ request.method = URLRequestMethod.POST;
+
+ try {
+ new URLLoader().load(request);
+ } catch (e:Error) {
+ if ($debug) Debug.error(e);
+ }
</method>
<method name="getHttpHost">
@@ -618,11 +625,6 @@
}
}
- //Only send this event if the current user moderators status changes
- if (isCurrentModerator != this.ismoderator) {
- canvas.commonVideoViewContent.updateModerationFlag(isCurrentModerator);
- }
-
// do always spread this event, we need to broadcast the "onismoderator" event
// so that we can update the status of other users in the user list
this.setAttribute('ismoderator',isCurrentModerator);
@@ -774,18 +776,10 @@
}
</method>
- <method name="initSharedObject">
- if (canvas.sharedObject == null) {
- if($debug) Debug.write("canvas.initSharedObject sharedObject IS null");
- canvas.sharedObject = new lz.sharedObject();
- canvas.sharedObject.getLocal('userdata');
- }
- </method>
-
<method name="getUserData">
- canvas.initSharedObject();
- var g = canvas.sharedObject.getData('userdata');
- if (g==null) {
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var g = so.data;
+ if (g == null) {
if($debug) Debug.write("sharedObject.getData IS null");
g = new Array();
}
@@ -793,9 +787,12 @@
</method>
<method name="setUserData" args="g">
- canvas.initSharedObject();
- canvas.sharedObject.setData('userdata', g);
- canvas.sharedObject.flush();
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ for (var i in g) {
+ if($debug) Debug.write("g[" + i + "] = ", g[i]);
+ so.data[i] = g[i];
+ }
+ so.flush();
</method>
<attribute name="regExpCounter" value="0" type="number" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx Fri Nov 20 10:53:51 2015
@@ -24,5 +24,4 @@
<include href="baseVideoStreamDevice.lzx" />
<include href="datasetHelper.lzx" />
<include href="rtmpConnection.lzx" />
- <include href="sharedObject.lzx" />
</library>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Fri Nov 20 10:53:51 2015
@@ -406,18 +406,6 @@
</method>
<!---
- Update the ismoderator flag, there is no need to check here which user
- this happened already before sending it to the SWF10 app
- -->
- <method name="updateModerationFlag" args="moderator">
- <![CDATA[
- if ($debug) Debug.write("updateModerationFlag :: ",moderator);
- this.setAttribute('ismoderator',moderator);
- return;
- ]]>
- </method>
-
- <!---
Update the canDraw,canShare,canRemote flag, there is no need to check here which user
this happened already before sending it to the SWF10 app
-->
@@ -473,17 +461,6 @@
if (canvas.wicketsid != null && bool) {
if($debug) Debug.write("1");
clearAll();
- if($debug) Debug.write("2");
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom', bool);
- if($debug) Debug.write("3");
- if($debug) Debug.write("Do disconnect 10:: ", canvas.thishib);
- if (canvas.thishib._nc) {
- canvas.thishib._nc.close();
- }
- if($debug) Debug.write("4");
- canvas.thishib.disconnect();
- if($debug) Debug.write("5");
- canvas.thishib.src = null;
}
]]>
</method>
@@ -571,28 +548,6 @@
]]>
</method>
- <!--
- Synces some of the variables from the SWF8 to the SWF10.
- This also includes values for httphostlocal
- in case its a cluster'ed OpenMeetings installation the connection_url
- might point to the slave while the httphostlocal points to the master
- -->
- <method name="reconnectSuccess" args="connection_url,publicSID,userobject,isInterview,httphostlocal,httpport">
- if($debug) Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
- canvas.httphostlocal = httphostlocal;
- canvas.red5httpport = httpport;
- canvas.publicSID = publicSID;
- canvas.userobject = userobject;
- canvas.isInterview = isInterview;
- canvas.thishib.setAttribute('src',connection_url);
- canvas.thishib.connect();
- </method>
-
- <method name="disconnect" args="arg">
- if($debug) Debug.write("Do disconnect");
- canvas.thishib.disconnect();
- </method>
-
<!---
Starts the 5 second audio/video testing application and connect to RTMP
-->
@@ -608,15 +563,12 @@
and send confirmation back via LocalConnection
-->
<method name="closeInitTestingApplication">
- canvas.thishib.disconnect();
if($debug) Debug.write("closeInitTestingApplication ");
if (this.testingApplication != null) {
this.testingApplication.storeSettings();
this.testingApplication.destroy();
this.testingApplication = null;
}
- if ($debug) Debug.write("Send confirmation of close back to: ",canvas.videoComp_lc_name);
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeInitTestingApplicationConfirm');
</method>
<!---
@@ -708,9 +660,6 @@
this.baseVideoStream.stopRecording();
this.baseVideoStream.destroy();
this.baseVideoStream = null;
- canvas.thishib.disconnect();
- // send back confirmation to leave the module
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'recordingStoppedAndDisconnected');
</method>
<!---
@@ -815,7 +764,6 @@
}
this.whiteboardVideos.clearAll();
parent._videoComponent.clearAll();
- canvas.thishib.disconnect();
]]>
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx Fri Nov 20 10:53:51 2015
@@ -31,6 +31,11 @@
<attribute name="selected" value="null" />
+ <method name="construct" args="parent, args">
+ super.construct(parent, args);
+ canvas._menubar = this;
+ </method>
+
<method name="sendOpenMenu" args="menuref">
if (this.selected != null) {
this.selected.setAttribute("selected",false);
@@ -47,7 +52,7 @@
<baseMenuMeetingsItem text="$once{ canvas.getLabelName(245) }"
text_y_inset="4" text_fontsize="14" down_y_inset="8"
textToolTip="" height="28"
- visible="${ (classroot.viewType=='interview') ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
+ visible="${ (canvas._menubar.viewType=='interview') ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
>
<handler name="onclick">
new lz.conferenceMenuFiles(canvas,{
@@ -63,7 +68,7 @@
<baseMenuMeetingsItem text="$once{ canvas.getLabelName(635) }"
text_y_inset="4" text_fontsize="14" down_y_inset="8"
textToolTip="" height="28"
- visible="${ canvas.currentRoomObj.hideActionsMenu ? false : ((classroot.viewType=='conference') ? true : (canvas.ismoderator ? true : (canvas.isAllowedToDraw ? true : false ))) }"
+ visible="${ canvas.currentRoomObj.hideActionsMenu ? false : ((canvas._menubar.viewType=='conference') ? true : (canvas.ismoderator ? true : (canvas.isAllowedToDraw ? true : false ))) }"
>
<handler name="onclick">
new lz.conferenceMenuActions(canvas,{
@@ -93,16 +98,14 @@
this.bgc.setAttribute('visibility','hidden');
</handler>
- <handler name="oninit">
- <![CDATA[
- if (canvas.isRemoteUser()) {
- if ($debug) Debug.write("this mbarcontent ",this);
- if (canvas.destroyExitButton) {
- this.destroy();
- }
- }
- ]]>
- </handler>
+ <handler name="oninit"><![CDATA[
+ if (canvas.isRemoteUser()) {
+ if ($debug) Debug.write("this mbarcontent ",this);
+ if (canvas.destroyExitButton) {
+ this.destroy();
+ }
+ }
+ ]]></handler>
<handler name="onclick">
canvas.commonVideoViewContent.exitRoom();
</handler>
@@ -175,11 +178,11 @@
</handler>
<handler name="onmouseover">
- this._bg.setAttribute("visibility","visible");
+ this._bg.setAttribute("visible", true);
</handler>
<handler name="onmouseout">
- this._bg.setAttribute("visibility","hidden");
+ this._bg.setAttribute("visible", false);
</handler>
<view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0" x="1"
@@ -220,7 +223,7 @@
enabled="${ canvas.ismoderator }" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="239" command="cmd_shareDesktop"
- enabled="${ classroot.btnRef.classroot.viewType != 'interview' && canvas.ismoderator }" />
+ enabled="${ canvas._menubar.viewType != 'interview' && canvas.ismoderator }" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="784" command="cmd_applyforMod" enabled="${ !canvas.ismoderator }" />
<horizontalDropDownSpacer />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx Fri Nov 20 10:53:51 2015
@@ -252,7 +252,7 @@
<miniIconsNew name="_allowDevice" x="100" width="16" height="16"
visible="$once{ parent.showAvIcons }" innerResource="av_allow_rsc" showhandcursor="true">
<handler name="onclick">
- if ($debug) Debug.write("NOTHING: ",canvas.publicSID);
+ if ($debug) Debug.write("NOTHING: ", canvas.publicSID, canvas.ismoderator);
if (canvas.ismoderator) {
//Do directly send confirmation to share Audio/Video to SELF! so that all users get
//the notification and the broadcasting Bit is set for this User
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx Fri Nov 20 10:53:51 2015
@@ -53,11 +53,10 @@
canvas.thishib.reconnectObjRef = this;
canvas.thishib.disconnect();
} else {
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, true, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
} else {
- //The user is already in the correct Scope
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, true, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
</handler>
@@ -66,8 +65,8 @@
otherwise it can happen that the video tries to start playing before the rtmp-connection
was established
-->
- <method name="as3ConnectionSuccess">
- if ($debug) Debug.write("as3ConnectionSuccess continue loading");
+ <method name="loadModerators">
+ if ($debug) Debug.write("continue loading");
//set default values and get already availible streams
//it can happen that if you click to exit the room the views are not
//not cleaned up yet and you receive this event from the LocalConnection
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx Fri Nov 20 10:53:51 2015
@@ -49,11 +49,10 @@
canvas.thishib.reconnectObjRef = this;
canvas.thishib.disconnect();
} else {
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
} else {
- //The user is already in the correct Scope
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
</handler>
@@ -66,8 +65,8 @@
otherwise it can happen that the video tries to start playing before the rtmp-connection
was established
-->
- <method name="as3ConnectionSuccess">
- if ($debug) Debug.write("as3ConnectionSuccess continue loading");
+ <method name="loadModerators">
+ if ($debug) Debug.write("continue loading");
//set default values and get already availible streams
//it can happen that if you click to exit the room the views are not
//not cleaned up yet and you receive this event from the LocalConnection
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx Fri Nov 20 10:53:51 2015
@@ -64,11 +64,10 @@
canvas.thishib.reconnectObjRef = this;
canvas.thishib.disconnect();
} else {
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
} else {
- //The user is already in the correct Scope
- canvas.commonVideoViewContent.reconnectSuccess(canvas.thishib.src, canvas.publicSID, canvas.thishib.userobject, false, canvas.getHttpHost(), canvas.red5httpport);
+ loadModerators();
}
</handler>
@@ -77,8 +76,8 @@
otherwise it can happen that the video tries to start playing before the rtmp-connection
was established
-->
- <method name="as3ConnectionSuccess">
- if ($debug) Debug.write("as3ConnectionSuccess continue loading");
+ <method name="loadModerators">
+ if ($debug) Debug.write("continue loading");
//set default values and get already availible streams
//it can happen that if you click to exit the room the views are not
//not cleaned up yet and you receive this event from the LocalConnection
@@ -144,7 +143,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: ",value);
//if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
//if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Fri Nov 20 10:53:51 2015
@@ -139,12 +139,10 @@
content._content1._chattabbottom.updatefontbuttonvisible();
}
this.doBlink = false;
- this._newMessage.setAttribute("visibility","hidden");
- this._newMessage.setAttribute( "opacity", 0 );
- this.content.setAttribute("visibility","visible");
- } else {
- this.content.setAttribute("visibility","hidden");
+ this._newMessage.setAttribute("visible", false);
+ this._newMessage.setAttribute("opacity", 0);
}
+ this.content.setAttribute("visible", !!o);
]]></handler>
<method name="startBlink">
@@ -175,7 +173,7 @@
<view name="content" visibility="hidden" y="22"
height="${ parent.height-22 }" width="${ parent.width }">
- <!-- chatBarMenu name="chatbar">
+ <chatBarMenu name="chatbar">
<attribute name="refObj" value="null" />
<attribute name="objMessage" value="null" />
<attribute name="publicSID" value="" type="string" />
@@ -221,7 +219,7 @@
</chatBarMenu>
- <chatTab name="_content1" /-->
+ <chatTab name="_content1" />
</view>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx Fri Nov 20 10:53:51 2015
@@ -82,7 +82,7 @@
<method name="addChatHistory" args="value,client">
<![CDATA[
- //if($debug) Debug.write("chatOutput/addChatHistory: ",value,client);
+ if($debug) Debug.write("chatOutput/addChatHistory: ",value,client);
canvas.currentBaseConferenceRoom._chatPanelStrict.startBlink();
var username = (client.firstname == null ? "" : client.firstname) + " " + (client.lastname == null ? "" : client.lastname);
var messageObj = value[value.length - 1];
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx Fri Nov 20 10:53:51 2015
@@ -19,7 +19,6 @@
-->
<library>
-
<!--- View of the buttom area of chat. It contains buttons of message,emoticons,clear. -->
<class name="chatTabBottom" extends="view" height="42">
<attribute name="isPrivate" value="false" type="boolean" />
@@ -136,7 +135,7 @@
lz.ModeManager.makeModal(pick);
</handler>
<handler name="onmouseover">
- <!-- lost selection workaround -->
+ // lost selection workaround
parent.parent.message._ctext.saveselection();
</handler>
<labelTooltip labelid="1530" />
@@ -193,9 +192,6 @@
]]>
</handler>
</netRemoteCallHib>
-
</view>
-
</class>
-
</library>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx Fri Nov 20 10:53:51 2015
@@ -255,11 +255,11 @@
this.basdrawredoView.subviews[0].destroy();
}
- this.setAttribute("x",0);
- this.setAttribute("y",0);
+ this.setAttribute("x", 0);
+ this.setAttribute("y", 0);
- this.getDisplayObject()._xscale = 100;
- this.getDisplayObject()._yscale = 100;
+ this.getDisplayObject().scaleX = 1;
+ this.getDisplayObject().scaleY = 1;
this.onupdateScale.sendEvent(null);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx Fri Nov 20 10:53:51 2015
@@ -56,8 +56,8 @@
var tScale = Math.round(scaleFactor*100);
- this.getDisplayObject()._xscale = tScale;
- this.getDisplayObject()._yscale = tScale;
+ this.getDisplayObject().scaleX = scaleFactor;
+ this.getDisplayObject().scaleY = scaleFactor;
this.setAttribute("x",0);
this.setAttribute("y",0);
@@ -83,9 +83,9 @@
this.doFullFit(fullFit);
- actionObject.push(this.getDisplayObject()._xscale);
+ actionObject.push(this.getDisplayObject().scaleX * 100);
- if ($debug) Debug.write("doUpdateFullFit ",fullFit,this.getDisplayObject()._xscale);
+ if ($debug) Debug.write("doUpdateFullFit ",fullFit,this.getDisplayObject().scaleX);
this.onsharedMessage('whiteboardObj',actionObject);
}
@@ -97,8 +97,8 @@
if ($debug) Debug.write("doUpdateZoom ",this.fullFit,zoom);
- this.getDisplayObject()._xscale = zoom;
- this.getDisplayObject()._yscale = zoom;
+ this.getDisplayObject().scaleX = zoom / 100;
+ this.getDisplayObject().scaleY = zoom / 100;
if ($debug) Debug.write("doUpdateZoom is moderator ", canvas.ismoderator);
if (canvas.ismoderator) {
@@ -122,8 +122,8 @@
this.doFullFit(actionObject[1]);
if (!actionObject[1]) {
- this.getDisplayObject()._xscale = actionObject[2];
- this.getDisplayObject()._yscale = actionObject[2];
+ this.getDisplayObject().scaleX = actionObject[2] / 100;
+ this.getDisplayObject().scaleY = actionObject[2] / 100;
this.onupdateScale.sendEvent(null);
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/drawViewNew.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/drawViewNew.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/drawViewNew.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/drawViewNew.lzx Fri Nov 20 10:53:51 2015
@@ -48,7 +48,7 @@
|| this.name.indexOf('uline')>=0
|| this.name.indexOf('drawarrow')>=0
|| this.name.indexOf('paint')>=0) {
- this.getDisplayObject()._xscale = (this.width/this.initwidth)*100;
+ this.getDisplayObject().scaleX = this.width / this.initwidth;
} else if (this.name.indexOf('rectangle')>=0) {
parent.redrawRectItemByScaling(this);
} else if (this.name.indexOf('ellipse')>=0) {
@@ -65,7 +65,7 @@
|| this.name.indexOf('uline')>=0
|| this.name.indexOf('drawarrow')>=0
|| this.name.indexOf('paint')>=0) {
- this.getDisplayObject()._yscale = (this.height/this.initheight)*100;
+ this.getDisplayObject().scaleY = this.height / this.initheight;
} else if (this.name.indexOf('rectangle')>=0) {
parent.redrawRectItemByScaling(this);
} else if (this.name.indexOf('ellipse')>=0) {
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx Fri Nov 20 10:53:51 2015
@@ -28,80 +28,50 @@
<attribute name="loadObjectDelegate" value="null" />
<method name="loadObjectList" args="whiteBoardObject">
- <![CDATA[
+ <![CDATA[
+ if ($debug) Debug.info("loadObjectList :1: ", whiteBoardObject);
- if ($debug) Debug.info("loadObjectList :1: ",whiteBoardObject,whiteBoardObject.fullFit,whiteBoardObject.zoom);
+ if (parent.parent["zoombox"]) {
+ parent.parent.zoombox.setWhiteboardValues(whiteBoardObject.fullFit, whiteBoardObject.zoom);
+ }
- if (parent.parent["zoombox"]) {
- parent.parent.zoombox.setWhiteboardValues(whiteBoardObject.fullFit,whiteBoardObject.zoom);
- }
-
-
- this.setAttribute("x",whiteBoardObject.x);
- this.setAttribute("y",whiteBoardObject.y);
- this.last_x = this.x;
- this.last_y = this.y;
-
- /*
- if (whiteBoardObject.brainStorming != null) {
- this.loadBrainStormingObject(whiteBoardObject.brainStorming);
- }
- */
-
- this.fullFit = whiteBoardObject.fullFit;
-
- this.getDisplayObject()._xscale = whiteBoardObject.zoom;
- this.getDisplayObject()._yscale = whiteBoardObject.zoom;
-
- this.onupdateScale.sendEvent(null);
-
- this.loadingObjectList = new Array();
-
- for (var eg in whiteBoardObject.roomItems) {
- this.loadingObjectList.push(whiteBoardObject.roomItems[eg]);
- }
-
- //return;
- //if ($debug) Debug.write("loadObjectList :2: ",this.loadingObjectList);
-
- function sortItemByIndex(a,b){
- var a1 = a[a.length-8];
- var b1 = b[b.length-8];
- //_root.//Debug.write("natcompare: ",a1,b1,natcompare(a1,b1));
- if(a1==b1){
- return 0;
- } else if(a1>b1){
- return 1;
- } else {
- return -1;
- }
- }
-
- //for (var i=0;i<this.loadingObjectList.length;i++) {
- // if ($debug) Debug.write(" 1 ",i,this.loadingObjectList[i][0],this.loadingObjectList[i][this.loadingObjectList[i].length-8]);
- //}
-
- this.loadingObjectList.sort(sortItemByIndex);
-
- //for (var i=0;i<this.loadingObjectList.length;i++) {
- // if ($debug) Debug.write(" 2 ",i,this.loadingObjectList[i][0],this.loadingObjectList[i][this.loadingObjectList[i].length-8]);
- //}
-
- this.loadingObjectListId = 0;
- //this.loadObjectDelegate = new LzDelegate( this, "loadRemoteObject" );
- //if (this.loadingObjectList.length != 0){
- // lz.Timer.addTimer( this.loadObjectDelegate, 250 );
- //}
- //for (var i=0;i<this.loadingObjectList.length;i++){
- // if ($debug) Debug.write("i this.loadingObjectList[i] ",i,this.loadingObjectList[i]);
- //}
-
- if ($debug) Debug.write("Number of Whiteboard Objects ",this.loadingObjectList.length);
-
- if (this.loadingObjectList != null && this.loadingObjectList.length != 0){
- this.startNewSyncprocess.doCall();
+ this.setAttribute("x", whiteBoardObject.x);
+ this.setAttribute("y", whiteBoardObject.y);
+ this.last_x = this.x;
+ this.last_y = this.y;
+
+ this.fullFit = whiteBoardObject.fullFit;
+
+ this.getDisplayObject().scaleX = whiteBoardObject.zoom / 100;
+ this.getDisplayObject().scaleY = whiteBoardObject.zoom / 100;
+
+ this.onupdateScale.sendEvent(null);
+ this.loadingObjectList = new Array();
+
+ for (var eg in whiteBoardObject.roomItems) {
+ this.loadingObjectList.push(whiteBoardObject.roomItems[eg]);
+ }
+
+ function sortItemByIndex(a,b){
+ var a1 = a[a.length-8];
+ var b1 = b[b.length-8];
+ if(a1==b1){
+ return 0;
+ } else if(a1>b1){
+ return 1;
+ } else {
+ return -1;
}
- ]]>
+ }
+
+ this.loadingObjectList.sort(sortItemByIndex);
+
+ this.loadingObjectListId = 0;
+ if ($debug) Debug.write("Number of Whiteboard Objects ",this.loadingObjectList.length);
+ if (this.loadingObjectList != null && this.loadingObjectList.length != 0){
+ this.startNewSyncprocess.doCall();
+ }
+ ]]>
</method>
<method name="loadSavedObjectList" args="objList">
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx Fri Nov 20 10:53:51 2015
@@ -389,8 +389,8 @@
//Scaling
//var basicLength = Math.sqrt((t.width*t.width)+(t.width*t.width));
- //t.getDisplayObject()._xscale = (hypothenuse/basicLength)*100;
- //t.getDisplayObject()._yscale = (hypothenuse/basicLength)*100;
+ //t.getDisplayObject().scaleX = hypothenuse / basicLength;
+ //t.getDisplayObject().scaleY = hypothenuse / basicLength;
//if ($debug) Debug.write("hypothenuse "+hypothenuse);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Fri Nov 20 10:53:51 2015
@@ -199,47 +199,47 @@
<attribute name="sendUpdate" value="true" type="boolean"/>
- <handler name="onx" args="x">
+ <handler name="onx" args="x"><![CDATA[
if (this.sendUpdate) {
if ($debug) Debug.write("# x",x);
- if ('scrollContainer' in parent.parent) {
+ if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
- </handler>
+ ]]></handler>
- <handler name="ony" args="y">
+ <handler name="ony" args="y"><![CDATA[
if (this.sendUpdate) {
- if ($debug) Debug.write("# y",y);
- if ('scrollContainer' in parent.parent) {
+ if ($debug) Debug.write("# y", y);
+ if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
- </handler>
+ ]]></handler>
- <handler name="onheight" args="h">
+ <handler name="onheight" args="h"><![CDATA[
if ($debug) Debug.write("# height",h);
//this.dragger.drag_min_x = parent.width - w;
- if ('scrollContainer' in parent.parent) {
+ if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
parent.parent.zoombox.sendUpdate(null);
- </handler>
+ ]]></handler>
- <handler name="onwidth" args="w">
+ <handler name="onwidth" args="w"><![CDATA[
if ($debug) Debug.write("# width",w);
//this.dragger.drag_min_y = parent.height - h;
- if ('scrollContainer' in parent.parent) {
+ if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
- </handler>
+ ]]></handler>
- <handler name="onupdateScale" args="tRef">
- if ($debug) Debug.write("# updateScale",this.getDisplayObject()._xscale);
- if ('scrollContainer' in parent.parent) {
+ <handler name="onupdateScale" args="tRef"><![CDATA[
+ if ($debug) Debug.write("# updateScale",this.getDisplayObject().scaleX);
+ if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
- </handler>
+ ]]></handler>
<attribute name="initH"/>
<attribute name="initW"/>
@@ -349,13 +349,14 @@
<attribute name="sendUpdate" value="true" type="boolean"/>
<method name="calcScrollContent">
- var rHeight = Math.round(parent._drawareaMask._drawarea.height * (parent._drawareaMask._drawarea.getDisplayObject()._xscale / 100));
- var rWidth = Math.round(parent._drawareaMask._drawarea.width * (parent._drawareaMask._drawarea.getDisplayObject()._yscale / 100));
+ var rHeight = Math.round(parent._drawareaMask._drawarea.height * parent._drawareaMask._drawarea.getDisplayObject().scaleX);
+ var rWidth = Math.round(parent._drawareaMask._drawarea.width * parent._drawareaMask._drawarea.getDisplayObject().scaleY);
+ if ($debug) Debug.write("# calcScrollContent:: ", rHeight, rWidth);
this.sendUpdate = false;
- this.scrollview.setAttribute("x",parent._drawareaMask._drawarea.x);
- this.scrollview.setAttribute("y",parent._drawareaMask._drawarea.y);
- this.scrollview.setAttribute("height", Math.max(rHeight, parent._drawareaMask._drawarea.getDisplayObject()._height));
- this.scrollview.setAttribute("width", Math.max(rWidth, parent._drawareaMask._drawarea.getDisplayObject()._width));
+ this.scrollview.setAttribute("x", parent._drawareaMask._drawarea.x);
+ this.scrollview.setAttribute("y", parent._drawareaMask._drawarea.y);
+ this.scrollview.setAttribute("height", Math.max(rHeight, parent._drawareaMask._drawarea.getDisplayObject().height));
+ this.scrollview.setAttribute("width", Math.max(rWidth, parent._drawareaMask._drawarea.getDisplayObject().width));
this.sendUpdate = true;
</method>
@@ -551,16 +552,16 @@
<labelCheckbox x="344" name="_fullFit" labelid="847" y="4" fontstyle="bold" bgcolor="0xFFFFFF"
visible="${ ((canvas.becomemoderator) ? true : false ) }">
- <handler name="onvalue" args="v">
+ <handler name="onvalue" args="v"><![CDATA[
if (parent.ignoreUpdates) {
return;
}
if ($debug) Debug.warn("onvalue Full Fit ",v);
- if ('_zoom' in parent) {
+ if ('_zoom' in parent && parent._zoom) {
parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
}
- </handler>
+ ]]></handler>
<labelTooltip labelid="1212" multiline="true" />
</labelCheckbox>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Fri Nov 20 10:53:51 2015
@@ -27,9 +27,9 @@
<attribute name="objMessage" value="null" />
<handler name="onsharedMessage" args="obj">
- //Debug.write("send: ",obj);
this.objWhiteboard = obj;
if (this.sendVarsByWhiteboardId != null){
+ if ($debug) Debug.write("send: ", obj, whiteboardId);
this.sendVarsByWhiteboardId.doCall();
}
</handler>
@@ -200,14 +200,10 @@
<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]);
return;
-
}
-
}
</method>
@@ -245,14 +241,10 @@
<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();
return;
-
}
-
}
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/backup_whiteboard/baseDrawArrow.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/backup_whiteboard/baseDrawArrow.lzx?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/backup_whiteboard/baseDrawArrow.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/backup_whiteboard/baseDrawArrow.lzx Fri Nov 20 10:53:51 2015
@@ -131,8 +131,8 @@
//Scaling
var basicLength = Math.sqrt((t.width*t.width)+(t.width*t.width));
- t.getDisplayObject()._xscale = (hypothenuse/basicLength)*100;
- t.getDisplayObject()._yscale = (hypothenuse/basicLength)*100;
+ t.getDisplayObject().scaleX = hypothenuse / basicLength;
+ t.getDisplayObject().scaleY = hypothenuse / basicLength;
//Set previous to null
@@ -392,8 +392,8 @@
//Scaling
var basicLength = Math.sqrt((t.width*t.width)+(t.width*t.width));
- t.getDisplayObject()._xscale = (hypothenuse/basicLength)*100;
- t.getDisplayObject()._yscale = (hypothenuse/basicLength)*100;
+ t.getDisplayObject().scaleX = hypothenuse / basicLength;
+ t.getDisplayObject().scaleY = hypothenuse / basicLength;
this.currentlayer.fillstyle = lastActionObject[1];
this.currentlayer.lineWidth = lastActionObject[2];
@@ -452,8 +452,8 @@
//Scaling
var basicLength = Math.sqrt((t.width*t.width)+(t.width*t.width));
- t.getDisplayObject()._xscale = (hypothenuse/basicLength)*100;
- t.getDisplayObject()._yscale = (hypothenuse/basicLength)*100;
+ t.getDisplayObject().scaleX = hypothenuse / basicLength;
+ t.getDisplayObject().scaleY = hypothenuse / basicLength;
//Set previous to null
@@ -590,8 +590,8 @@
//Scaling
var basicLength = Math.sqrt((t.width*t.width)+(t.width*t.width));
- t.getDisplayObject()._xscale = (hypothenuse/basicLength)*100;
- t.getDisplayObject()._yscale = (hypothenuse/basicLength)*100;
+ t.getDisplayObject().scaleX = hypothenuse / basicLength;
+ t.getDisplayObject().scaleY = hypothenuse / basicLength;
//Set previous to null
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Fri Nov 20 10:53:51 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.core.remote;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.Arrays;
@@ -57,9 +59,7 @@ import org.springframework.beans.factory
*
*/
public class WhiteBoardService implements IPendingServiceCallback {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- WhiteBoardService.class, "openmeetings");
+ private static final Logger log = Red5LoggerFactory.getLogger(WhiteBoardService.class, webAppRootKey);
@Autowired
private UserDao userDao;
@Autowired
@@ -139,37 +139,22 @@ public class WhiteBoardService implement
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoomId();
+ Client currentClient = sessionManager.getClientByStreamId(streamid, null);
+ Long roomId = currentClient.getRoomId();
- log.debug("getRoomItems: " + room_id);
- WhiteboardObjectList whiteboardObjectList = this.whiteBoardObjectListManagerById
- .getWhiteBoardObjectListByRoomId(room_id);
+ log.debug("getRoomItems: " + roomId);
+ WhiteboardObjectList whiteboardObjectList = whiteBoardObjectListManagerById.getWhiteBoardObjectListByRoomId(roomId);
if (whiteboardObjectList.getWhiteboardObjects().size() == 0) {
+ Long whiteBoardId = whiteBoardObjectListManagerById.getNewWhiteboardId(roomId);
- Long whiteBoardId = this.whiteBoardObjectListManagerById
- .getNewWhiteboardId(room_id);
-
- this.whiteBoardObjectListManagerById
- .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
- new WhiteboardObject(), whiteBoardId);
+ whiteBoardObjectListManagerById.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, new WhiteboardObject(), whiteBoardId);
log.debug("Init New Room List");
- whiteboardObjectList = this.whiteBoardObjectListManagerById
- .getWhiteBoardObjectListByRoomId(room_id);
-
- return whiteboardObjectList;
-
- } else {
-
- return whiteboardObjectList;
-
+ whiteboardObjectList = whiteBoardObjectListManagerById.getWhiteBoardObjectListByRoomId(roomId);
}
-
- // return completeList;
+ return whiteboardObjectList;
} catch (Exception err) {
log.error("[getRoomItemsBy]", err);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1715337&r1=1715336&r2=1715337&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java Fri Nov 20 10:53:51 2015
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
public class WhiteboardObjectList {
-
private Long roomId;
private Map<Long,WhiteboardObject> whiteboardObjects = new HashMap<Long,WhiteboardObject>();
@@ -31,14 +30,16 @@ public class WhiteboardObjectList {
public Long getRoomId() {
return roomId;
}
+
public void setRoomId(Long roomId) {
this.roomId = roomId;
}
+
public Map<Long, WhiteboardObject> getWhiteboardObjects() {
return whiteboardObjects;
}
+
public void setWhiteboardObjects(Map<Long, WhiteboardObject> whiteboardObjects) {
this.whiteboardObjects = whiteboardObjects;
}
-
}