You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2016/05/05 09:02:20 UTC
svn commit: r1742384 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/
3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/
Author: vdegtyarev
Date: Thu May 5 09:02:20 2016
New Revision: 1742384
URL: http://svn.apache.org/viewvc?rev=1742384&view=rev
Log:
OPENMEETINGS-1371 is fixed. Scrolling works as expected after scaling document on whiteboard.
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
openmeetings/application/branches/3.1.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/fixedFileExplorerWhiteBoard.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1742384&r1=1742383&r2=1742384&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu May 5 09:02:20 2016
@@ -195,7 +195,7 @@
<handler name="onx" args="x"><![CDATA[
if (this.sendUpdate) {
if ($debug) Debug.write("# x",x);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
@@ -204,7 +204,7 @@
<handler name="ony" args="y"><![CDATA[
if (this.sendUpdate) {
if ($debug) Debug.write("# y", y);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
@@ -213,7 +213,7 @@
<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 && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
parent.parent.zoombox.sendUpdate(null);
@@ -222,20 +222,18 @@
<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 && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
]]></handler>
<handler name="onupdateScale" args="tRef"><![CDATA[
if ($debug) Debug.write("# updateScale",this.getDisplayObject().scaleX);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
]]></handler>
- <attribute name="initH"/>
- <attribute name="initW"/>
<handler name="oninit">
canvas._drawarea = this;
</handler>
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=1742384&r1=1742383&r2=1742384&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 Thu May 5 09:02:20 2016
@@ -89,7 +89,7 @@
<handler name="onopenWhiteBoard" >
if ($debug) Debug.write(".. onopenWhiteBoard ..");
- this.loadInitObject()
+ this.loadInitObject();
</handler>
<!--
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1742384&r1=1742383&r2=1742384&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu May 5 09:02:20 2016
@@ -195,7 +195,7 @@
<handler name="onx" args="x"><![CDATA[
if (this.sendUpdate) {
if ($debug) Debug.write("# x",x);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
@@ -204,7 +204,7 @@
<handler name="ony" args="y"><![CDATA[
if (this.sendUpdate) {
if ($debug) Debug.write("# y", y);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
}
@@ -213,7 +213,7 @@
<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 && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
parent.parent.zoombox.sendUpdate(null);
@@ -222,20 +222,18 @@
<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 && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
]]></handler>
<handler name="onupdateScale" args="tRef"><![CDATA[
if ($debug) Debug.write("# updateScale",this.getDisplayObject().scaleX);
- if ('scrollContainer' in parent.parent && parent.parent.scrollContainer) {
+ if (parent.parent && parent.parent.scrollContainer) {
parent.parent.scrollContainer.calcScrollContent();
}
]]></handler>
- <attribute name="initH"/>
- <attribute name="initW"/>
<handler name="oninit">
canvas._drawarea = this;
</handler>
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=1742384&r1=1742383&r2=1742384&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 Thu May 5 09:02:20 2016
@@ -78,7 +78,7 @@
</class>
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
- labelid="615" visible="${ canvas.currentRoomObj.hiddenElements.indexOf('Whiteboard') < 0 }">
+ labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
<attribute name="whiteboardCount" value="0" type="number" />
<!--
@@ -89,7 +89,7 @@
<handler name="onopenWhiteBoard" >
if ($debug) Debug.write(".. onopenWhiteBoard ..");
- this.loadInitObject()
+ this.loadInitObject();
</handler>
<!--