FS-8089 [verto_communicator] Opening members list when start conference

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
index c093be086fe7a402ab504e12c0784bd1430adad1..47eb987a28ab1ad4bd899425b0fd368cbfb3224b 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
@@ -20,6 +20,14 @@
         if (storage.data.videoCall) {
           $scope.callTemplate = 'partials/video_call.html';
         }
+        
+        $rootScope.$on('call.conference', function(event, data) {
+          $timeout(function() {
+            if($scope.chatStatus) {
+              $scope.openChat();
+            }
+          });
+        });
 
         $rootScope.$on('call.video', function(event, data) {
           $timeout(function() {
@@ -78,4 +86,4 @@
 
       }
     ]);
-})();
\ No newline at end of file
+})();

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
index f7e3d5bb91791463e2f0566320bf5111eaaa7b65..bd2f2562c1f01f08989d905081afd6e1c52ce00b 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
@@ -12,7 +12,7 @@
       $scope.verto = verto;
       $scope.storage = storage;
       $scope.call_history = angular.element("#call_history").hasClass('active');
-      $scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
+      $rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
 
       /**
        * (explanation) scope in another controller extends rootScope (singleton)
@@ -202,20 +202,20 @@
       };
 
       $scope.toggleChat = function() {
-        if ($scope.chatStatus && $rootScope.activePane === 'chat') {
+        if ($rootScope.chatStatus && $rootScope.activePane === 'chat') {
           $rootScope.chat_counter = 0;
         }
         angular.element('#wrapper').toggleClass('toggled');
-        $scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
+        $rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
       };
 
-      $scope.openChat = function() {
-        $scope.chatStatus = false;
+      $rootScope.openChat = function() {
+        $rootScope.chatStatus = false;
         angular.element('#wrapper').removeClass('toggled');
       };
 
       $scope.closeChat = function() {
-        $scope.chatStatus = true;
+        $rootScope.chatStatus = true;
         angular.element('#wrapper').addClass('toggled');
       };
 
@@ -240,11 +240,9 @@
           Fullscreen.cancel();
         }
 
-
-        console.log($scope.chatStatus);
-        if (!$scope.chatStatus) {
+        if (!$rootScope.chatStatus) {
           angular.element('#wrapper').toggleClass('toggled');
-          $scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
+          $rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
         }
 
         $rootScope.dialpadNumber = '';

diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index cb30f897a4bc743afdc88180c4e34f92a8723936..940ae1059d0d4d11aa0daab1957c5e2e90574fb5 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -335,6 +335,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 
         function startConference(v, dialog, pvtData) {
           $rootScope.$emit('call.video', 'video');
+          $rootScope.$emit('call.conference', 'conference');
           data.chattingWith = pvtData.chatID;
           data.confRole = pvtData.role;