提交 880fb810 authored 作者: Stefan Yohansson's avatar Stefan Yohansson 提交者: root

FS-7977 - [Verto Communicator] Fixing default resolution and cleaning code

上级 3e785654
......@@ -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;
}
......
......@@ -48,17 +48,18 @@ vertoApp.config(['$routeProvider',
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',
};
}]);
}
]);
......@@ -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
};
});
});
......@@ -2,7 +2,8 @@
var storageService = angular.module('storageService', ['ngStorage']);
storageService.service('storage', ['$rootScope', '$localStorage', 'verto', function($rootScope, $localStorage, verto) {
storageService.service('storage', ['$rootScope', '$localStorage', 'verto',
function($rootScope, $localStorage, verto) {
var data = $localStorage;
data.$default({
......@@ -20,7 +21,7 @@ storageService.service('storage', ['$rootScope', '$localStorage', 'verto', funct
userStatus: 'disconnected',
mutedVideo: false,
mutedMic: false,
verto: verto
verto: angular.toJson(verto)
});
return {
......@@ -32,4 +33,5 @@ storageService.service('storage', ['$rootScope', '$localStorage', 'verto', funct
data.userStatus = 'disconnected';
},
};
}]);
}
]);
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论