Author: ggrekhov
Date: Tue Mar 20 07:32:17 2012
New Revision: 1302790
URL: http://svn.apache.org/viewvc?rev=1302790&view=rev
Log:
OPENMEETINGS-80: close whiteboard dialog is moved
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.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=1302790&r1=1302789&r2=1302790&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 07:32:17 2012
@@ -152,6 +152,13 @@
<method name="exitRoom">
canvas.lc.send(canvas.vid_lc_name, "exitRoom");
</method>
+
+ <!---
+ Shows the close whiteboard dialog
+ -->
+ <method name="closeWhiteboard">
+ canvas.lc.send(canvas.vid_lc_name, "closeWhiteboard");
+ </method>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1302790&r1=1302789&r2=1302790&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
Tue Mar 20 07:32:17 2012
@@ -144,25 +144,16 @@
<handler name="onclick">
<![CDATA[
this.setAttribute('frame',2);
- if (canvas.ismoderator || canvas.isAllowedToDraw) {
- new lz.confirmationSingle(canvas,{
- refObj:this,
- labeliderror:1313,
- showCheckBox:false
- });
- } else {
- new lz.errorDialog(canvas,{
- labelid:1366,
- errortext:canvas.getLabelName(1365)
- });
+
canvas._videocontainer._videoviewcontent.closeWhiteboard();
+ var t = this;
+ canvas.videoComp_lc.closeWhiteboard = function(confirm) {
+ if ($debug) Debug.write("confirm closeWhiteboard:",
confirm);
+ if (confirm) {
+ t.parent.parent.removeObject(t.parent);
+ }
}
]]>
</handler>
- <method name="sendConfirmation" args="bool,askAgain">
- if (bool) {
- this.parent.parent.removeObject(this.parent);
- }
- </method>
<labelTooltip labelid="1364" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1302790&r1=1302789&r2=1302790&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Tue Mar 20 07:32:17 2012
@@ -46,6 +46,7 @@
client.changeDevice = this.changeDevice;
client.setDrawAllowStatus = this.setDrawAllowStatus;
client.exitRoom = this.exitRoom;
+ client.closeWhiteboard = this.closeWhiteboard;
var lc:LocalConnection = new LocalConnection();
lc.connect(canvas.vid_lc_name);
@@ -436,6 +437,14 @@
if ($debug) Debug.write("exitRoom");
popupAdapter.exitRoom();
</method>
+
+ <!---
+ Shows the close whiteboard dialog
+ -->
+ <method name="closeWhiteboard">
+ if ($debug) Debug.write("closeWhiteboard");
+ popupAdapter.closeWhiteboard();
+ </method>
<!--
function not in use ?! swagner 04.02.2012
Modified:
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=1302790&r1=1302789&r2=1302790&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
Tue Mar 20 07:32:17 2012
@@ -22,9 +22,9 @@
<class name="exitDialog">
<handler name="oninit">
- if (null == canvas.inner.exitDialog || 'undefined' ==
canvas.inner.exitDialog) {
+ if (null == canvas.exitDialog || 'undefined' == canvas.exitDialog) {
if ($debug) Debug.write("show exit dialog");
- new lz.confirmationSingle(canvas.inner,{
+ new lz.confirmationSingle(canvas,{
refObj:this,
labelid:791,
labeliderror:790,
@@ -40,10 +40,39 @@
</method>
</class>
+<class name="closeWhiteboardDialog">
+ <handler name="oninit">
+ if (null == canvas.closeWhiteboard || 'undefined' ==
canvas.closeWhiteboard) {
+ if (canvas.ismoderator || canvas.isAllowedToDraw) {
+ new lz.confirmationSingle(canvas,{
+ refObj:this,
+ labeliderror:1313,
+ showCheckBox:false,
+ name:"closeWhiteboard"
+ });
+ } else {
+ new lz.errorDialog(canvas,{
+ labelid:1366,
+ errortext:canvas.getLabelName(1365)
+ });
+ }
+ }
+ </handler>
+
+ <method name="sendConfirmation" args="confirm,bool">
+ if ($debug) Debug.write("closeWhiteboardDialog result:", confirm);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeWhiteboard',
confirm);
+ </method>
+</class>
+
<class name="commonPopupAdapter">
<method name="exitRoom">
new lz.exitDialog();
</method>
+
+ <method name="closeWhiteboard">
+ new lz.closeWhiteboardDialog();
+ </method>
</class>
</library>
