Revision: 4219
Author: seba.wagner
Date: Sat Sep 10 03:17:25 2011
Log: Fixes issue 1489
http://code.google.com/p/openmeetings/source/detail?r=4219
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Sat Sep 10 02:21:13 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Sat Sep 10 03:17:25 2011
@@ -35,6 +35,8 @@
<attribute name="copyObject" value="null"/>
<attribute name="selectedObjects" value="null"/>
+
+ <attribute name="ObjectByName" value="null" />
<method name="getCounter">
//Debug.write("### getCounter :",this.counter);
@@ -103,6 +105,9 @@
<attribute name="isDragging" value="false" type="boolean"/>
+ <attribute name="last_x" value="0" type="number" />
+ <attribute name="last_y" value="0" type="number" />
+
<!-- ############
init
-->
@@ -114,6 +119,8 @@
//Debug.write("********** this oninit: ",this);
this.basdrawredoView = new LzView(canvas,{visible:false,y:440});
this.layers = new Array();
+ this.last_x = this.x;
+ this.last_y = this.y;
this.redolayers = new Array();
this.baseactionobjectList = new Array();
this.baseredoactionobjectList = new Array();
@@ -727,6 +734,14 @@
this.setAttribute("x",Math.round(this.x));
this.setAttribute("y",Math.round(this.y));
+ if (this.last_x == this.x && this.last_x ==
this.x) {
+ if ($debug) Debug.write("No Change");
+ return;
+ }
+
+ this.last_x = this.x;
+ this.last_y = this.y;
+
var tArray = new Array();
tArray[0] = "moveMap";
tArray[1] = this.x;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Jun 24 08:51:46 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Sat Sep 10 03:17:25 2011
@@ -55,6 +55,8 @@
<method name="doUpdateFullFit" args="fullFit,zoom">
<![CDATA[
+ if ($debug) Debug.write("doUpdateFullFit ",fullFit,zoom);
+
var actionObject = new Array();
actionObject.push("whiteboardObj");
actionObject.push(fullFit);
@@ -109,12 +111,14 @@
<method name="doFullFit" args="v">
<![CDATA[
+ if ($debug) Debug.write("Do Full Fit ?");
+ if ($debug) Debug.write(this.ObjectByName);
this.fullFit = v;
if (this.ObjectByName &&
this.ObjectByName.typeOfObject=="swf") {
if (v) {
- if ($debug) Debug.write("Do Full Fit");
+ if ($debug) Debug.write("Do Full Fit !");
this.ObjectByName._swfView.initialLoadFullFit();
}
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Tue Jun 21 09:57:41 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Sat Sep 10 03:17:25 2011
@@ -16,9 +16,12 @@
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) {
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Sun Sep 4 01:44:00 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Sat Sep 10 03:17:25 2011
@@ -575,11 +575,22 @@
</view>
- <view name="zoombox" y="0" x="${ parent.width-this.width-14 }"
layout="axis:x;spacing:2"
+ <view name="zoombox" y="0" x="${ parent.parent.width-this.width-14 }"
layout="axis:x;spacing:2"
visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
<attribute name="ignoreUpdates" value="false" type="boolean" />
+ <handler name="onx" args="x">
+ if (this._fullFit.getValue()) {
+ if ($debug) Debug.write("on x ",x);
+ lz.Timer.addTimer( new LzDelegate( this, "sendUpdate"
), 100 );
+ }
+ </handler>
+
+ <method name="sendUpdate" args="refObj">
+ parent._drawareaMask._drawarea.doFullFit(true);
+ </method>
+
<method name="setWhiteboardValues" args="fullFit,zoom">
if ($debug) Debug.write("setWhiteboardValues
-1- ",fullFit,zoom);
this.ignoreUpdates = true;
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
