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/05/01 06:10:53 UTC
[02/50] [abbrv] openmeetings git commit: no jira: code clean-up
no jira: code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6fc36422
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6fc36422
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6fc36422
Branch: refs/heads/3.1.x
Commit: 6fc36422674878e9878958d6bacd447e6952156a
Parents: 68008ec
Author: Maxim Solodovnik <so...@apache.org>
Authored: Thu Dec 22 17:46:27 2016 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Thu Dec 22 17:46:27 2016 +0000
----------------------------------------------------------------------
.../swf/base/components/text/labelTooltip.lzx | 4 +-
.../whiteboard/fixedFileExplorerWhiteBoard.lzx | 20 +-
.../panels/maintoolspanel/mainToolsPanel.lzx | 324 +++++++++----------
.../maintoolspanel/mainToolsPanelItem.lzx | 41 ++-
.../panels/propertypanel/propertyPanel.lzx | 2 +-
5 files changed, 179 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fc36422/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx b/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
index 31024bb..1f5d3c0 100644
--- a/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
+++ b/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
@@ -34,9 +34,9 @@
<handler name="onmouseover" reference="this.parent">
<![CDATA[
this.doonmouseover();
- ]]>
+ ]]>
</handler>
-
+
<method name="doonmouseover">
<![CDATA[
this.setContent.sendEvent();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fc36422/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 67cf4cf..00a9095 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
@@ -162,7 +162,7 @@
<handler name="onmousetrackover">
if ($debug) Debug.write("onmousetrackover");
canvas.currentImagesListdraw.currentDragItem.sendOverItem(this);
- this.setAttribute("bgcolor",0x93FE92);
+ this.setAttribute("bgcolor", 0x93FE92);
</handler>
<handler name="onmousetrackout">
@@ -416,16 +416,16 @@
</method>
<method name="setSelection" args="obj">
- if ($debug) Debug.write("setSelection ",obj);
+ if ($debug) Debug.write("setSelection ", obj);
parent._drawareaMask._drawarea.removeObjectBounds();
- if (obj.setSelectionToItem){
- if (this.objectRef!=null){
+ if (obj.setSelectionToItem) {
+ if (this.objectRef != null) {
this.objectRef._isselected = false;
- this.objectRef.setAttribute('enabled',true);
+ this.objectRef.setAttribute('enabled', true);
}
this.objectRef = obj;
this.objectRef._isselected = true;
- this.objectRef.setAttribute('enabled',false);
+ this.objectRef.setAttribute('enabled', false);
}
if (obj.modi=="saveobj"){
parent._drawareaMask._drawarea.doAction(obj.modi);
@@ -435,14 +435,14 @@
</method>
<method name="setSelectionWithoutEvent" args="obj">
- if (obj.setSelectionToItem){
- if (this.objectRef!=null){
+ if (obj.setSelectionToItem) {
+ if (this.objectRef != null) {
this.objectRef._isselected = false;
- this.objectRef.setAttribute('enabled',true);
+ this.objectRef.setAttribute('enabled', true);
}
this.objectRef = obj;
this.objectRef._isselected = true;
- this.objectRef.setAttribute('enabled',false);
+ this.objectRef.setAttribute('enabled', false);
}
</method>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fc36422/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
index f975c84..07e9c89 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
@@ -9,40 +9,40 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<library>
-
+
<class name="verticalMenuIconBar" extends="view" y="22" x="4" clickable="true">
<simplelayout axis="y" spacing="2" />
<mainToolsPanelItem name="plain" modi="plainConfirm" labelid="69" resourceItem="plain" setSelectionToItem="false" />
<mainToolsPanelItem name="plainSlide" modi="plainSlide" labelid="1005" resourceItem="plainSlides" setSelectionToItem="false" />
-
+
<!--
<mainToolsPanelItem name="drag" modi="drag" labelid="1113" resourceItem="arrow_draw_panel_tool_cursor" />
-->
<mainToolsPanelItem name="saveobj" modi="saveobj" labelid="197" resourceItem="saveobj" setSelectionToItem="false" />
-
+
<mainToolsHPanelSeperator>
- <attribute name="modi" value="" type="string"/>
- </mainToolsHPanelSeperator>
+ <attribute name="modi" value="" type="string"/>
+ </mainToolsHPanelSeperator>
<redoUndoToolsPanelItem name="revert" doredo="false" labelid="70" resourceItem="revert" />
<mainToolsHPanelSeperator>
<attribute name="modi" value="" type="string"/>
</mainToolsHPanelSeperator>
- <mainToolsPanelItem name="hand" modi="hand" labelid="72" _isselected="true"
+ <mainToolsPanelItem name="hand" modi="hand" labelid="72" _isselected="true"
resourceItem="menupointer_rsc" />
- <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard"
- labelid="557" x_insetResource="1" y_insetResource="1"
- resourceItem="pointer_whiteboard_menu_rsc" />
+ <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard"
+ labelid="557" x_insetResource="1" y_insetResource="1"
+ resourceItem="pointer_whiteboard_menu_rsc" />
<mainToolsPanelItem name="letter" modi="letter" labelid="73" resourceItem="letter" />
<mainToolsPanelItem name="paint" modi="paint" labelid="74" resourceItem="paint" />
<mainToolsPanelItem name="line" modi="line" labelid="75" resourceItem="line_rsc" />
@@ -51,62 +51,48 @@
<mainToolsPanelItem name="ellipse" modi="ellipse" labelid="78" resourceItem="ellipse" />
<mainToolsPanelItem name="drawarrow" modi="drawarrow" labelid="79" resourceItem="drawarrowicon_rsc" />
- <mainToolsPanelItem name="clipart" modi="clipart" labelid="1323" >
-
- <handler name="oninit">
- if (this["_bgIcon"]) {
- this._bgIcon.setAttribute("visible", false);
- }
- var imageurl = canvas.getUrl() + 'public/cliparts/thumb/'
- + canvas._drawarea.currentClipArtRessourceName;
-
- this._rscIcon.setSource(imageurl);
- </handler>
-
- <!--
- <view x="$once{ parent.x_insetResource }" y="$once{ parent.x_insetResource }"
- height="18" width="18" stretches="both" name="_bgIconIcon" />
- -->
-
- <view resource="sub_menu_tools_panel_rsc"
- x="$once{ parent.width - 10 }" y="$once{ parent.height - 10 }">
- <handler name="onclick">
- <![CDATA[
- if ($debug) Debug.write("Show Sub Menu");
- new lz.subMenuIconToolsToUpload(canvas,{
- x:500,
- y:82,
- refToolbar:parent
- });
- ]]>
- </handler>
- <labelTooltip labelid="1335" />
- </view>
-
- </mainToolsPanelItem>
+ <mainToolsPanelItem name="clipart" modi="clipart" labelid="1323" >
+ <handler name="oninit">
+ if (!!this["_bgIcon"]) {
+ this._bgIcon.setAttribute("visible", false);
+ }
+ var imageurl = canvas.getUrl() + 'public/cliparts/thumb/' + canvas._drawarea.currentClipArtRessourceName;
+ //if ($debug) Debug.write("!!!!!! CLIPART:: ", imageurl);
+ _rscIcon.setAttribute("src", imageurl);
+ </handler>
+ <view resource="sub_menu_tools_panel_rsc"
+ x="$once{ parent.width - 10 }" y="$once{ parent.height - 10 }">
+ <handler name="onclick">
+ <![CDATA[
+ if ($debug) Debug.write("Show Sub Menu");
+ new lz.subMenuIconToolsToUpload(canvas,{
+ x:500,
+ y:82,
+ refToolbar:parent
+ });
+ ]]>
+ </handler>
+ <labelTooltip labelid="1335" />
+ </view>
+ </mainToolsPanelItem>
</class>
<class name="horizontalMenuIconBar" extends="view" y="22" x="4" clickable="true">
<simplelayout axis="x" spacing="2" />
<mainToolsPanelItem name="plain" modi="plainConfirm" labelid="69" resourceItem="plain" setSelectionToItem="false" />
<mainToolsPanelItem name="plainSlide" modi="plainSlide" labelid="1005" resourceItem="plainSlides" setSelectionToItem="false" />
- <!--
- <mainToolsPanelItem name="drag" modi="drag" labelid="1113" resourceItem="arrow_draw_panel_tool_cursor" />
- -->
<mainToolsPanelItem name="saveobj" modi="saveobj" labelid="197" resourceItem="saveobj" setSelectionToItem="false" />
-
+
<mainToolsVPanelSeperator>
- <attribute name="modi" value="" type="string"/>
- </mainToolsVPanelSeperator>
+ <attribute name="modi" value="" type="string"/>
+ </mainToolsVPanelSeperator>
<redoUndoToolsPanelItem name="revert" doredo="false" labelid="70" resourceItem="revert" />
<mainToolsVPanelSeperator>
- <attribute name="modi" value="" type="string"/>
- </mainToolsVPanelSeperator>
- <mainToolsPanelItem name="hand" modi="hand" labelid="72" _isselected="true"
- resourceItem="menupointer_rsc" />
- <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard"
- labelid="557" resourceItem="pointer_whiteboard_menu_rsc" />
+ <attribute name="modi" value="" type="string"/>
+ </mainToolsVPanelSeperator>
+ <mainToolsPanelItem name="hand" modi="hand" labelid="72" _isselected="true" resourceItem="menupointer_rsc" />
+ <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557" resourceItem="pointer_whiteboard_menu_rsc" />
<mainToolsPanelItem name="letter" modi="letter" labelid="73" resourceItem="letter" />
<mainToolsPanelItem name="paint" modi="paint" labelid="74" resourceItem="paint" />
<mainToolsPanelItem name="line" modi="line" labelid="75" resourceItem="line_rsc" />
@@ -115,141 +101,125 @@
<mainToolsPanelItem name="ellipse" modi="ellipse" labelid="78" resourceItem="ellipse" />
<mainToolsPanelItem name="drawarrow" modi="drawarrow" labelid="79" resourceItem="drawarrowicon_rsc" />
<mainToolsPanelItem name="clipart" modi="clipart" labelid="1323" >
-
- <handler name="oninit">
- if (this["_bgIcon"]) {
- this._bgIcon.setAttribute("visible", false);
- }
- var imageurl = canvas.getUrl() + 'public/cliparts/thumb/'
- + canvas._drawarea.currentClipArtRessourceName;
-
- this._rscIcon.setSource(imageurl);
- </handler>
-
- <view x="$once{ parent.x_insetResource }" y="$once{ parent.x_insetResource }"
- height="18" width="18" stretches="both" name="_bgIconIcon" />
-
- <view resource="sub_menu_tools_panel_rsc"
- x="$once{ parent.width - 10 }" y="$once{ parent.height - 10 }">
- <handler name="onclick">
- if ($debug) Debug.write("Show Sub Menu");
- new lz.subMenuIconToolsToUpload(canvas,{
- x:500,
- y:82,
- refToolbar:parent
- });
- </handler>
- <labelTooltip labelid="1335" />
- </view>
-
- </mainToolsPanelItem>
+ <handler name="oninit">
+ if (!!this["_bgIcon"]) {
+ this._bgIcon.setAttribute("visible", false);
+ }
+ var imageurl = canvas.getUrl() + 'public/cliparts/thumb/' + canvas._drawarea.currentClipArtRessourceName;
+ //if ($debug) Debug.write("!!!!!! CLIPART:: ", imageurl);
+ _rscIcon.setAttribute("src", imageurl);
+ </handler>
+
+ <view x="$once{ parent.x_insetResource }" y="$once{ parent.x_insetResource }"
+ height="18" width="18" stretches="both" name="_bgIconIcon" />
+
+ <view resource="sub_menu_tools_panel_rsc" x="$once{ parent.width - 10 }" y="$once{ parent.height - 10 }">
+ <handler name="onclick">
+ if ($debug) Debug.write("Show Sub Menu");
+ new lz.subMenuIconToolsToUpload(canvas,{
+ x:500,
+ y:82,
+ refToolbar:parent
+ });
+ </handler>
+ <labelTooltip labelid="1335" />
+ </view>
+ </mainToolsPanelItem>
</class>
+<class name="mainToolsTopPanel" extends="baseTopPanel"
+ width="448" height="33" title="" docking="true"
+ activationClassBounding="mainToolsLeftPanel"
+ activationVClassBounding="mainToolsTopPanel"
+ leftClassPanel="mainToolsLeftPanel"
+ topClassPanel="mainToolsTopPanel"
+ bottomClassPanel="mainToolsTopPanel"
+ rightClassPanel="mainToolsLeftPanel"
+ verticalClassActive="true"
+ hWidth="33" hHeight="448">
-<class name="mainToolsTopPanel" extends="baseTopPanel"
- width="420" height="33" title="" docking="true"
- activationClassBounding="mainToolsLeftPanel"
- activationVClassBounding="mainToolsTopPanel"
- leftClassPanel="mainToolsLeftPanel"
- topClassPanel="mainToolsTopPanel"
- bottomClassPanel="mainToolsTopPanel"
- rightClassPanel="mainToolsLeftPanel"
- verticalClassActive="true"
- hWidth="33" hHeight="420">
-
- <method name="updateToolSelection" args="modi">
- <![CDATA[
- if ($debug) Debug.write("-updateToolSelection- ",modi);
-
- for (var i=0;i<this._tools.subviews.length;i++){
-
- if (this._tools.subviews[i].modi == modi) {
-
- this._tools.subviews[i].setSelectionWithoutEvent();
- return;
- }
-
- }
-
- ]]>
- </method>
-
+ <method name="updateToolSelection" args="modi">
+ <![CDATA[
+ if ($debug) Debug.write("-updateToolSelection- ",modi);
+ for (var i=0;i<this._tools.subviews.length;i++){
+ if (this._tools.subviews[i].modi == modi) {
+ this._tools.subviews[i].setSelectionWithoutEvent();
+ return;
+ }
+ }
+ ]]>
+ </method>
<horizontalMenuIconBar name="_tools" x="20" y="4" />
-</class>
-
-<class name="mainToolsLeftPanel" extends="baseLeftPanel"
- width="33" height="420" title="" docking="true"
- activationClassBounding="mainToolsLeftPanel"
- activationVClassBounding="mainToolsTopPanel"
- topClassPanel="mainToolsTopPanel"
- bottomClassPanel="mainToolsTopPanel"
- leftClassPanel="mainToolsLeftPanel"
- rightClassPanel="mainToolsLeftPanel"
- verticalClassActive="false"
- vWidth="420" vHeight="33">
-
- <method name="updateToolSelection" args="modi">
- <![CDATA[
- if ($debug) Debug.write("-updateToolSelection- ",modi);
-
- for (var i=0;i<this._tools.subviews.length;i++){
-
- if (this._tools.subviews[i].modi == modi) {
-
- this._tools.subviews[i].setSelectionWithoutEvent();
- return;
- }
-
- }
-
- ]]>
- </method>
-
+</class>
+
+<class name="mainToolsLeftPanel" extends="baseLeftPanel"
+ width="33" height="448" title="" docking="true"
+ activationClassBounding="mainToolsLeftPanel"
+ activationVClassBounding="mainToolsTopPanel"
+ topClassPanel="mainToolsTopPanel"
+ bottomClassPanel="mainToolsTopPanel"
+ leftClassPanel="mainToolsLeftPanel"
+ rightClassPanel="mainToolsLeftPanel"
+ verticalClassActive="false"
+ vWidth="448" vHeight="33">
+
+ <method name="updateToolSelection" args="modi">
+ <![CDATA[
+ if ($debug) Debug.write("-updateToolSelection- ",modi);
+ for (var i=0;i<this._tools.subviews.length;i++){
+ if (this._tools.subviews[i].modi == modi) {
+ this._tools.subviews[i].setSelectionWithoutEvent();
+ return;
+ }
+ }
+ ]]>
+ </method>
+
<verticalMenuIconBar name="_tools" x="3" y="20" />
</class>
<!-- ################
- Non Moderator Tools
+ Non Moderator Tools
-->
-
<class name="verticalMenuIconBarPointer" extends="view" y="22" x="4" clickable="true">
- <simplelayout axis="y" spacing="2" />
- <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557"
- resourceItem="pointer_whiteboard_menu_rsc" />
+ <simplelayout axis="y" spacing="2" />
+ <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557"
+ resourceItem="pointer_whiteboard_menu_rsc" />
</class>
<class name="horizontalMenuIconBarPointer" extends="view" y="22" x="4" clickable="true">
- <simplelayout axis="x" spacing="2" />
- <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557"
- resourceItem="pointer_whiteboard_menu_rsc" />
+ <simplelayout axis="x" spacing="2" />
+ <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard" labelid="557"
+ resourceItem="pointer_whiteboard_menu_rsc" />
+</class>
+
+<class name="mainToolsTopPanelPointer" extends="baseTopPanel"
+ width="52" height="32" title="" docking="true"
+ activationClassBounding="mainToolsLeftPanelPointer"
+ activationVClassBounding="mainToolsTopPanelPointer"
+ leftClassPanel="mainToolsLeftPanelPointer"
+ topClassPanel="mainToolsTopPanelPointer"
+ bottomClassPanel="mainToolsTopPanelPointer"
+ rightClassPanel="mainToolsLeftPanelPointer"
+ verticalClassActive="true"
+ hWidth="32" hHeight="52">
+
+ <horizontalMenuIconBarPointer x="20" y="4" />
</class>
-<class name="mainToolsTopPanelPointer" extends="baseTopPanel"
- width="52" height="32" title="" docking="true"
- activationClassBounding="mainToolsLeftPanelPointer"
- activationVClassBounding="mainToolsTopPanelPointer"
- leftClassPanel="mainToolsLeftPanelPointer"
- topClassPanel="mainToolsTopPanelPointer"
- bottomClassPanel="mainToolsTopPanelPointer"
- rightClassPanel="mainToolsLeftPanelPointer"
- verticalClassActive="true"
- hWidth="32" hHeight="52">
-
- <horizontalMenuIconBarPointer x="20" y="4" />
-</class>
-
-<class name="mainToolsLeftPanelPointer" extends="baseLeftPanel"
- width="32" height="52" title="" docking="true"
- activationClassBounding="mainToolsLeftPanelPointer"
- activationVClassBounding="mainToolsTopPanelPointer"
- topClassPanel="mainToolsTopPanelPointer"
- bottomClassPanel="mainToolsTopPanelPointer"
- leftClassPanel="mainToolsLeftPanelPointer"
- rightClassPanel="mainToolsLeftPanelPointer"
- verticalClassActive="false"
- vWidth="52" vHeight="32">
-
- <verticalMenuIconBarPointer x="2" y="20" />
-</class>
+<class name="mainToolsLeftPanelPointer" extends="baseLeftPanel"
+ width="32" height="52" title="" docking="true"
+ activationClassBounding="mainToolsLeftPanelPointer"
+ activationVClassBounding="mainToolsTopPanelPointer"
+ topClassPanel="mainToolsTopPanelPointer"
+ bottomClassPanel="mainToolsTopPanelPointer"
+ leftClassPanel="mainToolsLeftPanelPointer"
+ rightClassPanel="mainToolsLeftPanelPointer"
+ verticalClassActive="false"
+ vWidth="52" vHeight="32">
+
+ <verticalMenuIconBarPointer x="2" y="20" />
+</class>
</library>
+
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fc36422/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
index 565c710..4614545 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,24 +19,21 @@
-->
<library>
-
-<class name="mainToolsPanelItem" extends="blueButton"
- width="26" height="26">
-
+
+<class name="mainToolsPanelItem" extends="blueButton" width="26" height="26">
<attribute name="modi" value="" type="string" />
<attribute name="labelid" value="0" type="number" />
-
<attribute name="setSelectionToItem" value="true" type="boolean" />
<attribute name="_isselected" value="false" type="boolean" />
-
+
<handler name="oninit">
if (this._isselected) parent.parent.parent.setSelection(this);
</handler>
-
+
<method name="setSelectionWithoutEvent">
- parent.parent.parent.setSelectionWithoutEvent(this);
- </method>
-
+ parent.parent.parent.setSelectionWithoutEvent(this);
+ </method>
+
<handler name="onmouseup">
//if ($debug) Debug.write("parent.parent.parent",parent.parent.parent);
parent.parent.parent.setSelection(this);
@@ -46,20 +43,20 @@
<class name="redoUndoToolsPanelItem" extends="mainToolsPanelItem" setSelectionToItem="false">
<attribute name="doredo" value="true" type="boolean" />
- <handler name="onclick">
- if(this.doredo){
- this.parent.parent.parent.parent._drawareaMask._drawarea.doredo();
- } else {
- this.parent.parent.parent.parent._drawareaMask._drawarea.undoredo();
- }
- </handler>
+ <handler name="onclick">
+ if (this.doredo) {
+ this.parent.parent.parent.parent._drawareaMask._drawarea.doredo();
+ } else {
+ this.parent.parent.parent.parent._drawareaMask._drawarea.undoredo();
+ }
+ </handler>
</class>
<class name="mainToolsHPanelSeperator" extends="view" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }"
- width="26" height="1" ></class>
-
+ width="26" height="1" />
+
<class name="mainToolsVPanelSeperator" extends="view" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }"
- width="1" height="26" ></class>
+ width="1" height="26" />
-
</library>
+
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fc36422/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
index 047d6a4..776d7b7 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
@@ -44,7 +44,7 @@
</method>
<method name="loadPanelByModus" args="drawArea">
- if ($debug) Debug.write("loadPanelByModus drawmodus: ",drawArea.drawmodus);
+ if ($debug) Debug.write("loadPanelByModus drawmodus: ", drawArea.drawmodus);
this.ignoreUpdates = true;
if (drawArea.drawmodus == 'paint') {
this._content.lineColorChoose.setSelectedColor(drawArea.currentlayerstroke);