Author: solomax
Date: Fri Sep 18 10:42:30 2015
New Revision: 1703805
URL: http://svn.apache.org/viewvc?rev=1703805&view=rev
Log:
[OPENMEETINGS-1251] user is redirected to room list if room is full on enter
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.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=1703805&r1=1703804&r2=1703805&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
Fri Sep 18 10:42:30 2015
@@ -101,6 +101,7 @@
<attribute name="showFullMessage" value="false" type="boolean"/>
<attribute name="useRTMPT" value="false" type="boolean" />
+ <attribute name="connected" value="false" type="boolean" />
<method name="getProtocol">
if (canvas.useSSL) {
@@ -180,10 +181,12 @@
//Load Session Data
this.getsessiondata.callRPC();
}
+ connected = true;
</handler>
<handler name="ondisconnect">
canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "disconnect",
[canvas.thishib.src]);
+ connected = false;
</handler>
<method name="reconnectComplete">
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=1703805&r1=1703804&r2=1703805&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx Fri Sep 18
10:42:30 2015
@@ -297,7 +297,12 @@
canvas.videoComp_lc.exitRoom = function(confirm) {
if ($debug) Debug.write("confirm exitRoom:", confirm);
if (confirm) {
- logicalRoomLeave.doCall();
+ if ($debug) Debug.write("logicalRoomLeave: ",
canvas.thishib.connected);
+ if (canvas.thishib.connected) {
+ logicalRoomLeave.doCall();
+ } else {
+ canvas.doActionmenu('quit');
+ }
}
}
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1703805&r1=1703804&r2=1703805&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
Fri Sep 18 10:42:30 2015
@@ -80,23 +80,26 @@
</method>
<method name="sortUserList">
- <![CDATA[
- if (this.sortType == "alphabetical") {
- function sortByName(a,b) {
- if(a.firstname.toLowerCase() < b.firstname.toLowerCase())
return -1;
- else if(a.firstname.toLowerCase() >
b.firstname.toLowerCase()) return 1;
- else return 0;
- }
- this._table.renderList.sort(sortByName);
- } else {
- function sortByStreamId(a,b) {
- if(Number(a.streamid) == Number(b.streamid)) return 0;
- else if(Number(a.streamid) > Number(b.streamid)) return 1;
- else return -1;
- }
- this._table.renderList.sort(sortByStreamId);
- }
- ]]>
+ <![CDATA[
+ if (!this._table.renderList) {
+ return;
+ }
+ if (this.sortType == "alphabetical") {
+ function sortByName(a,b) {
+ if(a.firstname.toLowerCase() <
b.firstname.toLowerCase()) return -1;
+ else if(a.firstname.toLowerCase() >
b.firstname.toLowerCase()) return 1;
+ else return 0;
+ }
+ this._table.renderList.sort(sortByName);
+ } else {
+ function sortByStreamId(a,b) {
+ if(Number(a.streamid) == Number(b.streamid)) return 0;
+ else if(Number(a.streamid) > Number(b.streamid)) return
1;
+ else return -1;
+ }
+ this._table.renderList.sort(sortByStreamId);
+ }
+ ]]>
</method>
<method name="initList">
Modified:
openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1703805&r1=1703804&r2=1703805&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/swf10/commonVideoViewContentSWF10.lzx
Fri Sep 18 10:42:30 2015
@@ -524,9 +524,13 @@
canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'exitRoom', bool);
if($debug) Debug.write("3");
if($debug) Debug.write("Do disconnect 10:: ",
canvas.thishib);
- canvas.thishib.src = null;
+ if (canvas.thishib._nc) {
+ canvas.thishib._nc.close();
+ }
+ if($debug) Debug.write("4");
canvas.thishib.disconnect();
- canvas.thishib._nc.close();
+ if($debug) Debug.write("5");
+ canvas.thishib.src = null;
}
]]>
</method>
