Merge branch 'open1515' of https://github.com/nasa/openmctweb into open117

This commit is contained in:
Charles Hacskaylo 2015-09-24 14:21:38 -07:00
commit 09f5fa42ab

View File

@ -58,6 +58,7 @@ define(
// Link; start listening for changes to an element's size
function link(scope, element, attrs) {
var lastBounds,
linking = true,
active = true;
// Determine how long to wait before the next update
@ -74,7 +75,9 @@ define(
lastBounds.width !== bounds.width ||
lastBounds.height !== bounds.height) {
scope.$eval(attrs.mctResize, { bounds: bounds });
scope.$apply(); // Trigger a digest
if (!linking) { // Avoid apply-in-a-digest
scope.$apply();
}
lastBounds = bounds;
}
}
@ -101,6 +104,9 @@ define(
// Handle the initial callback
onInterval();
// Trigger scope.$apply on subsequent changes
linking = false;
}
return {