Author: solomax
Date: Tue Nov 24 12:53:14 2015
New Revision: 1716125
URL: http://svn.apache.org/viewvc?rev=1716125&view=rev
Log:
[OPENMEETINGS-1279] WB close is fixed, code clean up
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
Tue Nov 24 12:53:14 2015
@@ -52,111 +52,6 @@
}
</handler>
-
- <handler name="ontext" args="txt">
- <![CDATA[
- /* FIXME TODO as2->3 migration
- //
-
- if (Capabilities.os.indexOf('Linux')==-1) {
- return;
- }
-
- //if ($debug) Debug.write("Capabilities.os -- START ",
Capabilities.os,txt);
-
- if (txt == null || txt.length == 0) {
- return;
- }
-
-
- //UTF8 character remappings
- var cp1252 = new Object();
- cp1252[0x20ac]=0x80;
- cp1252[0x201a]=0x82;
- cp1252[0x0192]=0x83;
- cp1252[0x201e]=0x84;
- cp1252[0x2026]=0x85;
- cp1252[0x2020]=0x86;
- cp1252[0x2021]=0x87;
- cp1252[0x02c6]=0x88;
- cp1252[0x2030]=0x89;
- cp1252[0x0160]=0x8a;
- cp1252[0x2039]=0x8b;
- cp1252[0x0152]=0x8c;
- cp1252[0x017d]=0x8e;
- cp1252[0x2018]=0x91;
- cp1252[0x2019]=0x92;
- cp1252[0x201c]=0x93;
- cp1252[0x201d]=0x94;
- cp1252[0x2022]=0x95;
- cp1252[0x2013]=0x96;
- cp1252[0x2014]=0x97;
- cp1252[0x02dc]=0x98;
- cp1252[0x2122]=0x99;
- cp1252[0x0161]=0x9a;
- cp1252[0x203a]=0x9b;
- cp1252[0x0153]=0x9c;
- cp1252[0x017e]=0x9e;
- cp1252[0x0178]=0x9f;
-
-
- var s=eval(Selection.getFocus());
- var t=txt;
-
- var i=Selection.getCaretIndex()-1;
-
- //if ($debug) Debug.write("i",i,Selection.getCaretIndex());
-
- var d=i;
-
- //if ($debug) Debug.write("DO WHILE -1-
",t.charCodeAt(i),cp1252[t.charCodeAt(i)],i,0x80,0xBF);
-
- while (((t.charCodeAt(i)>=0x80 && t.charCodeAt(i)<=0xBF) ||
(cp1252[t.charCodeAt(i)])) && i>0) {
-
- //if ($debug) Debug.write("DO WHILE -2-
",t.charCodeAt(i),cp1252[t.charCodeAt(i)],i);
-
- if (cp1252[t.charCodeAt(i)]) {
-
t=t.substr(0,i)+String.fromCharCode(cp1252[t.charCodeAt(i)])+t.substr(i+1);
- }
- i--;
- }
- if (i==d) {
- //if ($debug) Debug.write("i == d NOTHING TO REPLACE!");
- return;
- }
-
- var u=0;
-
- if (t.charCodeAt(i)>=0xC2 && t.charCodeAt(i)<=0xDF && d-i==1) {
- // two-byte sequence
- u= (t.charCodeAt(i+1) & 0x3F) +
- ((t.charCodeAt(i ) & 3 ) << 6) +
- ((t.charCodeAt(i ) & 0x1C) << 6);
- } else if (t.charCodeAt(i)>=0xE0 && t.charCodeAt(i)<=0xEF &&
d-i==2) {
- // three-byte sequence
- // (Flash Player doesn't cope with any more obscure Unicode)
- u= (t.charCodeAt(i+2) & 0x3F) +
- ((t.charCodeAt(i+1) & 3 ) << 6 ) +
- ((t.charCodeAt(i+1) & 0x3C) << 6 ) +
- ((t.charCodeAt(i ) & 0x0F) << 12);
- }
-
- if (u!=0) {
- //if ($debug) Debug.write("Replace String -1- ",txt,u,"Replace
With ",String.fromCharCode(u));
-
-
this.setAttribute("text",t.slice(0,i)+String.fromCharCode(u)+t.slice(d+1));
-
- //if ($debug) Debug.write("Replace String -2- ",txt,u);
-
-
this.setAttribute("text",this.text.split(String.fromCharCode(0x03)).join(''));
- }
-
- //if ($debug) Debug.write("-- END ",this.text);
- */
- ]]>
- </handler>
-
-
</class>
</library>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Tue Nov 24 12:53:14 2015
@@ -312,7 +312,6 @@
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- //FIXME TODO parent.getLanguages.doCall();
parent.getDefaultLanguage.doCall();
</handler>
</netRemoteCallHib>
@@ -325,19 +324,6 @@
</handler>
</netRemoteCallHib>
- <!-- FIXME TODO
- <netRemoteCallHib name="getLanguages"
funcname="languageservice.getLanguages" dataobject="languagesSet" >
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the
rtmpconnection
- //if ($debug) Debug.write("getLanguages: ",value,
languagesSet);
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
- parent.getDefaultLanguage.doCall();
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="setDefaultUserLanguage">
<![CDATA[
if (userlang == -1 && canvas.language_id != 0) {
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Tue Nov 24 12:53:14 2015
@@ -266,24 +266,6 @@
//set user color
canvas.currentusercolor = canvas.getColorForUser();
- /*FIXME TODO
-
- var t = this;
- canvas.videoComp_lc.remoteLogWrite = function(message) {
- canvas.remoteLogWrite(message);
- }
- canvas.videoComp_lc.exitRoom = function(confirm) {
- if ($debug) Debug.write("confirm exitRoom:", confirm);
- if (confirm) {
- if ($debug) Debug.write("logicalRoomLeave: ",
canvas.thishib.connected);
- if (canvas.thishib.connected) {
- logicalRoomLeave.doCall();
- } else {
- canvas.doActionmenu('quit');
- }
- }
- }*/
-
mainBaseText.setAttribute('text',canvas.currentappname);
var _url = this.getDisplayObject().loaderInfo.url;
if($debug) Debug.write("_url: ",_url);
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Tue Nov 24 12:53:14 2015
@@ -459,12 +459,18 @@
<method name="immediateExitRoom" args="bool,ctx">
<![CDATA[
- if($debug) Debug.write("0");
- if (canvas.wicketsid != null && bool) {
- if($debug) Debug.write("1");
- clearAll();
+ if($debug) Debug.write("0", bool,ctx);
+ if (bool) {
+ if (canvas.wicketsid != null) {
+ if($debug) Debug.write("1");
+ clearAll();
+ }
+ if (canvas.thishib.connected) {
+ canvas.logicalRoomLeave.doCall();
+ } else {
+ canvas.doActionmenu('quit');
+ }
}
- canvas.quit();
]]>
</method>
@@ -475,28 +481,6 @@
}
</method>
- <!---
- Shows the close whiteboard dialog
- -->
- <method name="closeWhiteboard">
- if ($debug) Debug.write("closeWhiteboard");
- if (canvas.ismoderator || canvas.isAllowedToDraw) {
- canvas.closeWhiteboardDialog = new lz.confirmationSingle(canvas,{
- refObj:this,
- labeliderror:1313,
- refReturnMethod:'closeWhiteboardConfirmMethod',
- showCheckBox:false
- });
- } else {
- new lz.labelerrorPopupSWF10(canvas,{labelid:1366,
errorlabelid:1365});
- }
- return;
- </method>
-
- <method name="closeWhiteboardConfirmMethod" args="bool,sharedObjectData">
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeWhiteboard',
bool);
- </method>
-
<!-- arranges video pods -->
<method name="arrangeWindows">
<![CDATA[
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
Tue Nov 24 12:53:14 2015
@@ -131,33 +131,41 @@
bgcolor="black" opacity="0.3" visibility="hidden" x="1" y="1" />
- <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false"
- x="1" fontsize="10" name="_text" />
-
- <view y="1" x="${ parent.width-18 }" name="_close"
- resource="btn_presenter_close"
- opacity="${ ((canvas.ismoderator) ? 1 : ((canvas.isAllowedToDraw)
? 1 : 0.5 )) }"
- onmouseover="this.setAttribute('frame',2)"
- onmouseout="this.setAttribute('frame',1)"
- onmousedown="this.setAttribute('frame',3)"
- onmouseup="this.setAttribute('frame',1)" >
- <handler name="onclick">
- <![CDATA[
- this.setAttribute('frame',2);
- canvas.commonVideoViewContent.closeWhiteboard();
- /* FIXME TODO
- 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>
- <labelTooltip labelid="1364" />
- </view>
+ <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false"
x="1" fontsize="10" name="_text" />
+
+ <view y="1" x="${ parent.width-18 }" name="_close"
+ resource="btn_presenter_close"
+ opacity="${ ((canvas.ismoderator) ? 1 :
((canvas.isAllowedToDraw) ? 1 : 0.5 )) }"
+ onmouseover="this.setAttribute('frame',2)"
+ onmouseout="this.setAttribute('frame',1)"
+ onmousedown="this.setAttribute('frame',3)"
+ onmouseup="this.setAttribute('frame',1)" >
+ <handler name="onclick">
+ <![CDATA[
+ this.setAttribute('frame',2);
+ if ($debug) Debug.write("closeWhiteboard");
+ if (canvas.ismoderator || canvas.isAllowedToDraw) {
+ canvas.closeWhiteboardDialog = new
lz.confirmationSingle(canvas,{
+ refObj:this,
+ labeliderror:1313,
+
refReturnMethod:'closeWhiteboardConfirmMethod',
+ showCheckBox:false
+ });
+ } else {
+ new lz.labelerrorPopup(canvas,{labelid:1366,
errorlabelid:1365});
+ }
+ ]]>
+ </handler>
+
+ <method name="closeWhiteboardConfirmMethod"
args="bool,sharedObjectData">
+ if ($debug) Debug.write("confirm closeWhiteboard:",
bool);
+ if (bool) {
+ parent.parent.removeObject(parent);
+ }
+ </method>
+
+ <labelTooltip labelid="1364" />
+ </view>
<text y="1" name="_long" text="..." fgcolor="0xFFFFFF"
x="${ parent.width-28 }" fontsize="10" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx
Tue Nov 24 12:53:14 2015
@@ -153,7 +153,7 @@
y:this.currentY
});
} else {
- new lz.labelerrorPopupSWF10(canvas,{
+ new lz.labelerrorPopup(canvas,{
errorlabelid:1125
});
}
@@ -180,7 +180,7 @@
parent.sendRemoteCursorEvent.doCall();
} else {
- new lz.labelerrorPopupSWF10(canvas,{
+ new lz.labelerrorPopup(canvas,{
errorlabelid:1125
});
}
@@ -196,7 +196,7 @@
parent.sendRemoteCursorEvent.tObject = tObject;
parent.sendRemoteCursorEvent.doCall();
} else {
- new lz.labelerrorPopupSWF10(canvas,{
+ new lz.labelerrorPopup(canvas,{
errorlabelid:1125
});
}
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1716125&r1=1716124&r2=1716125&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Tue Nov 24 12:53:14 2015
@@ -378,7 +378,7 @@
if (canvas.ismoderator ||
canvas.isAllowedToGiveExclusiveAudio) {
parent.parent.confirmExclusiveAudio();
} else {
- new
lz.labelerrorPopupSWF10(canvas,{errorlabelid:1478});
+ new
lz.labelerrorPopup(canvas,{errorlabelid:1478});
}
]]>
</handler>
@@ -503,7 +503,7 @@
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.cleanHolder();
this.confirmExclusiveAudio();
} else {
- new
lz.labelerrorPopupSWF10(canvas,{errorlabelid:1478});
+ new
lz.labelerrorPopup(canvas,{errorlabelid:1478});
}
]]>
</handler>
@@ -587,7 +587,7 @@
} else {
//disable this action for now
if (!canvas.ismoderator) {
- new
lz.labelerrorPopupSWF10(canvas,{errorlabelid:1409});
+ new
lz.labelerrorPopup(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!
@@ -595,7 +595,7 @@
if (this.isMutedByModerator &&
!canvas.ismoderator) {
//FIXME: That is not true, you could
restart audio/video ...
var errorlabelid = this.publicSID ==
canvas.publicSID ? 1387 : 1402;
- new
lz.labelerrorPopupSWF10(canvas,{errorlabelid:errorlabelid});
+ new
lz.labelerrorPopup(canvas,{errorlabelid:errorlabelid});
return;
}
if (canvas.ismoderator) {
