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 2017/06/15 10:34:34 UTC
openmeetings git commit: [OPENMEETINGS-159] both scrollbars are
visible for all users
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x f8c0d0333 -> eafb9b165
[OPENMEETINGS-159] both scrollbars are visible for all users
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/eafb9b16
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/eafb9b16
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/eafb9b16
Branch: refs/heads/3.3.x
Commit: eafb9b1655e82ef7db4e318e44005635711339ed
Parents: f8c0d03
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jun 15 17:34:24 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jun 15 17:34:24 2017 +0700
----------------------------------------------------------------------
.../whiteboard/fixedFileExplorerWhiteBoard.lzx | 29 ++++++++++++++------
1 file changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/eafb9b16/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
index 97101e4..e9eb115 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
@@ -130,9 +130,9 @@
<!--
The Content Area
-->
- <view width="${ parent.parent.width-2 }"
- height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-42-parent._propertyPanel.height) : (parent.parent.height-42)) }"
- y="0" name="_drawareaMask" clip="true" bgcolor="0xFFFFFF" >
+ <view name="_drawareaMask" width="${ parent.parent.width - 2 }"
+ height="${ parent.parent.height - 42 - (parent._propertyPanel.visible ? parent._propertyPanel.height : 0) }"
+ y="0" clip="true" bgcolor="0xFFFFFF" >
<handler name="oninit">
if ($debug) Debug.info("lz.Track.register ",canvas.currentImagesListdraw.currentTrackGroupName);
@@ -314,9 +314,7 @@
</remoteWhiteboard>
</view>
- <view name="scrollContainer" width="${ parent.parent.width-2 }"
- visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
- height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-33-parent._propertyPanel.height) : (parent.parent.height-33)) }" >
+ <view name="scrollContainer" width="${ parent.parent.width - 2 }" height="${ parent._drawareaMask.height }" >
<attribute name="sendUpdate" value="true" type="boolean"/>
<method name="calcScrollContent">
@@ -336,14 +334,18 @@
<attribute name="sendObjectDel" value="null" />
<handler name="oninit">
- this.sendObjectDel = new LzDelegate( this, "sendObject" );
+ this.sendObjectDel = new LzDelegate(this, "sendObject");
</handler>
<handler name="onx" args="x">
+ <![CDATA[
if (parent.sendUpdate) {
if ($debug) Debug.write("# scrollview x",x);
parent.parent._drawareaMask._drawarea.setAttribute("x",x);
+ if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
+ return; // only moderator should send updates
+ }
if (!this.timeisInited){
this.timeisInited=true;
lz.Timer.addTimer( this.sendObjectDel, 250 );
@@ -351,13 +353,18 @@
lz.Timer.resetTimer( this.sendObjectDel, 250 );
}
}
+ ]]>
</handler>
<handler name="ony" args="y">
+ <![CDATA[
if (parent.sendUpdate) {
if ($debug) Debug.write("# scrollview y",y);
parent.parent._drawareaMask._drawarea.setAttribute("y",y);
+ if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
+ return; // only moderator should send updates
+ }
if (!this.timeisInited){
this.timeisInited=true;
lz.Timer.addTimer( this.sendObjectDel, 250 );
@@ -365,9 +372,14 @@
lz.Timer.resetTimer( this.sendObjectDel, 250 );
}
}
+ ]]>
</handler>
<method name="sendObject" args="itemRef">
+ <![CDATA[
+ if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
+ return; // only moderator should send updates
+ }
if ($debug) Debug.info("sendObject :: scrollview");
var tArray = new Array();
@@ -377,6 +389,7 @@
this.parent.parent._drawareaMask._drawarea.onsharedMessage('moveMap',tArray);
this.timeisInited=false;
+ ]]>
</method>
</view>
@@ -510,7 +523,7 @@
</method>
<labelCheckbox x="344" name="_fullFit" labelid="847" y="4" fontstyle="bold" bgcolor="0xFFFFFF"
- visible="${ ((canvas.becomemoderator) ? true : false ) }">
+ visible="${ (canvas.ismoderator ? true : false ) }">
<handler name="onvalue" args="v"><![CDATA[
if (parent.ignoreUpdates) {
return;