ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Time Conductor] Incorporate feedback from code review

Browse Source 
Retain reference to scope in ConductorRepresenter
directly via this, instead of revealing via
a closure-bound function. This approach is not necessary
to avoid https://docs.angularjs.org/error/ng/cpws in
this circumstance.  WTD-1515
This commit is contained in:
Victor Woeltjen 2015-09-10 10:16:28 -07:00
parent e3b191b5dc
commit 2ec9956d44
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
platform/features/conductor/src/ConductorRepresenter.js
View File

@ -53,22 +53,15 @@ define(
* @param element the jqLite-wrapped representation element
*/
function ConductorRepresenter(conductorService, $compile, views, scope, element) {
var conductorScope;
// Angular doesn't like objects to retain references to scopes
this.getScope = function () {
return scope;
};
this.conductorScope = function (s) {
return (conductorScope = arguments.length > 0 ? s : conductorScope);
};
this.scope = scope;
this.conductorService = conductorService;
this.element = element;
this.views = views;
this.$compile = $compile;
}
// Update the time conductor from the scope
function wireScope(conductor, conductorScope, repScope) {
function updateConductorOuter() {
@ -102,6 +95,11 @@ define(
repScope.$on('telemetry:view', updateConductorInner);
}
ConductorRepresenter.prototype.conductorScope = function (s) {
return (this.cScope = arguments.length > 0 ?
s : this.cScope);
};
// Handle a specific representation of a specific domain object
ConductorRepresenter.prototype.represent = function represent(representation, representedObject) {
this.destroy();
@ -112,11 +110,11 @@ define(
this.hadAbs = this.element.hasClass('abs');
// Create a new scope for the conductor
this.conductorScope(this.getScope().$new());
this.conductorScope(this.scope.$new());
wireScope(
this.conductorService.getConductor(),
this.conductorScope(),
this.getScope()
this.scope
);
this.conductorElement =
this.$compile(TEMPLATE)(this.conductorScope());