diff --git a/src/js/services/fs-xhr.js b/src/js/services/fs-xhr.js index 2d8635d0..1f91d98a 100644 --- a/src/js/services/fs-xhr.js +++ b/src/js/services/fs-xhr.js @@ -19,6 +19,9 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) { this._get(url).done(function(data) { def.resolve(data); }).fail(function(data) { + if(data.statusText === "error"){ //status text given when server is inaccessible + alert("Server is inaccessible!") + } def.reject(data); }); @@ -31,6 +34,9 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) { this._post(url,data).done(function(data) { def.resolve(data); }).fail(function(data) { + if(data.statusText === "error"){ //status text given when server is inaccessible + alert("Server is inaccessible!") + } def.reject(data); }); return def.promise; @@ -40,6 +46,9 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) { var def = Q.defer(); var url = baseurl+path; this._delete(url).done(function(data) { + if(data.statusText === "error"){ //status text given when server is inaccessible + alert("Server is inaccessible!") + } def.resolve(data); }).fail(function(data) { def.reject(data); diff --git a/src/js/services/ng-message.js b/src/js/services/ng-message.js index c12324cf..0c8595fa 100644 --- a/src/js/services/ng-message.js +++ b/src/js/services/ng-message.js @@ -14,7 +14,7 @@ define('services/ng-message',[ var ws; function init() { - if (ws) { + if (ws && ws.readyState === 1) {//the socket has to be open to work return $q.when(ws); } return $settings.init().then(function(settings) { @@ -32,6 +32,9 @@ define('services/ng-message',[ def.resolve(ws); }; ws.onerror = function(e){ + if(e.type === "error"){ + alert("mhub server is inaccessible!") + } log("socket error", e); }; ws.onclose = function() {