Merge pull request #544 in FS/freeswitch from…

Merge pull request #544 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8247-when-websocket-disconnections-go to master

* commit '6df703fc':
  FS-8247 [verto_communicator] Waiting for server reconnection.

html5/verto/verto_communicator/src/index.html

@@ -109,6 +109,7 @@
     <script type="text/javascript" src="src/vertoControllers/controllers/MainController.js"></script>
     <script type="text/javascript" src="src/vertoControllers/controllers/MenuController.js"></script>
     <script type="text/javascript" src="src/vertoControllers/controllers/ModalDialpadController.js"></script>
+    <script type="text/javascript" src="src/vertoControllers/controllers/ModalWsReconnectController.js"></script>
     <script type="text/javascript" src="src/vertoControllers/controllers/ModalLoginInformationController.js"></script>
     <script type="text/javascript" src="src/vertoControllers/controllers/ModalSettingsController.js"></script>
 

html5/verto/verto_communicator/src/partials/ws_reconnect.html

+<div class="modal-header">
+<h3 class="modal-title">Waiting for server reconnection.</h3>
+</div>
+<div class="modal-body">
+  
+</div>
+<div class="modal-footer">
+</div>
+

html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js

@@ -128,12 +128,16 @@
         );
       };
 
-      $rootScope.openModal = function(templateUrl, controller) {
-        var modalInstance = $modal.open({
+      $rootScope.openModal = function(templateUrl, controller, _options) {
+        var options = {
           animation: $scope.animationsEnabled,
           templateUrl: templateUrl,
           controller: controller,
-        });
+        };
+        
+        angular.extend(options, _options);
+
+        var modalInstance = $modal.open(options);
 
         modalInstance.result.then(
           function(result) {
@@ -149,7 +153,33 @@
             jQuery.material.init();
           }
         );
+        
+        return modalInstance;
+      };
+
+      $rootScope.$on('ws.close', onWSClose);
+      $rootScope.$on('ws.login', onWSLogin);
+
+      var ws_modalInstance;
+
+      function onWSClose(ev, data) {
+        if(ws_modalInstance) {
+          return;
+        };
+        var options = {
+          backdrop: 'static',
+          keyboard: false
+        };
+        ws_modalInstance = $scope.openModal('partials/ws_reconnect.html', 'ModalWsReconnectController', options);
+      };
+
+      function onWSLogin(ev, data) {
+        if(!ws_modalInstance) {
+          return;
+        };
 
+        ws_modalInstance.close();
+        ws_modalInstance = null;
       };
 
       $scope.showAbout = function() {

html5/verto/verto_communicator/src/vertoControllers/controllers/ModalWsReconnectController.js

+(function() {
+  'use strict';
+
+  angular
+    .module('vertoControllers')
+    .controller('ModalWsReconnectController', ModalWsReconnectController);
+
+    ModalWsReconnectController.$inject = ['$scope', 'storage', 'verto'];
+
+    function ModalWsReconnectController($scope, storage, verto) {
+      console.debug('Executing ModalWsReconnectController'); 
+    };
+                
+                
+})();

html5/verto/verto_communicator/src/vertoService/services/vertoService.js

@@ -449,6 +449,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
         var callbacks = {
           onWSLogin: function(v, success) {
             data.connected = success;
+            $rootScope.$emit('ws.login', success);
             console.debug('Connected to verto server:', success);
 
             if (angular.isFunction(callback)) {
@@ -541,6 +542,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 
           onWSClose: function(v, success) {
             console.debug('onWSClose:', success);
+
+            $rootScope.$emit('ws.close', success);
           },
 
           onEvent: function(v, e) {