Author: solomax
Date: Fri Apr 1 07:20:32 2016
New Revision: 1737319
URL: http://svn.apache.org/viewvc?rev=1737319&view=rev
Log:
[OPENMEETINGS-1361] second moderationPanel is removed from the room
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1737319&r1=1737318&r2=1737319&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Fri Apr 1 07:20:32 2016
@@ -96,8 +96,12 @@
if ($debug) Debug.write("this.roomobj ",this.roomobj);
- new lz.moderationPanel(canvas._moderatormenu,{
- name:'_moderationPanel',align:'right',
+ if (!!canvas._mymod) {
+ canvas._mymod.destroy();
+ canvas._mymod = null;
+ }
+ new lz.moderationPanel(canvas._moderatormenu, {
+ name:'_moderationPanel', align:'right',
allowUserQuestions:this.roomobj.allowUserQuestions,
roomName:this.roomobj.name
});
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx?rev=1737319&r1=1737318&r2=1737319&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
Fri Apr 1 07:20:32 2016
@@ -8,8 +8,8 @@
"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
-
+ 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,30 +19,30 @@
-->
<library>
-
+
<class name="errorPopupUserInfo" extends="labelExplorerBox" labelid="204"
- docking="true" resizeable="false" closable="true"
- width="224" x="300" height="230">
+ docking="true" resizeable="false" closable="true"
+ width="224" x="300" height="230">
- <attribute name="error" value="" type="string" />
- <attribute name="user" value="null" />
-
- <handler name="oninit">
- <![CDATA[
- Debug.write(user);
- var tString = this.error + "<BR/>"
- + user.username+"<BR/>"
- + user.firstname + " " + user.lastname + "<BR/>"
- + parseDateToStringTime(user.roomEnter);
- this.textInner._inner.setAttribute('text',tString);
- ]]>
- </handler>
-
- <view name="textInner" y="24" width="218" height="200" x="2" clip="true">
- <text name="_inner" fontsize="10" fontstyle="bold"
- multiline="true" width="190" />
- <om_vscrollbar />
- </view>
+ <attribute name="error" value="" type="string" />
+ <attribute name="user" value="null" />
+
+ <handler name="oninit">
+ <![CDATA[
+ Debug.write(user);
+ var tString = this.error + "<BR/>"
+ + user.username+"<BR/>"
+ + user.firstname + " " + user.lastname + "<BR/>"
+ + parseDateToStringTime(user.roomEnter);
+ this.textInner._inner.setAttribute('text',tString);
+ ]]>
+ </handler>
+
+ <view name="textInner" y="24" width="218" height="200" x="2"
clip="true">
+ <text name="_inner" fontsize="10" fontstyle="bold"
+ multiline="true" width="190" />
+ <om_vscrollbar />
+ </view>
</class>
@@ -54,76 +54,74 @@
</passthrough>
</when>
</switch>
- <attribute name="recordingsName" value="" type="string" />
- <attribute name="initial" value="true" type="boolean" />
- <attribute name="recordingUser" value="null" />
- <attribute name="publishingObj" value="null" />
-
- <attribute name="allowUserQuestions" value="true" type="boolean" />
- <attribute name="roomName" value="" type="string" />
-
- <handler name="oninit">
- <![CDATA[
- canvas._mymod = this;
- if (this.allowUserQuestions != null &&
!this.allowUserQuestions) {
- this.mod_btn.destroy();
- }
- this._roomName.setAttribute("text",this.roomName);
- if ($debug) Debug.write("moderationPanel.init: ",
!canvas.currentRoomObj.hideScreenSharing && (canvas.ismoderator ||
canvas.becomemoderator || canvas.isAllowedToScreenShare),
canvas.currentRoomObj);
- ]]>
- </handler>
-
- <method name="setMessage">
- <![CDATA[
- if ($debug) Debug.write("setMessage: ",this.recordingUser);
- var tString = "";
- if (this.recordingUser!=null){
- tString += canvas.getLabelName(419)
- + " " + this.recordingUser.username
- + " " + this.recordingUser.firstname
- + " " + this.recordingUser.lastname
- + " " +
parseDateToStringTime(this.recordingUser.roomEnter) + ";";
- }
- if (this.publishingObj != null) {
- tString += canvas.getLabelName(1504)
- + " " + this.publishingObj.user.username
- + " " +
this.publishingObj.user.firstname
- + " " + this.publishingObj.user.lastname
- + " " + this.publishingObj.url + ";";
- }
- this._inner.setAttribute('text', tString);
- ]]>
- </method>
-
+ <attribute name="initial" value="true" type="boolean" />
+ <attribute name="recordingUser" value="null" />
+ <attribute name="publishingObj" value="null" />
+
+ <attribute name="allowUserQuestions" value="true" type="boolean" />
+ <attribute name="roomName" value="" type="string" />
+
+ <handler name="oninit">
+ <![CDATA[
+ canvas._mymod = this;
+ if (this.allowUserQuestions != null &&
!this.allowUserQuestions) {
+ this.mod_btn.destroy();
+ }
+ this._roomName.setAttribute("text",this.roomName);
+ if ($debug) Debug.write("moderationPanel.init: ",
!canvas.currentRoomObj.hideScreenSharing && (canvas.ismoderator ||
canvas.becomemoderator || canvas.isAllowedToScreenShare),
canvas.currentRoomObj);
+ ]]>
+ </handler>
+
+ <method name="setMessage">
+ <![CDATA[
+ if ($debug) Debug.write("setMessage: ", this.recordingUser);
+ var tString = "";
+ if (this.recordingUser != null) {
+ tString += canvas.getLabelName(419)
+ + " " + this.recordingUser.username
+ + " " + this.recordingUser.firstname
+ + " " + this.recordingUser.lastname
+ + " " +
parseDateToStringTime(this.recordingUser.roomEnter) + ";";
+ }
+ if (this.publishingObj != null) {
+ tString += canvas.getLabelName(1504)
+ + " " + this.publishingObj.user.username
+ + " " + this.publishingObj.user.firstname
+ + " " + this.publishingObj.user.lastname
+ + " " + this.publishingObj.url + ";";
+ }
+ this._inner.setAttribute('text', tString);
+ ]]>
+ </method>
+
<method name="checkForApplyScreen" args="record">
//TODO check if host is required for rtmps
ExternalInterface.call("startSharing", canvas.publicSID,
canvas.thishib.getUrl());
</method>
-
- <labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold"
fontsize="12" />
-
- <miniIconsNew name="mod_btn" y="6" innerResource="applyformodicon_rsc"
width="16" height="16"
- visible="${ (canvas.ismoderator) ? false : true }"
showhandcursor="true">
- <handler name="onclick">
- //We do only ask the Moderator(s) to change Moderation
- //new lz.applyForModeration(canvas.main_content._content.inner);
- canvas.thishib.applyForModeration.doCall();
- </handler>
- <labelTooltip inittwice="true" labelid="906" />
- </miniIconsNew>
-
- <miniIconsNew name="_doShare" y="6"
innerResource="start_screensharing_rsc" width="16" height="16"
showhandcursor="true"
- visible="${ !canvas.currentRoomObj.hideScreenSharing &&
(canvas.ismoderator || canvas.becomemoderator || canvas.isAllowedToScreenShare)
}" >
- <handler name="onclick">
- this.parent.checkForApplyScreen("no");
- </handler>
- <labelTooltip labelid="239" />
- </miniIconsNew>
-
- <labelText name="_inner" fgcolor="0xFF3300" y="4" />
-
- <view width="2" />
-
+
+ <labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold"
fontsize="12" />
+
+ <miniIconsNew name="mod_btn" y="6" innerResource="applyformodicon_rsc"
width="16" height="16"
+ visible="${ (canvas.ismoderator) ? false : true }"
showhandcursor="true">
+ <handler name="onclick">
+ //We do only ask the Moderator(s) to change Moderation
+ //new
lz.applyForModeration(canvas.main_content._content.inner);
+ canvas.thishib.applyForModeration.doCall();
+ </handler>
+ <labelTooltip inittwice="true" labelid="906" />
+ </miniIconsNew>
+
+ <miniIconsNew name="_doShare" y="6"
innerResource="start_screensharing_rsc" width="16" height="16"
showhandcursor="true"
+ visible="${ !canvas.currentRoomObj.hideScreenSharing
&& (canvas.ismoderator || canvas.becomemoderator ||
canvas.isAllowedToScreenShare) }" >
+ <handler name="onclick">
+ this.parent.checkForApplyScreen("no");
+ </handler>
+ <labelTooltip labelid="239" />
+ </miniIconsNew>
+
+ <labelText name="_inner" fgcolor="0xFF3300" y="4" />
+
+ <view width="2" />
</class>
</library>
