FS-8205 [verto_communicator] fix config reload

diff --git a/html5/verto/verto_communicator/src/storageService/services/splash_screen.js b/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
index 917becfbcf032be16a018b3390d1afa9feaca213..3537313bbe3fcab30ce225adb16002f7e69d7b31 100644 (file)
--- a/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
+++ b/html5/verto/verto_communicator/src/storageService/services/splash_screen.js
@@ -100,8 +100,23 @@
               });
 
               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);
           });
         };
 

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
index ac7fde0f7ebc321439b26a6fe1f031ed91314e2c..4dd68797312112a4d79d259eef35c7f6df8b00ec 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
@@ -31,10 +31,6 @@
         $location.path('/');
       }
       
-      $rootScope.$on('config.http.success', function(ev) {
-        $scope.login();
-      });
-
       /**
        * Login the user to verto server and
        * redirects him to dialpad page.

diff --git a/html5/verto/verto_communicator/src/vertoService/services/configService.js b/html5/verto/verto_communicator/src/vertoService/services/configService.js
index ee573ad23d329144c4a73efa3f0ebcef6588683a..2c302b6ad159c4f4a66a01e9b8afd58664a01427 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/configService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/configService.js
@@ -61,10 +61,8 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
           verto.data.autologin_done = true;
         }
         
-        $rootScope.$emit('config.http.success', data);
         return response;
       }, function(response) {
-        $rootScope.$emit('config.http.error', response);
         return response;
       });