diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-06 16:57:52 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-06 16:57:52 -0400 |
| commit | 40fc4fc94ee0523aea1a36f8f6cf3acb4af0b599 (patch) | |
| tree | 0ccc6de3ed65e87387d7e89266da932a823cc006 /www/js/PortalLoginCtrl.js | |
| parent | dd8d072fdae253c611e8ca3ff9ed8d92f0d4483a (diff) | |
support for Event Notification
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index ec287cf7..4207c18e 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -3,7 +3,7 @@ /*This is for the loop closure I am using in line 143 */ /* jslint browser: true*/ /* global vis,cordova,StatusBar,angular,console,moment */ -angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID) { +angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID', 'EventServer', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID, EventServer) { $scope.$on('$ionicView.enter', @@ -86,7 +86,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $state.go('lowversion', {"ver":data}); } }); - + initWebSocket(); $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam); }, // coming here means auth error @@ -143,6 +143,18 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic return 0; } + + function initWebSocket() + { + var loginData = ZMDataModel.getLogin(); + + + ZMDataModel.zmLog (" webSocketStart: attempting to start a WSS connection"); + EventServer.start(); + $rootScope.websocketActive = 1; + + + } function unlock(touchVerified) { ZMDataModel.zmDebug("Trying to unlock PIN"); @@ -154,6 +166,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic zmAutoLogin.doLogin("authenticating...") .then(function (data) // success { + initWebSocket(); // don't get stuck in this state // will happen if you switch to background in portal state if ($rootScope.lastState == "zm-portal-login") { @@ -204,7 +217,6 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic var loginData = ZMDataModel.getLogin(); $ionicSideMenuDelegate.canDragContent(false); - - + }]);
\ No newline at end of file |