ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3137 from FinnStutzenstein/Issue3053

Browse Source 
watch for projector resolution change (fixes #3053)
This commit is contained in:
Norman Jäckel 2017-03-24 14:47:09 +01:00 committed by GitHub
commit 359ad0f60c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/core/static/js/core/site.js
View File

@ -1155,8 +1155,9 @@ angular.module('OpenSlidesApp.core.site', [
}, function () { }, function () {
$scope.projectors = Projector.getAll(); $scope.projectors = Projector.getAll();
if (!$scope.active_projector) { if (!$scope.active_projector) {
$scope.changeProjector($filter('orderBy')($scope.projectors, 'id')[0]); $scope.active_projector = $filter('orderBy')($scope.projectors, 'id')[0];
} }
$scope.setIframeSize($scope.active_projector);
if ($scope.projectors.length === 1) { if ($scope.projectors.length === 1) {
$scope.currentListOfSpeakersAsOverlay = true; $scope.currentListOfSpeakersAsOverlay = true;
} }
@ -1180,6 +1181,9 @@ angular.module('OpenSlidesApp.core.site', [
$scope.changeProjector = function (projector) { $scope.changeProjector = function (projector) {
$scope.active_projector = projector; $scope.active_projector = projector;
$scope.setIframeSize(projector);
};
$scope.setIframeSize = function (projector) {
$scope.scale = 256.0 / projector.width; $scope.scale = 256.0 / projector.width;
$scope.iframeHeight = $scope.scale * projector.height; $scope.iframeHeight = $scope.scale * projector.height;
}; };