Author: solomax
Date: Wed Feb 3 05:42:33 2016
New Revision: 1728259
URL: http://svn.apache.org/viewvc?rev=1728259&view=rev
Log:
[OPENMEETINGS-1321] side bar in restricted room displayed as expected, code
clean-up
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
Removed:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebarTabButton.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Wed Feb 3 05:42:33 2016
@@ -25,8 +25,7 @@
new lz.restrictedConferenceMenubar(canvas._conferencemenu);
</method>
- <restrictedRoomSidebar name="_sidePanel" restricted="true"
- listType="eventUserListTableWithNames" />
+ <restrictedRoomSidebar name="_sidePanel"
listType="eventUserListTableWithNames" />
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx?rev=1728259&view=auto
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
(added)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
Wed Feb 3 05:42:33 2016
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ 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="baseRoomSidebar" extends="view" width="280" bgcolor="$once{
canvas.getThemeColor('mainBackgroundColor') }"
+ height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar)
? 0:28) }" y="0" clip="true">
+
+ <attribute name="selected" value="null" />
+ <attribute name="isOpen" value="true" type="boolean"/>
+ <attribute name="listType" value="eventUserListTable" type="string" />
+
+ <method name="toggleStatus">
+ if (this.isOpen) {
+ this._doClose.setAttribute('started', true);
+ this.isOpen = false;
+ this._minimizeSidebar._icon.setAttribute("frame",2);
+
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
+ } else {
+ this._doOpen.setAttribute('started', true);
+ this.isOpen = true;
+ this._minimizeSidebar._icon.setAttribute("frame",1);
+
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
+ }
+ </method>
+
+ <view name="borderBarTop" y="0"
+ width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1"
bgcolor="0xFAFAFA" />
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
+
+ <view name="_head" y="1" width="${ parent.width-10 }" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ <![CDATA[
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ if (!canvas.isInterview &&
!canvas.currentRoomObj.hideFilesExplorer && canvas.currentRoomObj.filesOpened) {
+ this.filesTabButton.doSelection();
+ } else {
+ this.userTabButton.doSelection();
+ }
+ ]]>
+ </handler>
+
+ <tabButtonMain name="userTabButton" height="$once{
parent.height }" width="$once{ (parent.width-6)/2 }"
+ currentIconRsc="users_tab_btn" labelid="613" />
+
+ <tabButtonMain name="filesTabButton"
currentIconRsc="files_tab_btn" height="$once{ parent.height }"
+ labelid="614" width="$once{ (parent.width-6)/2
}"
+ visible="${ !canvas.isInterview &&
!canvas.currentRoomObj.hideFilesExplorer }"/>
+
+ </view>
+
+ <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }"
+ height="${ parent.height-222 }" visible="false"
/>
+
+ <activityList name="_activityList" />
+
+ <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
y="1"
+ bgcolor="0xE0E1EB" height="${
parent.height-1 }">
+ <handler name="onclick">
+ parent.toggleStatus();
+ </handler>
+
+ <view width="${ parent.width }" height="$once{ parent.height }"
bgcolor="0xE0E1EB" />
+
+ <view name="_icon" resource="sidebar_tab_btn" y="0">
+ <handler name="onclick">
+ parent.parent.toggleStatus();
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
+ </view>
+
+ </view>
+
+ <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
duration="750" started="false" />
+ <animator name="_doClose" attribute="width" to="10" duration="750"
started="false" />
+</class>
+
+</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
Wed Feb 3 05:42:33 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
@@ -20,117 +20,34 @@
-->
<library>
-<class name="conferenceRoomSidebar" extends="view" width="280" bgcolor="$once{
canvas.getThemeColor('mainBackgroundColor') }"
- height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28)
}" y="0" clip="true">
-
- <attribute name="selected" value="null" />
-
- <attribute name="isOpen" value="true" type="boolean"/>
-
- <method name="doSelection" args="itemRef">
- <![CDATA[
- if (this.selected != null) {
- this.selected.deselect();
- }
-
- this.selected = itemRef;
- this.selected.select();
-
- if ($debug) Debug.write("this.selected.name ",this.selected.name);
-
- if (this.selected.name == "userTabButton") {
- if ($debug) Debug.write("-- userTabButton");
- this._files.setAttribute("visibility","hidden");
-
this._videocontainer._applyAndStatusIcons.setAttribute("visibility","visible");
-
this._videocontainer._participants.setAttribute("visibility","visible");
- } else if (this.selected.name == "filesTabButton") {
- if ($debug) Debug.write("-- filesTabButton");
- this._files.setAttribute("visibility","visible");
-
this._videocontainer._applyAndStatusIcons.setAttribute("visibility","hidden");
-
this._videocontainer._participants.setAttribute("visibility","hidden");
- }
- ]]>
- </method>
-
- <method name="toggleStatus">
- if (this.isOpen) {
- this._doClose.setAttribute('started', true);
- this.isOpen = false;
- this._minimizeSidebar._icon.setAttribute("frame",2);
-
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
- } else {
- this._doOpen.setAttribute('started', true);
- this.isOpen = true;
- this._minimizeSidebar._icon.setAttribute("frame",1);
-
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
- }
- </method>
-
- <view name="borderBarTop" y="0"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
- <view name="_tabbarBg" width="${ parent.width }" height="32" y="1"
bgcolor="0xFAFAFA" />
- <view name="borderBarBottom" y="34"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
-
- <view name="_head" y="1" width="${ parent.width-10 }" height="32"
- layout="axis:x;spacing:2;inset:2" >
-
- <handler name="oninit">
+<class name="conferenceRoomSidebar" extends="baseRoomSidebar">
+ <method name="doSelection" args="itemRef">
<![CDATA[
- for (var eg in this.subviews) {
- this.subviews[eg].deselect();
- }
- if (!canvas.currentRoomObj.hideFilesExplorer &&
canvas.currentRoomObj.filesOpened) {
- this.filesTabButton.doSelection();
- } else {
- this.userTabButton.doSelection();
+ if (this.selected != null) {
+ this.selected.deselect();
+ }
+
+ this.selected = itemRef;
+ this.selected.select();
+ if ($debug) Debug.write("this.selected.name
",this.selected.name);
+
+ if (this.selected.name == "userTabButton") {
+ if ($debug) Debug.write("-- userTabButton");
+ this._files.setAttribute("visibility","hidden");
+
this._videocontainer._applyAndStatusIcons.setAttribute("visibility","visible");
+
this._videocontainer._participants.setAttribute("visibility","visible");
+ } else if (this.selected.name == "filesTabButton") {
+ if ($debug) Debug.write("-- filesTabButton");
+
this._files.setAttribute("visibility","visible");
+
this._videocontainer._applyAndStatusIcons.setAttribute("visibility","hidden");
+
this._videocontainer._participants.setAttribute("visibility","hidden");
}
]]>
- </handler>
-
- <tabButtonMain name="userTabButton" height="$once{ parent.height }"
width="$once{ (parent.width-6)/2 }"
- currentIconRsc="users_tab_btn" labelid="613" />
-
- <tabButtonMain name="filesTabButton" currentIconRsc="files_tab_btn"
height="$once{ parent.height }"
- labelid="614" width="$once{ (parent.width-6)/2 }"
- visible="${(canvas.currentRoomObj.hideFilesExplorer ?
false:true)}"/>
-
- </view>
-
- <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }"
- height="${ parent.height-222 }" visibility="hidden" />
-
- <participants name="_videocontainer" y="36"
- width="$once{ parent.width-10 }"
- height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
-
- <activityList name="_activityList" />
-
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
- bgcolor="0xE0E1EB" height="${
parent.height-1 }">
- <handler name="onclick">
- parent.toggleStatus();
- </handler>
-
- <view width="${ parent.width }" height="$once{ parent.height }"
- bgcolor="0xE0E1EB" >
- </view>
-
- <view name="_icon" resource="sidebar_tab_btn" y="0">
- <handler name="onclick">
- parent.parent.toggleStatus();
- </handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
- </view>
-
- </view>
-
- <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
- duration="750" started="false" />
-
- <animator name="_doClose" attribute="width" to="10"
- duration="750" started="false" />
-
+ </method>
+
+ <participants name="_videocontainer" y="36"
+ width="$once{ parent.width-10 }"
+ height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
</class>
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
Wed Feb 3 05:42:33 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
@@ -20,63 +20,21 @@
-->
<library>
-<class name="interviewRoomSidebar" extends="view" width="280"
- height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28)
}" y="0" clip="true">
-
- <attribute name="selected" value="null" />
-
- <attribute name="isOpen" value="true" type="boolean"/>
-
- <attribute name="restricted" value="true" type="boolean" />
-
- <attribute name="listType" value="eventUserListTable" type="string" />
-
- <method name="doSelection" args="itemRef">
- <![CDATA[
- if (this.selected != null) {
- this.selected.deselect();
- }
-
- this.selected = itemRef;
- this.selected.select();
-
- ]]>
- </method>
-
- <view name="borderBarTop" y="0"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
- <view name="_tabbarBg" width="${ parent.width }" height="32" y="1"
bgcolor="0xFAFAFA" />
- <view name="borderBarBottom" y="34"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
-
- <view name="_head" y="1" width="${ parent.width-10 }" height="32"
- layout="axis:x;spacing:2;inset:2" >
-
- <handler name="oninit">
- for (var eg in this.subviews) {
- this.subviews[eg].deselect();
- }
- this.userTabButton.doSelection();
- </handler>
-
- <tabButtonMain name="userTabButton" height="$once{ parent.height }"
width="$once{ (parent.width-6)/2 }"
- currentIconRsc="users_tab_btn" labelid="613" />
-
- </view>
-
- <interviewUserList name="_videocontainer" y="36"
- width="$once{ parent.width-10 }"
- height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
-
- <activityList name="_activityList" />
-
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
- bgcolor="0xE0E1EB" height="${ parent.height-1 }">
-
- <view width="${ parent.width }" height="$once{ parent.height }"
- bgcolor="0xE0E1EB" >
- </view>
- </view>
+<class name="interviewRoomSidebar" extends="baseRoomSidebar">
+ <method name="doSelection" args="itemRef">
+ <![CDATA[
+ if (this.selected != null) {
+ this.selected.deselect();
+ }
+
+ this.selected = itemRef;
+ this.selected.select();
+ ]]>
+ </method>
+
+ <interviewUserList name="_videocontainer" y="36"
+ width="$once{ parent.width-10 }"
+ height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
</class>
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
Wed Feb 3 05:42:33 2016
@@ -19,10 +19,8 @@
-->
<library>
-
+ <include href="baseRoomSidebar.lzx" />
<include href="conferenceRoomSidebar.lzx" />
<include href="interviewRoomSidebar.lzx" />
<include href="restrictedRoomSidebar.lzx" />
- <include href="conferenceRoomSidebarTabButton.lzx" />
-
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
Wed Feb 3 05:42:33 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
@@ -20,130 +20,40 @@
-->
<library>
-<class name="restrictedRoomSidebar" extends="view" width="280"
- height="${ canvas.height - 28 }" y="0" clip="true">
-
- <attribute name="selected" value="null" />
-
- <attribute name="isOpen" value="true" type="boolean"/>
-
- <attribute name="restricted" value="true" type="boolean" />
-
- <attribute name="listType" value="eventUserListTable" type="string" />
-
- <method name="doSelection" args="itemRef">
- <![CDATA[
- if (itemRef.name == "filesTabButton") {
- if (this.restricted) {
- if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
- //Do not allow
- new
lz.labelerrorPopup(canvas,{errorlabelid:783});
- return;
- }
- }
- }
-
- if (this.selected != null) {
- this.selected.deselect();
- }
-
- this.selected = itemRef;
- this.selected.select();
-
- if ($debug) Debug.write("this.selected.name ",this.selected.name,
this.inited);
-
- if (this.selected.name == "userTabButton") {
- if ($debug) Debug.write("-- userTabButton");
- this._files.setAttribute("visibility","hidden");
- this._participants.setAttribute("visibility","visible");
- } else if (this.selected.name == "filesTabButton") {
- if ($debug) Debug.write("-- filesTabButton");
- this._files.setAttribute("visibility","visible");
- this._participants.setAttribute("visibility","hidden");
- }
- ]]>
- </method>
-
- <method name="toggleStatus">
- if (this.isOpen) {
- this._doClose.setAttribute('started', true);
- this.isOpen = false;
- this._minimizeSidebar._icon.setAttribute("frame",2);
-
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
- } else {
- this._doOpen.setAttribute('started', true);
- this.isOpen = true;
- this._minimizeSidebar._icon.setAttribute("frame",1);
-
this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
- }
- </method>
-
- <view name="borderBarTop" y="0"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
- <view name="_tabbarBg" width="${ parent.width }" height="32" y="1"
bgcolor="0xFAFAFA" />
- <view name="borderBarBottom" y="34"
- width="${ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }" height="1" />
-
- <view name="_head" y="1" width="${ parent.width-10 }" height="32"
- layout="axis:x;spacing:2;inset:2" >
-
- <handler name="oninit">
+<class name="restrictedRoomSidebar" extends="baseRoomSidebar">
+ <method name="doSelection" args="itemRef">
<![CDATA[
- if ($debug)
Debug.write("restrictedRoomSidebar::_head::oninit ");
- for (var eg in this.subviews) {
- this.subviews[eg].deselect();
- }
- if (!canvas.currentRoomObj.hideFilesExplorer &&
canvas.currentRoomObj.filesOpened) {
- this.filesTabButton.doSelection();
- } else {
- this.userTabButton.doSelection();
+ if (itemRef.name == "filesTabButton") {
+ if (!canvas.ismoderator &&
!canvas.isAllowedToDraw) {
+ //Do not allow
+ new
lz.labelerrorPopup(canvas,{errorlabelid:783});
+ return;
+ }
+ }
+
+ if (this.selected != null) {
+ this.selected.deselect();
+ }
+
+ this.selected = itemRef;
+ this.selected.select();
+ if ($debug) Debug.write("this.selected.name
",this.selected.name, this.inited);
+
+ if (this.selected.name == "userTabButton") {
+ if ($debug) Debug.write("-- userTabButton");
+ this._files.setAttribute("visible", false);
+
this._videocontainer._participants.setAttribute("visible", true);
+ } else if (this.selected.name == "filesTabButton") {
+ if ($debug) Debug.write("-- filesTabButton");
+ this._files.setAttribute("visible", true);
+
this._videocontainer._participants.setAttribute("visible", false);
}
]]>
- </handler>
-
- <tabButtonMain name="userTabButton" height="$once{ parent.height }"
width="$once{ (parent.width-6)/2 }"
- currentIconRsc="users_tab_btn" labelid="613" />
-
- <tabButtonMain name="filesTabButton" currentIconRsc="files_tab_btn"
height="$once{ parent.height }"
- labelid="614" width="$once{ (parent.width-6)/2 }"
- visible="${(canvas.currentRoomObj.hideFilesExplorer ?
false:true)}"/>
-
- </view>
-
- <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }"
- height="${ parent.height-222 }" visibility="hidden" />
-
- <restrictedUserList name="_participants" y="36"
- width="$once{ parent.width-10 }"
- height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
-
- <activityList name="_activityList" />
-
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
- bgcolor="0xE0E1EB" height="${
parent.height-1 }">
- <handler name="onclick">
- parent.toggleStatus();
- </handler>
-
- <view width="${ parent.width }" height="$once{ parent.height }"
- bgcolor="0xE0E1EB" >
- </view>
-
- <view name="_icon" resource="sidebar_tab_btn" y="0">
- <handler name="onclick">
- parent.parent.toggleStatus();
- </handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
- </view>
-
- </view>
-
- <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
- duration="750" started="false" />
-
- <animator name="_doClose" attribute="width" to="10"
- duration="750" started="false" />
-
+ </method>
+
+ <restrictedUserList name="_videocontainer" y="36"
+ width="$once{ parent.width-10 }"
+ height="${
parent.height-(canvas.currentRoomObj.activitiesHidden ? 36:236) }" />
</class>
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
Wed Feb 3 05:42:33 2016
@@ -436,23 +436,25 @@
if (!userObject) return;
var vList = parent._table.renderList;
- for (var i = 0; i < vList.length; ++i) {
- if (vList[i].publicSID == userObject.publicSID)
{
- if ($debug) Debug.write(" ::
updateIcons :: item1 found: ", vList[i]);
- vList[i].isBroadcasting =
userObject.isBroadcasting;
- vList[i].canDraw = userObject.canDraw;
- vList[i].canShare = userObject.canShare;
- vList[i].canRemote =
userObject.canRemote;
- vList[i].canGiveAudio =
userObject.canGiveAudio;
- vList[i].micMuted = userObject.micMuted;
- break;
+ if (!!vList) {
+ for (var i = 0; i < vList.length; ++i) {
+ if (vList[i].publicSID ==
userObject.publicSID) {
+ if ($debug) Debug.write(" ::
updateIcons :: item1 found: ", vList[i]);
+ vList[i].isBroadcasting =
userObject.isBroadcasting;
+ vList[i].canDraw =
userObject.canDraw;
+ vList[i].canShare =
userObject.canShare;
+ vList[i].canRemote =
userObject.canRemote;
+ vList[i].canGiveAudio =
userObject.canGiveAudio;
+ vList[i].micMuted =
userObject.micMuted;
+ break;
+ }
}
}
//search for the user and update its drawStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i = 0; i < vList.length; ++i) {
- if (vList[i].refObj.publicSID ==
userObject.publicSID) {
+ if (!!vList[i].refObj &&
vList[i].refObj.publicSID == userObject.publicSID) {
if ($debug) Debug.write(" ::
updateIcons :: item2 found: ", vList[i]);
vList[i].refObj.isBroadcasting =
userObject.isBroadcasting;
vList[i].isBroadcasting =
userObject.isBroadcasting;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1728259&r1=1728258&r2=1728259&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
Wed Feb 3 05:42:33 2016
@@ -131,10 +131,9 @@
hib.userlang = Number(this.userlang);
hib.getCurrentRoomClient.doCall();
this.close();
- //if (canvas.language == canvas.thishib.userlang &&
canvas.thishib.initlanguageLoaded) { TODO canvas.language seems to be dropped
- if (canvas.language_id == canvas.thishib.userlang &&
canvas.thishib.initlanguageLoaded) {
+ if (canvas.language_id == hib.userlang &&
hib.initlanguageLoaded) {
} else {
-
canvas.thishib.loaderVar.getLanguageByIdAndMax.doCall();
+ hib.getLanguageByIdAndMax.doCall();
}
]]>
</method>
