FS-7998 #resolve Simply don't ask.

FS-7998 Add option to settings interface and persist it on local storage.

diff --git a/html5/verto/verto_communicator/js/controllers.js b/html5/verto/verto_communicator/js/controllers.js
index 7ce1cf2fc90ea4463ff9b2699755d8cf9e92d1a1..e7f55fe1196241f34f8c17331f25e7d6d4e9b237 100644 (file)
--- a/html5/verto/verto_communicator/js/controllers.js
+++ b/html5/verto/verto_communicator/js/controllers.js
@@ -283,17 +283,24 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope',
     });
 
     $rootScope.$on('page.incall', function(event, data) {
-      prompt({
-        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() {
+      if (storage.data.askRecoverCall) {
+        prompt({
+          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() {
+          storage.data.userStatus = 'connecting';
+          verto.hangup();
+        });
+      } else {
         verto.changeData(storage);
         console.log('redirect to incall page');
         $location.path('/incall');
-      }, function() {
-        storage.data.userStatus = 'connecting';
-        verto.hangup();
-      });
+      }
+
     });
 
     $rootScope.callActive = function(data) {

diff --git a/html5/verto/verto_communicator/js/storage-service.js b/html5/verto/verto_communicator/js/storage-service.js
index f0c185ecba25189c2395f79abb103c18159575f5..616839eaa17019c9951786c2238d26e75c45a8e8 100644 (file)
--- a/html5/verto/verto_communicator/js/storage-service.js
+++ b/html5/verto/verto_communicator/js/storage-service.js
@@ -34,7 +34,8 @@ storageService.service('storage', ['$rootScope', '$localStorage',
       mirrorInput: '',
       outgoingBandwidth: '',
       incomingBandwidth: '',
-      vidQual: ''
+      vidQual: '',
+      askRecoverCall: true
     });
 
     function changeData(verto_data) {

diff --git a/html5/verto/verto_communicator/partials/modal_settings.html b/html5/verto/verto_communicator/partials/modal_settings.html
index 5c07e74679d0d770b0ace47da9c94deebb3976a6..55c0ad22056541d069e764b9b7413e60ceaf86d0 100644 (file)
--- a/html5/verto/verto_communicator/partials/modal_settings.html
+++ b/html5/verto/verto_communicator/partials/modal_settings.html
@@ -58,6 +58,12 @@
         Scale Remote Video To Match Camera Resolution
       </label>
     </div>
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" name="ask_recover_call" ng-value="storage.data.askRecoverCall" ng-model="storage.data.askRecoverCall">
+        Ask before recovering call
+      </label>
+    </div>
 
   </div>