wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1097733 - Enable Loop Rooms to be reused without reloading, by resetting the multiplex gum. r=nperriault

Browse Source
This commit is contained in:
Mark Banner 2014-11-13 15:33:16 +00:00
parent f8b3a3aaa8
commit 312adab51d
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/loop/content/shared/js/activeRoomStore.js
View File

@ -364,6 +364,10 @@ loop.store.ActiveRoomStore = (function() {
* Switches to READY if undefined.
*/
_leaveRoom: function(nextState) {
if (loop.standaloneMedia) {
loop.standaloneMedia.multiplexGum.reset();
}
this._sdkDriver.disconnectSession();
if (this._timeout) {

29
browser/components/loop/test/shared/activeRoomStore_test.js
View File

@ -1,4 +1,4 @@
/* global chai */
/* global chai, loop */
var expect = chai.expect;
var sharedActions = loop.shared.actions;
@ -8,6 +8,7 @@ describe("loop.store.ActiveRoomStore", function () {
var ROOM_STATES = loop.store.ROOM_STATES;
var sandbox, dispatcher, store, fakeMozLoop, fakeSdkDriver;
var fakeMultiplexGum;
beforeEach(function() {
sandbox = sinon.sandbox.create();
@ -30,6 +31,14 @@ describe("loop.store.ActiveRoomStore", function () {
disconnectSession: sandbox.stub()
};
fakeMultiplexGum = {
reset: sandbox.spy()
};
loop.standaloneMedia = {
multiplexGum: fakeMultiplexGum
};
store = new loop.store.ActiveRoomStore({
dispatcher: dispatcher,
mozLoop: fakeMozLoop,
@ -379,6 +388,12 @@ describe("loop.store.ActiveRoomStore", function () {
});
});
it("should reset the multiplexGum", function() {
store.leaveRoom();
sinon.assert.calledOnce(fakeMultiplexGum.reset);
});
it("should disconnect from the servers via the sdk", function() {
store.connectionFailure();
@ -458,6 +473,12 @@ describe("loop.store.ActiveRoomStore", function () {
});
});
it("should reset the multiplexGum", function() {
store.leaveRoom();
sinon.assert.calledOnce(fakeMultiplexGum.reset);
});
it("should disconnect from the servers via the sdk", function() {
store.windowUnload();
@ -497,6 +518,12 @@ describe("loop.store.ActiveRoomStore", function () {
});
});
it("should reset the multiplexGum", function() {
store.leaveRoom();
sinon.assert.calledOnce(fakeMultiplexGum.reset);
});
it("should disconnect from the servers via the sdk", function() {
store.leaveRoom();