Merge pull request #404 in FS/freeswitch from…

Merge pull request #404 in FS/freeswitch from ~JONATASOLIVEIRA/freeswitch:bugfix/FS-7977-selecting-the-highest-supported-resolution-isnt-working to master

* commit '880fb810':
  FS-7977 - [Verto Communicator] Fixing default resolution and cleaning code

html5/verto/js/src/jquery.FSRTC.js

@@ -1040,7 +1040,11 @@ var iceTimer;
     var checkRes = function (cam, func) {
 
 	if (resI >= resList.length) {
-	    if (func) return func();
+            var res = {
+               'validRes': $.FSRTC.validRes,
+               'bestResSupported': $.FSRTC.bestResSupported()
+            };
+	    if (func) return func(res);
 	    return;
 	}
 

html5/verto/verto_communicator/js/app.js

@@ -20,17 +20,17 @@ var vertoApp = angular.module('vertoApp', [
 vertoApp.config(['$routeProvider',
   function($routeProvider) {
     $routeProvider.
-      when('/login', {
-        title: 'Login',
-        templateUrl: 'partials/login.html',
-        controller: 'LoginController'
-      }).
-      when('/dialpad', {
-        title: 'Dialpad',
-        templateUrl: 'partials/dialpad.html',
-        controller: 'DialPadController'
-      }).
-      when('/incall', {
+    when('/login', {
+      title: 'Login',
+      templateUrl: 'partials/login.html',
+      controller: 'LoginController'
+    }).
+    when('/dialpad', {
+      title: 'Dialpad',
+      templateUrl: 'partials/dialpad.html',
+      controller: 'DialPadController'
+    }).
+    when('/incall', {
         title: 'In a Call',
         templateUrl: 'partials/incall.html',
         controller: 'InCallController'
@@ -40,25 +40,26 @@ vertoApp.config(['$routeProvider',
         templateUrl: 'partials/contributors.html',
         controller: 'ContributorsController',
       }).*/
-      when('/browser-upgrade', {
-        title: '',
-        templateUrl: 'partials/browser_upgrade.html',
-        controller: 'BrowserUpgradeController'
-      }).
-      otherwise({
-        redirectTo: '/login'
-      });
-  }]);
+    when('/browser-upgrade', {
+      title: '',
+      templateUrl: 'partials/browser_upgrade.html',
+      controller: 'BrowserUpgradeController'
+    }).
+    otherwise({
+      redirectTo: '/login'
+    });
+  }
+]);
 
 vertoApp.run(['$rootScope', '$location', 'toastr', 'prompt',
   function($rootScope, $location, toastr, prompt) {
-    $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
+    $rootScope.$on('$routeChangeSuccess', function(event, current, previous) {
       $rootScope.title = current.$$route.title;
     });
 
     $rootScope.safeProtocol = false;
 
-    if(window.location.protocol == 'https:') {
+    if (window.location.protocol == 'https:') {
       $rootScope.safeProtocol = true;
     }
 
@@ -79,7 +80,7 @@ vertoApp.run(['$rootScope', '$location', 'toastr', 'prompt',
         message: message,
         input: true,
         label: label
-      }).then(function (ret) {
+      }).then(function(ret) {
         if (angular.isFunction(callback)) {
           callback(ret);
         }
@@ -89,4 +90,5 @@ vertoApp.run(['$rootScope', '$location', 'toastr', 'prompt',
 
     };
 
-}]);
+  }
+]);

html5/verto/verto_communicator/js/directives.js

@@ -18,7 +18,7 @@ vertoDirectives.directive('videoTag',
       // Moving the video tag to the new place inside the incall page.
       console.log('Moving the video to element.');
       jQuery('video').removeClass('hide').appendTo(element);
-      jQuery('video').css('display','block');
+      jQuery('video').css('display', 'block');
       scope.callActive();
 
       element.on('$destroy', function() {
@@ -62,19 +62,19 @@ vertoDirectives.directive('showControls',
       jQuery('.video-footer').fadeIn('slow');
       jQuery('.video-hover-buttons').fadeIn('slow');
       element.parent().bind('mousemove', function() {
-        if(Fullscreen.isEnabled()) {
+        if (Fullscreen.isEnabled()) {
           clearTimeout(i);
           jQuery('.video-footer').fadeIn('slow');
           jQuery('.video-hover-buttons').fadeIn(500);
-          i = setTimeout(function () {
-            if(Fullscreen.isEnabled()) {
+          i = setTimeout(function() {
+            if (Fullscreen.isEnabled()) {
               jQuery('.video-footer').fadeOut('slow');
               jQuery('.video-hover-buttons').fadeOut(500);
             }
           }, 3000);
         }
       });
-      element.parent().bind('mouseleave', function () {
+      element.parent().bind('mouseleave', function() {
         jQuery('.video-footer').fadeIn();
         jQuery('.video-hover-buttons').fadeIn();
       });
@@ -84,4 +84,4 @@ vertoDirectives.directive('showControls',
     return {
       link: link
     };
-});
+  });

html5/verto/verto_communicator/js/storage-service.js

@@ -2,34 +2,36 @@
 
 var storageService = angular.module('storageService', ['ngStorage']);
 
-storageService.service('storage', ['$rootScope', '$localStorage', 'verto', function($rootScope, $localStorage, verto) {
-  var data = $localStorage;
+storageService.service('storage', ['$rootScope', '$localStorage', 'verto',
+  function($rootScope, $localStorage, verto) {
+    var data = $localStorage;
 
-  data.$default({
-    ui_connected: false,
-    ws_connected: false,
-    cur_call: 0,
-    called_number: '',
-    useVideo: true,
-    call_history: [],
-    call_start: false,
-    name: '',
-    email: '',
-    login: '',
-    password: '',
-    userStatus: 'disconnected',
-    mutedVideo: false,
-    mutedMic: false,
-    verto: verto
-  });
+    data.$default({
+      ui_connected: false,
+      ws_connected: false,
+      cur_call: 0,
+      called_number: '',
+      useVideo: true,
+      call_history: [],
+      call_start: false,
+      name: '',
+      email: '',
+      login: '',
+      password: '',
+      userStatus: 'disconnected',
+      mutedVideo: false,
+      mutedMic: false,
+      verto: angular.toJson(verto)
+    });
 
-  return {
-    data: data,
-    reset: function() {
-      data.ui_connected = false;
-      data.ws_connected = false;
-      data.cur_call = 0;
-      data.userStatus = 'disconnected';
-    },
-  };
-}]);
+    return {
+      data: data,
+      reset: function() {
+        data.ui_connected = false;
+        data.ws_connected = false;
+        data.cur_call = 0;
+        data.userStatus = 'disconnected';
+      },
+    };
+  }
+]);