提交 0ffa3a5d authored 作者: Anthony Minessale II's avatar Anthony Minessale II

Merge pull request #452 in FS/freeswitch from…

Merge pull request #452 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-8043-doesn-t-appear-to-use-the-selected to master

* commit '8b00fe8d':
  FS-8043: [verto_communicator] Remove unnecessary calls to localStorage.
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
}); });
function changeData(verto_data) { function changeData(verto_data) {
angular.extend(data, verto_data); jQuery.extend(true, data, verto_data);
} }
return { return {
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
storage.data.password = verto.data.password; storage.data.password = verto.data.password;
console.debug('Redirecting to dialpad page.'); console.debug('Redirecting to dialpad page.');
storage.changeData(verto);
toastr.success('Login successful.', 'Welcome'); toastr.success('Login successful.', 'Welcome');
$location.path('/dialpad'); $location.path('/dialpad');
} else { } else {
...@@ -269,7 +268,6 @@ ...@@ -269,7 +268,6 @@
title: 'Oops, Active Call in Course.', title: 'Oops, Active Call in Course.',
message: 'It seems you were in a call before leaving the last time. Wanna go back to that?' message: 'It seems you were in a call before leaving the last time. Wanna go back to that?'
}).then(function() { }).then(function() {
verto.changeData(storage);
console.log('redirect to incall page'); console.log('redirect to incall page');
$location.path('/incall'); $location.path('/incall');
}, function() { }, function() {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论