Author: ggrekhov
Date: Tue Mar 20 05:18:54 2012
New Revision: 1302770
URL: http://svn.apache.org/viewvc?rev=1302770&view=rev
Log:
OPENMEETINGS-80: exit dialog is moved
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1302770&r1=1302769&r2=1302770&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Tue Mar 20 05:18:54 2012
@@ -145,6 +145,13 @@
<method name="changeDevice">
canvas.lc.send(canvas.vid_lc_name, "changeDevice");
</method>
+
+ <!---
+ Shows the exit dialog
+ -->
+ <method name="exitRoom">
+ canvas.lc.send(canvas.vid_lc_name, "exitRoom");
+ </method>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1302770&r1=1302769&r2=1302770&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Tue Mar 20 05:18:54 2012
@@ -57,16 +57,18 @@
<simpleLabelButton labelid="789" name="_exitbtn"
text_x="32" width="80" style="itemStyle" height="28">
<handler name="onclick">
- new
lz.confirmationSingle(canvas,{refObj:this,labelid:791,
- labeliderror:790,showCheckBox:false});
- </handler>
- <method name="sendConfirmation" args="confirm,bool">
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
- if (canvas.appointmentNotificationPopUp != null) {
- canvas.appointmentNotificationPopUp.destroy();
+ canvas._videocontainer._videoviewcontent.exitRoom();
+ canvas.videoComp_lc.exitRoom = function(confirm) {
+ if ($debug) Debug.write("confirm exitRoom:", confirm);
+ if (confirm) {
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
+ if (canvas.appointmentNotificationPopUp != null) {
+ canvas.appointmentNotificationPopUp.destroy();
+ }
+ canvas.doActionmenu('quit');
+ }
}
- canvas.doActionmenu('quit');
- </method>
+ </handler>
<view resource="exit_btn_rsc" y="2" x="4" />
<labelTooltip labelid="309" />
</simpleLabelButton>
@@ -204,16 +206,18 @@
<simpleLabelButton labelid="789" name="_exitbtn"
text_x="32" width="80" style="itemStyle" height="28">
<handler name="onclick">
- new
lz.confirmationSingle(canvas,{refObj:this,labelid:791,
- labeliderror:790,showCheckBox:false});
- </handler>
- <method name="sendConfirmation" args="confirm,bool">
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
- if (canvas.appointmentNotificationPopUp != null) {
- canvas.appointmentNotificationPopUp.destroy();
+ canvas._videocontainer._videoviewcontent.exitRoom();
+ canvas.videoComp_lc.exitRoom = function(confirm) {
+ if ($debug) Debug.write("confirm exitRoom:", confirm);
+ if (confirm) {
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
+ if (canvas.appointmentNotificationPopUp != null) {
+ canvas.appointmentNotificationPopUp.destroy();
+ }
+ canvas.doActionmenu('quit');
+ }
}
- canvas.doActionmenu('quit');
- </method>
+ </handler>
<view resource="exit_btn_rsc" y="2" x="4" />
<labelTooltip labelid="309" />
</simpleLabelButton>
@@ -319,12 +323,14 @@
<simpleLabelButton labelid="789" name="_exitbtn"
text_x="32" width="80" style="itemStyle" height="28">
<handler name="onclick">
- new
lz.confirmationSingle(canvas,{refObj:this,labelid:791,
- labeliderror:790,showCheckBox:false});
+ canvas._videocontainer._videoviewcontent.exitRoom();
+ canvas.videoComp_lc.exitRoom = function(confirm) {
+ if ($debug) Debug.write("confirm exitRoom:", confirm);
+ if (confirm) {
+ canvas.doActionmenu('quit');
+ }
+ }
</handler>
- <method name="sendConfirmation" args="confirm,bool">
- canvas.doActionmenu('quit');
- </method>
<view resource="exit_btn_rsc" y="2" x="4" />
<labelTooltip labelid="309" />
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1302770&r1=1302769&r2=1302770&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Tue Mar 20 05:18:54 2012
@@ -15,6 +15,7 @@
<attribute name="offsetLength" type="number" value="40"/>
<attribute name="videoWidth" type="number" value="132"/>
<attribute name="videoHeight" type="number" value="132"/>
+ <attribute name="popupAdapter"/>
<handler name="oninit">
<![CDATA[
@@ -43,12 +44,15 @@
// update rights to SWF10 client
client.updateModerationFlag = this.updateModerationFlag;
client.changeDevice = this.changeDevice;
- client.setDrawAllowStatus = this.setDrawAllowStatus
+ client.setDrawAllowStatus = this.setDrawAllowStatus;
+ client.exitRoom = this.exitRoom;
var lc:LocalConnection = new LocalConnection();
lc.connect(canvas.vid_lc_name);
lc.client = client;
canvas.setAttribute("lc", lc);
+
+ popupAdapter = new lz.commonPopupAdapter();
]]>
</handler>
@@ -424,6 +428,14 @@
});
]]>
</method>
+
+ <!---
+ Shows the exit dialog
+ -->
+ <method name="exitRoom">
+ if ($debug) Debug.write("exitRoom");
+ popupAdapter.exitRoom();
+ </method>
<!--
function not in use ?! swagner 04.02.2012
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx?rev=1302770&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
Tue Mar 20 05:18:54 2012
@@ -0,0 +1,49 @@
+<?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="exitDialog">
+ <handler name="oninit">
+ if (null == canvas.inner.exitDialog || 'undefined' ==
canvas.inner.exitDialog) {
+ if ($debug) Debug.write("show exit dialog");
+ new lz.confirmationSingle(canvas.inner,{
+ refObj:this,
+ labelid:791,
+ labeliderror:790,
+ showCheckBox:false,
+ name:"exitDialog"
+ });
+ }
+ </handler>
+
+ <method name="sendConfirmation" args="confirm,bool">
+ if ($debug) Debug.write("exitDialog result:", confirm);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom',
confirm);
+ </method>
+</class>
+
+<class name="commonPopupAdapter">
+ <method name="exitRoom">
+ new lz.exitDialog();
+ </method>
+</class>
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx?rev=1302770&r1=1302769&r2=1302770&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
Tue Mar 20 05:18:54 2012
@@ -31,6 +31,8 @@
<attribute name="labeliderror" value="0" type="number" />
+ <attribute name="result" type="bool"/>
+
<view x="4" resource="warning_icon_rsc" y="24" />
<labelText labelid="$once{ parent.labeliderror }" y="24"
@@ -85,21 +87,27 @@
<handler name="onclick">
var t = parent.holddatainSO.getValue();
this.parent.close();
- if (parent.refReturnMethod == null) {
- this.parent.refObj.sendNoConfirmation();
- } else {
- this.parent.refObj[parent.refReturnMethod](false,t);
- }
+ this.parent.result = false;
+ if (null != this.parent.refObj) {
+ if (parent.refReturnMethod == null) {
+ this.parent.refObj.sendNoConfirmation();
+ } else {
+ this.parent.refObj[parent.refReturnMethod](false,t);
+ }
+ }
</handler>
</simpleLabelButton>
<simpleLabelButton labelid="60" width="100" x="$once{ parent.width - 210
}" y="$once{ parent.height - 26 }">
<handler name="onclick">
var t = parent.holddatainSO.getValue();
this.parent.close();
- if (parent.refReturnMethod == null) {
- this.parent.refObj.sendConfirmation(true,t);
- } else {
- this.parent.refObj[parent.refReturnMethod](true,t);
+ this.parent.result = true;
+ if (null != this.parent.refObj) {
+ if (parent.refReturnMethod == null) {
+ this.parent.refObj.sendConfirmation(true,t);
+ } else {
+ this.parent.refObj[parent.refReturnMethod](true,t);
+ }
}
</handler>
</simpleLabelButton>
@@ -128,7 +136,9 @@
<handler name="onclick">
var t = parent.holddatainSO.getValue();
this.parent.close();
- this.parent.refObj.sendConfirmation(t);
+ if (null != this.parent.refObj) {
+ this.parent.refObj.sendConfirmation(t);
+ }
</handler>
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx?rev=1302770&r1=1302769&r2=1302770&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
Tue Mar 20 05:18:54 2012
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+ <include href="commonPopupAdapter.lzx" />
<include href="confirmationSingle.lzx" />
<include href="errorPopup.lzx" />
