Author: solomax
Date: Mon Sep 1 14:48:19 2014
New Revision: 1621814
URL: http://svn.apache.org/r1621814
Log:
[OPENMEETINGS-1077] max participants works as expected
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/errorPopup.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=1621814&r1=1621813&r2=1621814&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
Mon Sep 1 14:48:19 2014
@@ -217,7 +217,17 @@
+ "'; showKickMessage='" + this.showKickMessage + "';
showFullMessage='" + this.showFullMessage
+ "'; reconnectionAction='" + this.reconnectionAction +
"'; reconnectAfterRoomleft='" + this.reconnectAfterRoomleft + "'");
if (this.showFullMessage) {
- new lz.labelerrorPopup(canvas,{errorlabelid:99});
+ new lz.labelerrorPopup(canvas,
+ {
+ errorlabelid: 99
+ , onCloseFunc: function() {
+ if (this.makeModal) {
+ lz.ModeManager.releaseAll();
+ }
+ if ($debug) Debug.write("Error dialog is
being closed, calling QUIT");
+ canvas.doActionmenu('quit');
+ }
+ });
this.showFullMessage = false;
return;
} else if (this.showKickMessage) {
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/errorPopup.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/errorPopup.lzx?rev=1621814&r1=1621813&r2=1621814&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/errorPopup.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/errorPopup.lzx
Mon Sep 1 14:48:19 2014
@@ -25,9 +25,9 @@
x="$once{ parent.width/2 - this.width/2 }" height="160" width="324">
<attribute name="error" value="" type="string" />
-
<attribute name="makeModal" value="false" type="boolean" />
-
+ <attribute name="onCloseFunc" type="object" balue="null"/>
+
<handler name="oninit">
if (this.makeModal) {
lz.ModeManager.makeModal(this);
@@ -35,10 +35,13 @@
</handler>
<handler name="onclose">
- if (this.makeModal) {
- lz.ModeManager.releaseAll();
- }
- </handler>
+ if (this.makeModal) {
+ lz.ModeManager.releaseAll();
+ }
+ if (onCloseFunc != null) {
+ onCloseFunc();
+ }
+ </handler>
<view x="4" resource="warning_icon_rsc" y="24" />
