Author: solomax
Date: Thu Dec 8 16:23:43 2016
New Revision: 1773267
URL: http://svn.apache.org/viewvc?rev=1773267&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
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.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.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
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx?rev=1773267&r1=1773266&r2=1773267&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
Thu Dec 8 16:23:43 2016
@@ -30,6 +30,7 @@
<!--- if this Box should be closeable -->
<attribute name="closable" value="false" type="boolean" />
+ <attribute name="minimizable" value="true" type="boolean" />
<!--- Title of this window -->
<attribute name="title" type="string" value="basePanel" />
@@ -38,7 +39,8 @@
<attribute name="initheight" value="0" type="number" />
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
-
+ <attribute name="titlePos" type="number" value="0" />
+
<method name="setLabelId" args="_labelid" >
this.labelid = _labelid;
this.title=canvas.getLabelName(this.labelid);
@@ -55,10 +57,10 @@
}
</method>
- <handler name="oninit">
- if ($debug) Debug.write("basePropertyPanel:: oninit");
- this.initheight=this.height;
- </handler>
+ <handler name="oninit">
+ if ($debug) Debug.write("basePropertyPanel:: oninit");
+ this.initheight=this.height;
+ </handler>
<view width="${ this.parent.width }" height="${ this.parent.height-2 }"
x="0" y="1" />
@@ -70,36 +72,36 @@
<view x="0" y="19" width="${ this.parent.width }" height="1"
bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" />
- <view x="0" y="1" width="${ this.parent.width }" height="20" >
-
+ <view name="_titleView" x="${ parent.titlePos }" y="1" width="${
this.parent.width - parent.titlePos }" height="20" >
<handler name="onclick">
- this.parent.toggleopen();
- </handler>
+ if (parent.minimizable) {
+ this.parent.toggleopen();
+ }
+ </handler>
- <text fontsize="11" height="17" x="16" y="1" text="${
this.parent.parent.title }"
+ <text fontsize="11" height="17" x="${ parent.parent.titlePos +
16 }" y="1" text="${ this.parent.parent.title }"
fgcolor="$once{ canvas.getThemeColor('menuTextColor')
}" resize="true" fontstyle="bold" />
-
+
<button visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-23 }"
y="1" text="X" height="18" width="20" >
<handler name="onmouseup">
this.parent.parent.close();
- </handler>
+ </handler>
</button>
- <view visible="${ !this.parent.parent.isopen }" x="2" y="2"
resource="conferenceBox_button_min_small_rsc">
+ <view visible="${ !this.parent.parent.isopen }" x="${
parent.parent.titlePos + 2 }" y="2"
resource="conferenceBox_button_min_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
</handler>
- <labelTooltip name="_labelTooltip" labelid="857" />
+ <labelTooltip name="_labelTooltip" labelid="857" />
</view>
- <view visible="${ this.parent.parent.isopen }" x="2" y="2"
resource="conferenceBox_button_max_small_rsc">
+ <view visible="${ parent.parent.minimizable &&
this.parent.parent.isopen }" x="${ parent.parent.titlePos + 2 }" y="2"
resource="conferenceBox_button_max_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
</handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
+ <labelTooltip name="_labelTooltip" labelid="856" />
</view>
-
</view>
</class>
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=1773267&r1=1773266&r2=1773267&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 Dec 8 16:23:43 2016
@@ -576,7 +576,7 @@
</view>
<propertyPanel name="_propertyPanel" x="0" y="${
parent.parent.height-this.height-42 }"
- visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
+ visible="${ canvas.ismoderator || canvas.isAllowedToDraw
}">
<handler name="onheight" args="h">
this.height = h;
if ($debug) Debug.write("onheight: ",h);
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=1773267&r1=1773266&r2=1773267&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 Dec 8 16:23:43 2016
@@ -123,9 +123,9 @@
whiteboardId:whiteboardId
});
var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
-
objRef:whiteboard,
+ objRef:
whiteboard,
width:
_bar.staticwidth,
-
isactive:true,
+
isactive: true,
btnName: wbName
});
this._bar.currentBtn = tWhiteboardBtn;
@@ -263,13 +263,13 @@
]]>
</method>
- <view name="scrollLeft" y="21" x="0" width="20">
+ <view name="scrollLeft" y="21" x="20" width="20">
<handler name="onclick" args="refOb">
parent._barArea._scroll.step(-1);
</handler>
<view resource="wb_arrow_left_rsc" y="0" x="0" opacity="${
parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
</view>
- <view name="_barArea" width="${ parent.width - 60 }" height="20" x="20"
y="21" clip="true">
+ <view name="_barArea" width="${ parent.width - 60 }" height="20" x="40"
y="21" clip="true">
<whiteboardBarMenu name="_bar" height="20" y="0" x="0">
<attribute name="whiteboardId" value="-1" type="number"
/>
@@ -279,14 +279,14 @@
</whiteboardBarMenu>
<om_hscrollbar name="_scroll" height="0" stepsize="50"/>
</view>
- <view name="scrollRight" y="21" x="${ parent.width - 40 }" width="20">
+ <view name="scrollRight" y="21" x="${ parent.width - 20 }" width="20">
<handler name="onclick" args="refOb">
parent._barArea._scroll.step(1);
</handler>
<view resource="wb_arrow_right_rsc" y="0" x="0" opacity="${
parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
</view>
- <view name="addNewItemButton" y="24" x="${ parent.width - 20 }"
+ <view name="addNewItemButton" y="24" x="0"
visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
<attribute name="whiteboardId" value="-1" type="number" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1773267&r1=1773266&r2=1773267&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Thu Dec 8 16:23:43 2016
@@ -21,10 +21,10 @@
<library>
<class name="propertyPanel" extends="basePropertyPanel"
- width="${ parent.parent.width-1 }" height="80" labelid="843" >
-
+ width="${ parent.parent.width-1 }" height="80" labelid="843" >
+
<attribute name="ignoreUpdates" value="false" type="boolean" />
-
+
<method name="setObjectBounds" args="x,y,width,height">
if ($debug) Debug.write("setObjectBounds: ",x,y,width,height);
this._content._xvalue.setAttribute('text',x);
@@ -176,7 +176,6 @@
</method>
<view name="_content" visible="${this.parent.isopen}" >
-
<labelTextWidthTooltip name="_xvalueLabel" x="4" y="24"
labelid="545" labelLabelid="546" />
<customEdittext name="_xvalue" x="24" y="24"
regexpType="number"
@@ -344,12 +343,8 @@
<!-- 340 -->
<view name="_clickLayer" clickable="true" opacity="0.75" x="340"
- width="460" height="$once{ parent.height - this.y }"
- y="20" showhandcursor="false" bgcolor="0xFFFFFF" />
-
+ width="460" height="$once{ parent.height -
this.y }"
+ y="20" showhandcursor="false"
bgcolor="0xFFFFFF" />
</view>
-
</class>
-
-
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx?rev=1773267&r1=1773266&r2=1773267&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
Thu Dec 8 16:23:43 2016
@@ -30,6 +30,7 @@
<!--- if this Box should be closeable -->
<attribute name="closable" value="false" type="boolean" />
+ <attribute name="minimizable" value="true" type="boolean" />
<!--- Title of this window -->
<attribute name="title" type="string" value="basePanel" />
@@ -73,12 +74,14 @@
<view name="_titleView" x="${ parent.titlePos }" y="1" width="${
this.parent.width - parent.titlePos }" height="20" >
<handler name="onclick">
- this.parent.toggleopen();
+ if (parent.minimizable) {
+ this.parent.toggleopen();
+ }
</handler>
<text fontsize="11" height="17" x="${ parent.parent.titlePos +
16 }" y="1" text="${ this.parent.parent.title }"
fgcolor="$once{ canvas.getThemeColor('menuTextColor')
}" resize="true" fontstyle="bold" />
-
+
<button visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-23 }"
y="1" text="X" height="18" width="20" >
<handler name="onmouseup">
@@ -93,7 +96,7 @@
<labelTooltip name="_labelTooltip" labelid="857" />
</view>
- <view visible="${ this.parent.parent.isopen }" x="${
parent.parent.titlePos + 2 }" y="2"
resource="conferenceBox_button_max_small_rsc">
+ <view visible="${ parent.parent.minimizable &&
this.parent.parent.isopen }" x="${ parent.parent.titlePos + 2 }" y="2"
resource="conferenceBox_button_max_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
</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=1773267&r1=1773266&r2=1773267&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 Dec 8 16:23:43 2016
@@ -576,7 +576,7 @@
</view>
<propertyPanel name="_propertyPanel" x="0" y="${
parent.parent.height-this.height-42 }"
- visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
+ visible="${ canvas.ismoderator || canvas.isAllowedToDraw
}">
<handler name="onheight" args="h">
this.height = h;
if ($debug) Debug.write("onheight: ",h);
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=1773267&r1=1773266&r2=1773267&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 Dec 8 16:23:43 2016
@@ -123,9 +123,9 @@
whiteboardId:whiteboardId
});
var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
-
objRef:whiteboard,
+ objRef:
whiteboard,
width:
_bar.staticwidth,
-
isactive:true,
+
isactive: true,
btnName: wbName
});
this._bar.currentBtn = tWhiteboardBtn;
@@ -263,13 +263,13 @@
]]>
</method>
- <view name="scrollLeft" y="21" x="0" width="20">
+ <view name="scrollLeft" y="21" x="20" width="20">
<handler name="onclick" args="refOb">
parent._barArea._scroll.step(-1);
</handler>
<view resource="wb_arrow_left_rsc" y="0" x="0" opacity="${
parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
</view>
- <view name="_barArea" width="${ parent.width - 60 }" height="20" x="20"
y="21" clip="true">
+ <view name="_barArea" width="${ parent.width - 60 }" height="20" x="40"
y="21" clip="true">
<whiteboardBarMenu name="_bar" height="20" y="0" x="0">
<attribute name="whiteboardId" value="-1" type="number"
/>
@@ -279,14 +279,14 @@
</whiteboardBarMenu>
<om_hscrollbar name="_scroll" height="0" stepsize="50"/>
</view>
- <view name="scrollRight" y="21" x="${ parent.width - 40 }" width="20">
+ <view name="scrollRight" y="21" x="${ parent.width - 20 }" width="20">
<handler name="onclick" args="refOb">
parent._barArea._scroll.step(1);
</handler>
<view resource="wb_arrow_right_rsc" y="0" x="0" opacity="${
parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
</view>
- <view name="addNewItemButton" y="24" x="${ parent.width - 20 }"
+ <view name="addNewItemButton" y="24" x="0"
visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
<attribute name="whiteboardId" value="-1" type="number" />
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1773267&r1=1773266&r2=1773267&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Thu Dec 8 16:23:43 2016
@@ -176,7 +176,6 @@
</method>
<view name="_content" visible="${this.parent.isopen}" >
-
<labelTextWidthTooltip name="_xvalueLabel" x="4" y="24"
labelid="545" labelLabelid="546" />
<customEdittext name="_xvalue" x="24" y="24"
regexpType="number"
@@ -344,12 +343,8 @@
<!-- 340 -->
<view name="_clickLayer" clickable="true" opacity="0.75" x="340"
- width="460" height="$once{ parent.height - this.y }"
- y="20" showhandcursor="false" bgcolor="0xFFFFFF" />
-
+ width="460" height="$once{ parent.height -
this.y }"
+ y="20" showhandcursor="false"
bgcolor="0xFFFFFF" />
</view>
-
</class>
-
-
</library>
