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

Merge pull request #1639 from normanjaeckel/FixActiveElementLine

Browse Source 
Fixed blue line for active projector elements.
This commit is contained in:
Oskar Hahn 2015-09-17 11:58:42 +02:00
commit 9302b61918
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,20 +115,20 @@ angular.module('OpenSlidesApp.core', [
'/rest/core/projector/1/prune_elements/', '/rest/core/projector/1/prune_elements/',
[{name: this.getResourceName(), id: this.id}] [{name: this.getResourceName(), id: this.id}]
); );
} };
BaseModel.prototype.isProjected = function() { BaseModel.prototype.isProjected = function() {
// Returns true if there is a projector element with the same // Returns true if there is a projector element with the same
// name and the same id. // name and the same id.
var projector = Projector.get(1); var projector = Projector.get(1);
if (typeof projector === 'undefined') return false; if (typeof projector === 'undefined') return false;
var self = this; var self = this;
return _.findIndex(projector.elements, function(element) { var predicate = function (element) {
return element.name == self.getResourceName() && return element.name == self.getResourceName() &&
typeof(element.context) !== 'undefined' && typeof element.id !== 'undefined' &&
typeof(element.context.id) !== 'undefined' && element.id == self.id;
element.context.id == self.id; };
}) > -1; return typeof _.findKey(projector.elements, predicate) === 'string';
} };
return BaseModel; return BaseModel;
}]) }])