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

Merge pull request #2352 from FinnStutzenstein/Issue2349 

Fixing resolving of Config for projector resolution (fixes #2349)
This commit is contained in:
Emanuel Schütze 2016-09-07 20:10:53 +02:00 committed by GitHub
parent 261b23affa fd78ccdb01
commit 34f85da1d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openslides/core/static/js/core/projector.js
View File

@ -67,13 +67,15 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
$scope.$watch(function () {
return Config.lastModified();
}, function () {
var conf = Config.get('projector_resolution').value;
// With multiprojector, get the resolution from Prjector.get(pk).{width; height}
if(!last_conf || last_conf.width != conf.width || last-conf.height != conf.height) {
last_conf = conf;
$scope.projectorWidth = conf.width;
$scope.projectorHeight = conf.height;
$scope.recalculateIframe();
if (typeof $scope.config === 'function') {
var conf = $scope.config('projector_resolution');
if(!last_conf || last_conf.width != conf.width || last_conf.height != conf.height) {
last_conf = conf;
$scope.projectorWidth = conf.width;
$scope.projectorHeight = conf.height;
$scope.recalculateIframe();
}
}
});