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

[Code Style] Avoid copying window/scope

Browse Source 
Avoids Angular errors; WTD-1482.
This commit is contained in:
Victor Woeltjen
2015-08-11 10:43:03 -07:00
parent de291ad3b1
commit aa08db1050
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
platform/commonUI/edit/src/representers/EditToolbarRepresenter.js
View File

@ -91,8 +91,22 @@ define(
}
}
// Avoid attaching scope to this;
// http://errors.angularjs.org/1.2.26/ng/cpws
this.setSelection = function (s) {
scope.selection = s;
};
this.clearExposedToolbar = function () {
// Clear exposed toolbar state (if any)
if (attrs.toolbar) {
delete scope.$parent[attrs.toolbar];
}
};
this.exposeToolbar = function () {
scope.$parent[self.attrs.toolbar] = self.toolbarObject;
};
this.commit = commit;
this.scope = scope;
this.attrs = attrs;
this.updateSelection = updateSelection;
this.toolbar = undefined;
@ -127,24 +141,21 @@ define(
// Initialize toolbar object
self.toolbar = new EditToolbar(definition, self.commit);
// Ensure toolbar state is exposed
self.scope.$parent[self.attrs.toolbar] = self.toolbarObject;
self.exposeToolbar();
}
}
// Expose the toolbar object to the parent scope
initialize(definition);
// Create a selection scope
this.scope.selection = new EditToolbarSelection();
this.setSelection(new EditToolbarSelection());
// Initialize toolbar to an empty selection
this.updateSelection([]);
};
// Destroy; remove toolbar object from parent scope
EditToolbarRepresenter.prototype.destroy = function () {
// Clear exposed toolbar state (if any)
if (this.attrs.toolbar) {
delete this.scope.$parent[this.attrs.toolbar];
}
this.clearExposedToolbar();
};
return EditToolbarRepresenter;