ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-02 03:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Representation] Handle edge cases

Browse Source 
Handle edge cases (e.g. directive priorities, race conditions)
to ensure that mct-representation and mct-include display correctly
when added to or removed from the DOM.
This commit is contained in:
Victor Woeltjen 2015-10-28 15:57:47 -07:00
parent ea9f607bba
commit c5fcc5a558
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/representation/src/MCTInclude.js
View File

@ -84,6 +84,9 @@ define(
// Use the included controller to populate scope
link: link,
// May hide the element, so let other directives act first
priority: -1000,
// Two-way bind key, ngModel, and parameters
scope: { key: "=", ngModel: "=", parameters: "=" }
};

3
platform/representation/src/MCTRepresentation.js
View File

@ -236,6 +236,9 @@ define(
// Handle Angular's linking step
link: link,
// May hide the element, so let other directives act first
priority: -1000,
// Two-way bind key and parameters, get the represented domain
// object as "mct-object"
scope: {

10
platform/representation/src/TemplateLinker.js
View File

@ -83,11 +83,12 @@ define(
function populateElement(template) {
template(scope, function (innerClone) {
element.empty();
element.append(innerClone);
});
}
function applyTemplate(template) {
function applyTemplate(template, templateUrl) {
if (template) {
populateElement(template);
} else {
@ -99,7 +100,12 @@ define(
if (templateUrl !== activeTemplateUrl) {
if (templateUrl) {
addElement();
self.load(templateUrl).then(applyTemplate);
self.load(templateUrl).then(function (template) {
// Avoid race conditions
if (templateUrl === activeTemplateUrl) {
applyTemplate(template);
}
});
} else {
removeElement();
}