ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 07:08:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open1515

Browse Source
This commit is contained in:
Victor Woeltjen
2015-09-24 11:17:13 -07:00
parent f4e53a946d 6ce4ce6ada
commit 6bd8e7a47c
168 changed files with 14612 additions and 6722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/general/src/directives/MCTResize.js
View File

@ -74,6 +74,7 @@ define(
lastBounds.width !== bounds.width ||
lastBounds.height !== bounds.height) {
scope.$eval(attrs.mctResize, { bounds: bounds });
scope.$apply(); // Trigger a digest
lastBounds = bounds;
}
}
@ -86,7 +87,7 @@ define(
height: element[0].offsetHeight
});
if (active) {
$timeout(onInterval, currentInterval());
$timeout(onInterval, currentInterval(), false);
}
}