hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace hasSession by isConnected

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-28 00:59:15 +01:00
parent af526beb41
commit 1e2cc2692e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/scripts/apps/admin/main/app.js
View File

@@ -55,7 +55,7 @@ define([
throw "You must define a websocket url"; throw "You must define a websocket url";
} }
if (false === WSConnection.hasSession()) { if (false === WSConnection.isConnected()) {
WSConnection.connect(options.wsurl); WSConnection.connect(options.wsurl);
} }

10
www/scripts/common/websockets/connection.js
View File

@@ -6,7 +6,7 @@ define([
return _.extend({ return _.extend({
connect: function(url) { connect: function(url) {
if (this.hasSession()) { if (this.isConnected()) {
throw "Connection is already active"; throw "Connection is already active";
} }
var that = this; var that = this;
@@ -21,18 +21,18 @@ define([
}); });
}, },
close: function() { close: function() {
if (false === this.hasSession()) { if (false === this.isConnected()) {
return; return;
} }
activeSession.close(); activeSession.close();
activeSession = null; activeSession = null;
this.trigger("ws:session-close"); this.trigger("ws:session-close");
}, },
hasSession: function() { isConnected: function() {
return activeSession !== null; return activeSession !== null;
}, },
subscribe: function(topic, callback) { subscribe: function(topic, callback) {
if (false === this.hasSession()) { if (false === this.isConnected()) {
this.on("ws:connect", function(session) { this.on("ws:connect", function(session) {
session.subscribe(topic, callback); session.subscribe(topic, callback);
this.trigger("ws:session-subscribe", topic); this.trigger("ws:session-subscribe", topic);
@@ -43,7 +43,7 @@ define([
this.trigger("ws:session-subscribe", topic); this.trigger("ws:session-subscribe", topic);
}, },
unsubscribe: function(topic, callback) { unsubscribe: function(topic, callback) {
if (false === this.hasSession()) { if (false === this.isConnected()) {
return; return;
} }
activeSession.unsubscribe(topic, callback); activeSession.unsubscribe(topic, callback);