Author: vdegtyarev
Date: Wed Oct 23 03:58:19 2013
New Revision: 1534902
URL: http://svn.apache.org/r1534902
Log:
OPENMEETINGS-819 is fixed. Zoom is synchronized on whiteboard.
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/branches/2.x/src/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Wed Oct 23 03:58:19 2013
@@ -1097,6 +1097,8 @@
this.setAttribute("x",actionObject[1]);
this.setAttribute("y",actionObject[2]);
+ } else if(actionObject[0]=='whiteboardObj'){
+ this.doUpdateFullFitAndZoomRemote(actionObject);
} else if(action=='flv'){
this.playFLVRemote(actionObject);
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
Wed Oct 23 03:58:19 2013
@@ -111,13 +111,13 @@
]]>
</method>
- <method name="doUpdateFullFitAndZoomRemote" args="actionObject,refObj">
+ <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
<![CDATA[
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
+ if ($debug) Debug.write("doUpdateFullFitAndZoomRemote
",actionObject[1],actionObject[2]);
this.doFullFit(actionObject[1]);
- if ($debug) Debug.write("doUpdateFullFitAndZoomRemote
",fullFit,actionObject[2]);
if (!actionObject[1]) {
this.getDisplayObject()._xscale = actionObject[2];
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/branches/2.x/src/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/branches/2.x/src/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
Wed Oct 23 03:58:19 2013
@@ -310,6 +310,17 @@ public class WhiteboardManager {
whiteBoardObjectListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
+ } else if (action.equals("whiteboardObj")) {
+ WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+ whiteBoardId);
+
+ whiteboardObject.setFullFit((Boolean)
actionObject.get(1));
+ whiteboardObject.setZoom((Integer)
actionObject.get(2));
+
+ whiteBoardObjectListManagerById
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+ whiteboardObject, whiteBoardId);
} else {
log.warn("Unkown Type: " + action + "
actionObject: "
+ actionObject);
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Wed Oct 23 03:58:19 2013
@@ -1097,6 +1097,8 @@
this.setAttribute("x",actionObject[1]);
this.setAttribute("y",actionObject[2]);
+ } else if(actionObject[0]=='whiteboardObj'){
+ this.doUpdateFullFitAndZoomRemote(actionObject);
} else if(action=='flv'){
this.playFLVRemote(actionObject);
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
Wed Oct 23 03:58:19 2013
@@ -111,13 +111,13 @@
]]>
</method>
- <method name="doUpdateFullFitAndZoomRemote" args="actionObject,refObj">
+ <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
<![CDATA[
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
this.doFullFit(actionObject[1]);
- if ($debug) Debug.write("doUpdateFullFitAndZoomRemote
",fullFit,actionObject[2]);
+ if ($debug) Debug.write("doUpdateFullFitAndZoomRemote
",actionObject[1],actionObject[2]);
if (!actionObject[1]) {
this.getDisplayObject()._xscale = actionObject[2];
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java?rev=1534902&r1=1534901&r2=1534902&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/whiteboard/WhiteboardManager.java
Wed Oct 23 03:58:19 2013
@@ -310,6 +310,17 @@ public class WhiteboardManager {
whiteBoardObjectListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
+ } else if (action.equals("whiteboardObj")) {
+ WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+ whiteBoardId);
+
+ whiteboardObject.setFullFit((Boolean)
actionObject.get(1));
+ whiteboardObject.setZoom((Integer)
actionObject.get(2));
+
+ whiteBoardObjectListManagerById
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+ whiteboardObject, whiteBoardId);
} else {
log.warn("Unkown Type: " + action + "
actionObject: "
+ actionObject);
