Browse Source

Moved unload handler to controller.

pull/156/merge
Simon Eisenmann 11 years ago
parent
commit
90250d9139
  1. 7
      static/js/controllers/mediastreamcontroller.js
  2. 7
      static/js/mediastream/webrtc.js

7
static/js/controllers/mediastreamcontroller.js

@ -40,6 +40,13 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder @@ -40,6 +40,13 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
return translation._("Close this window and disconnect?");
});
$($window).on("unload", function() {
mediaStream.webrtc.doHangup("unload");
if (mediaStream.api.connector) {
mediaStream.api.connector.disabled = true;
}
});
// Enable app full screen listener.
$("#bar .logo").on("doubletap dblclick", _.debounce(function() {
if (BigScreen.enabled) {

7
static/js/mediastream/webrtc.js

@ -106,13 +106,6 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u @@ -106,13 +106,6 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u
this.api.e.bind("received.offer received.candidate received.answer received.bye received.conference", _.bind(this.processReceived, this));
$(window).on("unload", _.bind(function() {
this.doHangup("unload");
if (this.api.connector) {
this.api.connector.disabled = true;
}
}, this));
// Create default media (audio/video).
this.usermedia = new UserMedia();
this.usermedia.e.on("mediasuccess mediaerror", _.bind(function() {

Loading…
Cancel
Save