Author: solomax
Date: Wed Apr 19 12:03:43 2017
New Revision: 1791904
URL: http://svn.apache.org/viewvc?rev=1791904&view=rev
Log:
no jira: WS connection closed event works as expected in IE
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1791904&r1=1791903&r2=1791904&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Wed Apr 19 12:03:43 2017
@@ -67,10 +67,12 @@ function roomLoad() {
}
});
Wicket.Event.subscribe("/websocket/closed", roomClosed);
+ Wicket.Event.subscribe("/websocket/error", roomClosed);
}
function roomUnload() {
$(window).off('resize.openmeetings');
Wicket.Event.unsubscribe("/websocket/closed", roomClosed);
+ Wicket.Event.unsubscribe("/websocket/error", roomClosed);
}
function startPrivateChat(el) {
Chat.addTab('chatTab-u' + el.parent().parent().data("userid"),
el.parent().parent().find('.user.name').text());
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1791904&r1=1791903&r2=1791904&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Wed Apr 19 12:03:43 2017
@@ -187,10 +187,12 @@ function roomLoad() {
}
});
Wicket.Event.subscribe("/websocket/closed", roomClosed);
+ Wicket.Event.subscribe("/websocket/error", roomClosed);
}
function roomUnload() {
$(window).off('resize.openmeetings');
Wicket.Event.unsubscribe("/websocket/closed", roomClosed);
+ Wicket.Event.unsubscribe("/websocket/error", roomClosed);
if (!!WbArea) {
WbArea.destroy();
}
