提交 b213ceaf authored 作者: Stefan Yohansson's avatar Stefan Yohansson 提交者: Ken Rice

FS-8205 [verto_communicator] fix config reload

上级 77fd36fa
...@@ -100,8 +100,23 @@ ...@@ -100,8 +100,23 @@
}); });
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);
}
};
verto.data.connecting = true;
verto.connect(connectCallback);
resolve(result);
}); });
}; };
......
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
$location.path('/'); $location.path('/');
} }
$rootScope.$on('config.http.success', function(ev) {
$scope.login();
});
/** /**
* Login the user to verto server and * Login the user to verto server and
* redirects him to dialpad page. * redirects him to dialpad page.
......
...@@ -61,10 +61,8 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', ' ...@@ -61,10 +61,8 @@ 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;
}); });
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论