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

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

Browse Source 
* commit '8b00fe8dc8b03085da1a63ec4ad80ce08f81105f':
  FS-8043: [verto_communicator] Remove unnecessary calls to localStorage.
This commit is contained in:
Anthony Minessale II 2015-08-28 10:55:57 -05:00
commit 0ffa3a5d0b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html5/verto/verto_communicator/src/storageService/services/storage.js
View File

@ -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 {

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

@ -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 @@
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() {