diff --git a/www/scripts/apps/admin/main/app.js b/www/scripts/apps/admin/main/app.js index 34e96cf985..67bbc8b1be 100644 --- a/www/scripts/apps/admin/main/app.js +++ b/www/scripts/apps/admin/main/app.js @@ -55,7 +55,7 @@ define([ throw "You must define a websocket url"; } - if (false === WSConnection.hasSession()) { + if (false === WSConnection.isConnected()) { WSConnection.connect(options.wsurl); } diff --git a/www/scripts/common/websockets/connection.js b/www/scripts/common/websockets/connection.js index 901aa3b6ac..9229f5b16c 100644 --- a/www/scripts/common/websockets/connection.js +++ b/www/scripts/common/websockets/connection.js @@ -6,7 +6,7 @@ define([ return _.extend({ connect: function(url) { - if (this.hasSession()) { + if (this.isConnected()) { throw "Connection is already active"; } var that = this; @@ -21,18 +21,18 @@ define([ }); }, close: function() { - if (false === this.hasSession()) { + if (false === this.isConnected()) { return; } activeSession.close(); activeSession = null; this.trigger("ws:session-close"); }, - hasSession: function() { + isConnected: function() { return activeSession !== null; }, subscribe: function(topic, callback) { - if (false === this.hasSession()) { + if (false === this.isConnected()) { this.on("ws:connect", function(session) { session.subscribe(topic, callback); this.trigger("ws:session-subscribe", topic); @@ -43,7 +43,7 @@ define([ this.trigger("ws:session-subscribe", topic); }, unsubscribe: function(topic, callback) { - if (false === this.hasSession()) { + if (false === this.isConnected()) { return; } activeSession.unsubscribe(topic, callback);