From: João Mesquita <jmesquita@indicium.com.ar>
Date: Fri, 28 Aug 2015 03:12:47 +0000 (-0300)
Subject: FS-8043: [verto_communicator] Remove unnecessary calls to localStorage.
X-Git-Tag: v1.6.2~60^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b00fe8dc8b03085da1a63ec4ad80ce08f81105f;p=thirdparty%2Ffreeswitch.git

FS-8043: [verto_communicator] Remove unnecessary calls to localStorage.
---

diff --git a/html5/verto/verto_communicator/src/storageService/services/storage.js b/html5/verto/verto_communicator/src/storageService/services/storage.js
index 04e8b1709d..f2f7def4f5 100644
--- a/html5/verto/verto_communicator/src/storageService/services/storage.js
+++ b/html5/verto/verto_communicator/src/storageService/services/storage.js
@@ -38,7 +38,7 @@
     });
 
     function changeData(verto_data) {
-      angular.extend(data, verto_data);
+      jQuery.extend(true, data, verto_data);
     }
 
     return {
diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
index 730448b79b..7834be906f 100644
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
@@ -68,7 +68,6 @@
               storage.data.password = verto.data.password;
 
               console.debug('Redirecting to dialpad page.');
-              storage.changeData(verto);
               toastr.success('Login successful.', 'Welcome');
               $location.path('/dialpad');
             } else {
@@ -269,7 +268,6 @@
             title: 'Oops, Active Call in Course.',
             message: 'It seems you were in a call before leaving the last time. Wanna go back to that?'
           }).then(function() {
-            verto.changeData(storage);
             console.log('redirect to incall page');
             $location.path('/incall');
           }, function() {