Merge pull request #2352 from FinnStutzenstein/Issue2349
Fixing resolving of Config for projector resolution (fixes #2349)
This commit is contained in:
commit
34f85da1d8
@ -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();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user