diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-07 16:40:24 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-07 16:40:24 -0400 |
| commit | e8a070188de7785fd1adc06c110afc2adcc3e458 (patch) | |
| tree | 9ddb71fefcb703726bf804b383a520bcac391d3a /www | |
| parent | d50456f09f124913fe119498e75d0c70e5bb7d4a (diff) | |
work in progress
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventServer.js | 7 | ||||
| -rw-r--r-- | www/js/app.js | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 57d4658b..5bb00abf 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -17,6 +17,13 @@ angular.module('zmApp.controllers') var webSocketBadAuth = 0; var ws; + + // FIXME: needs cleaninup up + // on iOS this socket will die after switching to background (eventually) + // on Android it will keep running + // on Android I need to see why websockets are getting duplicated on server + // disconnect + function start() { if (websocketActive == 1) diff --git a/www/js/app.js b/www/js/app.js index 5ddaf0f7..c4ad9300 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -470,6 +470,7 @@ angular.module('zmApp', [ $rootScope.toString = ""; $rootScope.loggedIntoZm = 0; $rootScope.websocketActive = 0; + //console.log ("HERE"); ZMDataModel.init(); @@ -479,9 +480,8 @@ angular.module('zmApp', [ $rootScope.$stateParams = $stateParams; var loginData = ZMDataModel.getLogin(); - + - // This code takes care of trapping the Android back button // and takes it to the menu. $ionicPlatform.registerBackButtonAction(function (e) { |