FS-10309: [verto_communicator] Add a loader that shows up when check network is calle...

The button to check network now is disabled when a request is processing.

diff --git a/html5/verto/verto_communicator/src/css/verto.css b/html5/verto/verto_communicator/src/css/verto.css
index 0d674b42f8d749825d9d2f08b9c3049ab126679e..5111880806225896ce6c77badc15584e445b14ca 100644 (file)
--- a/html5/verto/verto_communicator/src/css/verto.css
+++ b/html5/verto/verto_communicator/src/css/verto.css
@@ -1735,3 +1735,8 @@ body:-webkit-full-screen #incall .video-footer {
   color: rgba(0, 10, 66, 0.84);
   background-color: #E8E8E8;
 }
+
+#settings .loader {
+  width: 20px;
+  height: 20px;
+}

diff --git a/html5/verto/verto_communicator/src/locales/locale-en.json b/html5/verto/verto_communicator/src/locales/locale-en.json
index 437e5659975bb0fd41174865fd1006bb2d66593c..56f4899f67d492e3e371be460320a815acdda3be 100644 (file)
--- a/html5/verto/verto_communicator/src/locales/locale-en.json
+++ b/html5/verto/verto_communicator/src/locales/locale-en.json
@@ -124,6 +124,7 @@
   "AUTO_SPEED_RES": "Automatically determine speed and resolution settings",
   "RECHECK_BANDWIDTH": "Recheck bandwidth before each outgoing call",
   "CHECK_NETWORK_SPEED": "Check Network Speed",
+  "CHECKING_NETWORK_SPEED": "Checking Network Speed",
   "VIDEO_QUALITY": "Video quality:",
   "MAX_INCOMING_BANDWIDTH": "Max incoming bandwidth:",
   "MAX_OUTGOING_BANDWIDTH": "Max outgoing bandwidth:",

diff --git a/html5/verto/verto_communicator/src/locales/locale-pt.json b/html5/verto/verto_communicator/src/locales/locale-pt.json
index 23f0c8a0b35971317a4fbabe7d019f659d122c5a..8301557bed48f8442b10acb3e9fddcb6fd5bed40 100644 (file)
--- a/html5/verto/verto_communicator/src/locales/locale-pt.json
+++ b/html5/verto/verto_communicator/src/locales/locale-pt.json
@@ -124,6 +124,7 @@
   "AUTO_SPEED_RES": "Determinar automaticamente velocidade e configurações de resolução",
   "RECHECK_BANDWIDTH": "Verificar novamente largura de banda antes de realizar cada chamada",
   "CHECK_NETWORK_SPEED": "Verificar velocidade da rede",
+  "CHECKING_NETWORK_SPEED": "Verificando velocidade da rede",
   "VIDEO_QUALITY": "Qualidade do vídeo:",
   "MAX_INCOMING_BANDWIDTH": "Largura de banda de entrada máxima:",
   "MAX_OUTGOING_BANDWIDTH": "Largura de banda de saída máxima:",

diff --git a/html5/verto/verto_communicator/src/partials/settings.html b/html5/verto/verto_communicator/src/partials/settings.html
index 8a00e40be27b0964cf75d124608e1f446b39dbd9..550a9e84b412f8a7742822131b56dfc0931469dd 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/settings.html
+++ b/html5/verto/verto_communicator/src/partials/settings.html
@@ -135,11 +135,24 @@
           </label>
         </div>
 
-        <div class="checkbox" ng-show="mydata.autoBand">
-          <label>
-            <input type="checkbox" ng-model="mydata.testSpeedJoin">
-            <span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
-          </label>
+        <div ng-show="mydata.autoBand">
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" ng-model="mydata.testSpeedJoin">
+              <span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
+            </label>
+          </div>
+
+          <a class="btn btn-primary" href="" ng-disabled="isTestingSpeed" ng-click="testSpeed()">
+            {{ isTestingSpeed ? 'CHECKING_NETWORK_SPEED' : 'CHECK_NETWORK_SPEED' | translate }}
+          </a>
+
+          <div>
+            <span ng-bind="speedMsg"></span>
+            <span ng-show="isTestingSpeed">
+              <img class="loader" src="src/images/ajax-loader.gif"/>
+            </span>
+          </div>
         </div>
 
         <a ng-show="mydata.autoBand" class="btn btn-primary" href="" ng-click="testSpeed()">{{ 'CHECK_NETWORK_SPEED' | translate }}</a> <span ng-bind="speedMsg"></span>

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
index a7da6f4beb3bf823125c097026c2c37596ea12fc..1aee566dcb1eb0cd693311b963f4017170c1f086 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js
@@ -84,11 +84,13 @@
         };
 
         $scope.testSpeed = function() {
+          $scope.isTestingSpeed = true;
           return verto.testSpeed(cb);
 
           function cb(data) {
             $scope.mydata.vidQual = storage.data.vidQual;
             $scope.speedMsg = 'Up: ' + data.upKPS + ' Down: ' + data.downKPS;
+            $scope.isTestingSpeed = false;
             $scope.$apply();
           }
         };