You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/02/11 08:37:06 UTC
svn commit: r1658894 - in /openmeetings/branches/3.0.x/WebContent/src/base:
hibernate/hibRtmpConnection.lzx mainMethods.lzx
Author: solomax
Date: Wed Feb 11 07:37:06 2015
New Revision: 1658894
URL: http://svn.apache.org/r1658894
Log:
[OPENMEETINGS-1174] unenroll works as expected
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1658894&r1=1658893&r2=1658894&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Wed Feb 11 07:37:06 2015
@@ -231,7 +231,12 @@
this.showFullMessage = false;
return;
} else if (this.showKickMessage) {
- new lz.labelerrorPopup(canvas,{errorlabelid:606});
+ new lz.labelerrorPopup(canvas,{
+ errorlabelid:606
+ , onCloseFunc: function() {
+ canvas.quit();
+ }
+ });
canvas._loadingAll.hideContentOnly();
return;
} else if (this.reconnectionAction){
Modified: openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx?rev=1658894&r1=1658893&r2=1658894&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx Wed Feb 11 07:37:06 2015
@@ -474,6 +474,17 @@
}
</method>
+ <method name="quit">
+ canvas.videoComp_lc.exitRoom = null;
+ canvas.thishib.src = null;
+ canvas.thishib.reconnectionAction = false;
+ canvas.thishib.reconnectAfterRoomleft = false;
+ canvas.thishib.counterror = 100;
+ canvas.thishib.disconnect();
+ canvas.thishib._nc.close();
+ flash.external.ExternalInterface.call("roomExit");
+ </method>
+
<!---
Actions connected to the shortcuts
-->
@@ -509,14 +520,7 @@
} else if (stringSub=='showSipDialer') {
new lz.sipDialer(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
- canvas.videoComp_lc.exitRoom = null;
- canvas.thishib.src = null;
- canvas.thishib.reconnectionAction = false;
- canvas.thishib.reconnectAfterRoomleft = false;
- canvas.thishib.counterror = 100;
- canvas.thishib.disconnect();
- canvas.thishib._nc.close();
- flash.external.ExternalInterface.call("roomExit");
+ canvas.quit();
} else if( stringSub == "browser_open" ){
var browserPanelWidth = canvas.browserPanelWidth;
var browserPanelHeight = canvas.browserPanelHeight;