You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/06/10 01:28:10 UTC
svn commit: r1491311 - in /openmeetings/trunk/singlewebapp/WebContent/src:
base/components/lps/vslider.lzx
modules/conference/whiteboard/base/baseDrawObject.lzx
modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Author: sebawagner
Date: Sun Jun 9 23:28:09 2013
New Revision: 1491311
URL: http://svn.apache.org/r1491311
Log:
Improvements to zoom:
- zoombar / vslider - make scroll track clickable
- fix when property panel or chat panel is minimized or maximized and fullfit is enabled document will resize
- fix tooltip of zoom icon
+ some debug output to trace events
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/vslider.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/vslider.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/vslider.lzx?rev=1491311&r1=1491310&r2=1491311&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/vslider.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/vslider.lzx Sun Jun 9 23:28:09 2013
@@ -37,6 +37,10 @@
height="${ (this.parent.parent.switchaxis) ?
(parent.parent._vslidertrack.height - parent.parent._sliderthumb.y-1) :
parent.parent._sliderthumb.y }" />
+ <handler name="onclick">
+ var newy = parent.getMouse("y");
+ parent._sliderthumb.setNewYFromTrack(newy);
+ </handler>
</class>
<class name="vsliderThumb" extends="button" bgcolor="0x999999" height="10" width="20"
@@ -46,6 +50,20 @@
<attribute name="showvalue" type="boolean" value="true" />
<attribute name="drag_max" value="0" type="number" />
+ <method name="setNewYFromTrack" args="y">
+ <![CDATA[
+ if (y > drag_max) {
+ this.setAttribute("y",this.drag_max);
+ return;
+ }
+ if (y < drag_min) {
+ this.setAttribute("y",this.drag_min);
+ return;
+ }
+ this.setAttribute("y",y);
+ ]]>
+ </method>
+
<handler name="oninit">
//Setting the initVal
this.setY(getPosFromValue(this.parent.initvalue));
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=1491311&r1=1491310&r2=1491311&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 Sun Jun 9 23:28:09 2013
@@ -130,7 +130,7 @@
<method name="doFullFit" args="v">
<![CDATA[
- if ($debug) Debug.write("Do Full Fit ?");
+ if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v);
if ($debug) Debug.write(this.ObjectByName);
this.fullFit = v;
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1491311&r1=1491310&r2=1491311&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Sun Jun 9 23:28:09 2013
@@ -217,6 +217,7 @@
if ($debug) Debug.write("# height",h);
//this.dragger.drag_min_x = parent.width - w;
parent.parent.scrollContainer.calcScrollContent();
+ parent.parent.zoombox.sendUpdate(null);
</handler>
<handler name="onwidth" args="w">
@@ -511,12 +512,13 @@
<handler name="onx" args="x">
if (this._fullFit.getValue()) {
- if ($debug) Debug.write("on x ",x);
+ if ($debug) Debug.write("on x sendUpdate ",x);
lz.Timer.addTimer( new LzDelegate( this, "sendUpdate" ), 100 );
}
</handler>
<method name="sendUpdate" args="refObj">
+ if ($debug) Debug.write("fixedFileExplorer sendUpdate ",refObj);
parent._drawareaMask._drawarea.doFullFit(true);
</method>
@@ -547,7 +549,7 @@
<labelTooltip labelid="1212" multiline="true" />
</labelCheckbox>
- <changeWidthSlider name="_zoom" initialNumberInit="50"
+ <changeWidthSlider name="_zoom" initialNumberInit="50" labelid="1328"
boxPosition="down" initialNumber="50" maximum="200">
<handler name="oninitialNumber" args="i">
if (parent.ignoreUpdates) {