Author: ggrekhov
Date: Mon Mar 26 05:11:17 2012
New Revision: 1305225
URL: http://svn.apache.org/viewvc?rev=1305225&view=rev
Log:
SWF10 popups refactoring
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
- copied, changed from r1305205,
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopupSWF10.lzx
- copied, changed from r1305205,
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/library.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopup.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1305225&r1=1305224&r2=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Mon Mar 26 05:11:17 2012
@@ -71,4 +71,10 @@
<attribute name="interviewPod2_x" value="644" type="number" />
<attribute name="interviewPod2_y" value="28" type="number" />
+ <!--
+ Popup dialogs attributes
+ -->
+ <attribute name="exitDialog" value="null" />
+ <attribute name="closeWhiteboardDialog" value="null" />
+
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1305225&r1=1305224&r2=1305225&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Mon
Mar 26 05:11:17 2012
@@ -32,6 +32,8 @@
<include href="base/" />
+ <include href="modules/" />
+
<include href="video/" />
<include href="screensharing/" />
@@ -50,8 +52,6 @@
<include href="dragHelper.lzx" />
- <include href="modules/conference/popups/" />
-
<view name="mainComponent" width="${canvas.width}"
height="${canvas.height}">
<text id="mainBaseText"> </text>
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?rev=1305225&r1=1305224&r2=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Mon Mar 26 05:11:17 2012
@@ -34,6 +34,8 @@
<include href="base/" />
+ <include href="modules/" />
+
<include href="video/" />
<include href="screensharing/" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/library.lzx?rev=1305225&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/library.lzx
Mon Mar 26 05:11:17 2012
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="popups/" />
+
+</library>
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=1305225&r1=1305224&r2=1305225&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
Mon Mar 26 05:11:17 2012
@@ -22,14 +22,13 @@
<class name="exitDialog">
<handler name="oninit">
- if (null == canvas.exitDialog || 'undefined' == canvas.exitDialog) {
+ if (!canvas["exitDialog"]) {
if ($debug) Debug.write("show exit dialog");
- new lz.confirmationSingle(canvas,{
+ canvas.exitDialog = new lz.confirmationSingleSWF10(canvas,{
refObj:this,
labelid:791,
labeliderror:790,
- showCheckBox:false,
- name:"exitDialog"
+ showCheckBox:false
});
}
</handler>
@@ -37,24 +36,21 @@
<method name="sendConfirmation" args="confirm,bool">
if ($debug) Debug.write("exitDialog result:", confirm);
canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom',
confirm);
+ canvas.exitDialog = null;
</method>
</class>
<class name="closeWhiteboardDialog">
<handler name="oninit">
- if (null == canvas.closeWhiteboard || 'undefined' ==
canvas.closeWhiteboard) {
+ if (!canvas["closeWhiteboardDialog"]) {
if (canvas.ismoderator || canvas.isAllowedToDraw) {
- new lz.confirmationSingle(canvas,{
+ canvas.closeWhiteboardDialog = new
lz.confirmationSingleSWF10(canvas,{
refObj:this,
labeliderror:1313,
- showCheckBox:false,
- name:"closeWhiteboard"
+ showCheckBox:false
});
} else {
- new lz.errorDialog(canvas,{
- labelid:1366,
- errortext:canvas.getLabelName(1365)
- });
+ new lz.labelerrorPopupSWF10(canvas,{labelid:1366,
errorlabelid:1365});
}
}
</handler>
@@ -62,6 +58,7 @@
<method name="sendConfirmation" args="confirm,bool">
if ($debug) Debug.write("closeWhiteboardDialog result:", confirm);
canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeWhiteboard',
confirm);
+ canvas.closeWhiteboardDialog = null;
</method>
</class>
Copied:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
(from r1305205,
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/confirmationSingleSWF10.lzx?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx&r1=1305205&r2=1305225&rev=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingle.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
Mon Mar 26 05:11:17 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="confirmationSingle" extends="labelExplorerBox" labelid="832"
+<class name="confirmationSingleSWF10" extends="labelExplorerBox" labelid="832"
docking="true" resizeable="false" closable="true" height="140" width="300">
<attribute name="refObj" value="null" />
@@ -90,11 +90,12 @@
this.parent.result = false;
if (null != this.parent.refObj) {
if (parent.refReturnMethod == null) {
- this.parent.refObj.sendNoConfirmation();
+ this.parent.refObj.sendConfirmation(false,t);
} else {
this.parent.refObj[parent.refReturnMethod](false,t);
}
}
+ if ($debug) Debug.write("end");
</handler>
</simpleLabelButton>
<simpleLabelButton labelid="60" width="100" x="$once{ parent.width - 210
}" y="$once{ parent.height - 26 }">
@@ -113,7 +114,7 @@
</simpleLabelButton>
</class>
-<class name="rememberMessage" extends="labelExplorerBox" labelid="832"
+<class name="rememberMessageSWF10" extends="labelExplorerBox" labelid="832"
x="$once{ canvas.width/2 - this.width/2 }" y="100"
docking="true" resizeable="false" closable="true" height="140"
width="300">
Copied:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopupSWF10.lzx
(from r1305205,
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopup.lzx)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopupSWF10.lzx?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopupSWF10.lzx&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopup.lzx&r1=1305205&r2=1305225&rev=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopup.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/errorPopupSWF10.lzx
Mon Mar 26 05:11:17 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="errorPopup" extends="labelExplorerBox" labelid="204"
+<class name="errorPopupSWF10" extends="labelExplorerBox" labelid="204"
docking="true" resizeable="false" closable="true" y="100"
x="$once{ parent.width/2 - this.width/2 }" height="160" width="324">
@@ -53,45 +53,45 @@
</class>
-<class name="labelerrorPopup" extends="errorPopup">
+<class name="labelerrorPopupSWF10" extends="errorPopupSWF10">
<attribute name="errorlabelid" type="number"
setter="setErrorLabelId(errorlabelid)" />
<method name="setErrorLabelId" args="errorlabelid" >
this.errorlabelid = errorlabelid;
this.setAttribute("error",canvas.getLabelName(this.errorlabelid));
- if ($debug) Debug.write("labelerrorPopup:
",canvas.getLabelName(this.errorlabelid));
+ if ($debug) Debug.write("labelerrorPopupSWF10:
",canvas.getLabelName(this.errorlabelid));
</method>
</class>
-<class name="singletonErrorPopup" extends="errorPopup">
+<class name="singletonErrorPopupSWF10" extends="errorPopupSWF10">
<handler name="oninit">
- lz.singletonErrorPopupHolder.dialogPresent = 1;
- lz.singletonErrorPopupHolder.dialogObject = this;
+ lz.singletonErrorPopupHolderSWF10.dialogPresent = 1;
+ lz.singletonErrorPopupHolderSWF10.dialogObject = this;
</handler>
<handler name="ondestroy">
- lz.singletonErrorPopupHolder.dialogPresent = 0;
- lz.singletonErrorPopupHolder.dialogObject = null;
+ lz.singletonErrorPopupHolderSWF10.dialogPresent = 0;
+ lz.singletonErrorPopupHolderSWF10.dialogObject = null;
</handler>
</class>
-<class name="singletonErrorPopupHolder">
+<class name="singletonErrorPopupHolderSWF10">
<attribute name="error" type="string" setter="setError(error)"/>
<attribute name="dialogPresent" allocation="class" value="0" />
<attribute name="dialogObject" allocation="class" />
<method name="setError" args="error">
- if ( lz.singletonErrorPopupHolder.dialogPresent == 0 )
+ if ( lz.singletonErrorPopupHolderSWF10.dialogPresent == 0 )
{
- lz.singletonErrorPopupHolder.dialogPresent = 1;
- lz.singletonErrorPopupHolder.dialogObject = new
lz.singletonErrorPopup(canvas,{error:error});
+ lz.singletonErrorPopupHolderSWF10.dialogPresent = 1;
+ lz.singletonErrorPopupHolderSWF10.dialogObject = new
lz.singletonErrorPopupSWF10(canvas,{error:error});
}
else
{
- lz.singletonErrorPopupHolder.dialogObject.error = error;
+ lz.singletonErrorPopupHolderSWF10.dialogObject.error =
error;
}
</method>
</class>
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=1305225&r1=1305224&r2=1305225&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
Mon Mar 26 05:11:17 2012
@@ -2,7 +2,7 @@
<library>
<include href="commonPopupAdapter.lzx" />
- <include href="confirmationSingle.lzx" />
- <include href="errorPopup.lzx" />
+ <include href="confirmationSingleSWF10.lzx" />
+ <include href="errorPopupSWF10.lzx" />
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/library.lzx?rev=1305225&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/library.lzx
Mon Mar 26 05:11:17 2012
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="conference/" />
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx?rev=1305225&r1=1305224&r2=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx
Mon Mar 26 05:11:17 2012
@@ -153,7 +153,7 @@
y:this.currentY
});
} else {
- new lz.labelerrorPopup(canvas,{
+ new lz.labelerrorPopupSWF10(canvas,{
errorlabelid:1125
});
}
@@ -180,7 +180,7 @@
parent.sendRemoteCursorEvent.doCall();
} else {
- new lz.labelerrorPopup(canvas,{
+ new lz.labelerrorPopupSWF10(canvas,{
errorlabelid:1125
});
}
@@ -196,7 +196,7 @@
parent.sendRemoteCursorEvent.tObject = tObject;
parent.sendRemoteCursorEvent.doCall();
} else {
- new lz.labelerrorPopup(canvas,{
+ new lz.labelerrorPopupSWF10(canvas,{
errorlabelid:1125
});
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1305225&r1=1305224&r2=1305225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Mon Mar 26 05:11:17 2012
@@ -610,7 +610,7 @@
if (this.publicSID == canvas.publicSID) {
//self sound turned off
if (mute) {
- new lz.confirmationSingle(canvas,{
+ new lz.confirmationSingleSWF10(canvas,{
labelid:1388,labeliderror:1389,
refReturnMethod:'confirmGloballyOff',
refObj:this,showCheckBox:false});
@@ -622,7 +622,7 @@
} else {
//disable this action for now
if (!canvas.ismoderator) {
- new lz.labelerrorPopup(canvas,{errorlabelid:1409});
+ new lz.labelerrorPopupSWF10(canvas,{errorlabelid:1409});
return;
}
//you can not unmute it locally by putting sound to 100 cause
the gain is set to zero globally in the micro of the sender!
@@ -633,12 +633,12 @@
if (this.publicSID == canvas.publicSID) {
errorlabelid = 1387;
}
- new lz.labelerrorPopup(canvas,{errorlabelid:errorlabelid});
+ new
lz.labelerrorPopupSWF10(canvas,{errorlabelid:errorlabelid});
return;
}
if (canvas.ismoderator) {
if (mute) {
- new lz.confirmationSingle(canvas,{
+ new lz.confirmationSingleSWF10(canvas,{
labelid:1392,labeliderror:1393,
refReturnMethod:'confirmGloballyOff',
refObj:this,showCheckBox:false});
@@ -648,7 +648,7 @@
}
} else {
if (mute) {
- new lz.confirmationSingle(canvas,{
+ new lz.confirmationSingleSWF10(canvas,{
labelid:1390,labeliderror:1391,
refReturnMethod:'confirmLocallyOff',
refObj:this,showCheckBox:false});
