kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 17:22:21 +00:00
Code Issues Projects Releases Wiki Activity

FS-8205 [verto_communicator] fix login config and checkConfig

Browse Source
This commit is contained in:
Stefan Yohansson 2015-09-24 15:49:24 -03:00 committed by Ken Rice
parent f13308910c
commit e7b50e8726
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
html5/verto/verto_communicator/src/storageService/services/splash_screen.js
View File

@ -101,22 +101,7 @@
result['promise'] = configPromise; result['promise'] = configPromise;
var connectCallback = function(v, connected) {
verto.data.connecting = false;
if (connected) {
storage.data.ui_connected = verto.data.connected;
storage.data.ws_connected = verto.data.connected;
storage.data.name = verto.data.name;
storage.data.email = verto.data.email;
storage.data.login = verto.data.login;
storage.data.password = verto.data.password;
resolve(result); resolve(result);
}
};
verto.data.connecting = true;
verto.connect(connectCallback);
}); });
}; };

10
html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
View File

@ -31,11 +31,17 @@
$location.path('/'); $location.path('/');
} }
$rootScope.$on('config.http.success', function(ev) {
$scope.login(false);
});
/** /**
* Login the user to verto server and * Login the user to verto server and
* redirects him to dialpad page. * redirects him to dialpad page.
*/ */
$scope.login = function() { $scope.login = function(redirect) {
if(redirect == undefined) {
redirect = true;
}
var connectCallback = function(v, connected) { var connectCallback = function(v, connected) {
$scope.$apply(function() { $scope.$apply(function() {
verto.data.connecting = false; verto.data.connecting = false;
@ -46,8 +52,10 @@
storage.data.email = verto.data.email; storage.data.email = verto.data.email;
storage.data.login = verto.data.login; storage.data.login = verto.data.login;
storage.data.password = verto.data.password; storage.data.password = verto.data.password;
if (redirect) {
$location.path('/dialpad'); $location.path('/dialpad');
} }
}
}); });
}; };

2
html5/verto/verto_communicator/src/vertoService/services/configService.js
View File

@ -61,8 +61,10 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
verto.data.autologin_done = true; verto.data.autologin_done = true;
} }
$rootScope.$emit('config.http.success', data);
return response; return response;
}, function(response) { }, function(response) {
$rootScope.$emit('config.http.error', response);
return response; return response;
}); });