Author: solomax
Date: Thu Nov 24 03:28:22 2016
New Revision: 1771069
URL: http://svn.apache.org/viewvc?rev=1771069&view=rev
Log:
no jira: code clean up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1771069&r1=1771068&r2=1771069&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Thu Nov 24 03:28:22 2016
@@ -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
@@ -26,24 +26,22 @@
new lz.conferenceMenubar(canvas._conferencemenu);
</method>
- <conferenceRoomSidebar name="_sidePanel" />
-
- <view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28) +
((canvas.currentRoomObj.hideTopBar) ? 28:0)}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <view name="_inn" width="${parent.width-10}">
- <wrappinglayout axis="x" spacing="10"/>
- </view>
- <om_vscrollbar name="_attenddeescrollbar"
visibility="visible"></om_vscrollbar>
+ <conferenceRoomSidebar name="_sidePanel" />
+
+ <view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility ==
'hidden') ? 5:28) + ((canvas.currentRoomObj.hideTopBar) ? 28:0)}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <view name="_inn" width="${parent.width-10}">
+ <wrappinglayout axis="x" spacing="10"/>
+ </view>
+ <om_vscrollbar name="_attenddeescrollbar"
visibility="visible"></om_vscrollbar>
</view>
-
- <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }"
- width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visible) ? 28 : 6) +
((canvas.currentRoomObj.hideTopBar) ? 28:0)}" />
-
+
+ <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
+ y="0" x="${ parent._sidePanel.width }" width="${
canvas.width - parent._sidePanel.width }"
+ height="${ canvas.height -
(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visible) ? 28 : 6) +
((canvas.currentRoomObj.hideTopBar) ? 28:0)}" />
</class>
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1771069&r1=1771068&r2=1771069&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Thu Nov 24 03:28:22 2016
@@ -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
@@ -21,21 +21,20 @@
<library>
<class name="flexibleConferenceRoom" extends="baseConferenceRoom">
- <baseRoomSidebar name="_sidePanel" />
-
- <view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}" height="${
canvas.height - 5 + 28 }" clip="true">
- <view name="_inn" width="${parent.width-10}">
- <wrappinglayout axis="x" spacing="10"/>
- </view>
- <om_vscrollbar name="_attenddeescrollbar"
visibility="visible"></om_vscrollbar>
+ <baseRoomSidebar name="_sidePanel" />
+
+ <view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${ canvas.height - 5 + 28 }" clip="true">
+ <view name="_inn" width="${parent.width-10}">
+ <wrappinglayout axis="x" spacing="10"/>
+ </view>
+ <om_vscrollbar name="_attenddeescrollbar"
visibility="visible"></om_vscrollbar>
</view>
-
- <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }"
- width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height }" />
-
+
+ <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
+ y="0" x="${ parent._sidePanel.width }"
+ width="${ canvas.width - parent._sidePanel.width }"
+ height="${ canvas.height }" />
</class>
</library>
