alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Henry
2016-05-12 16:09:02 -07:00
parent 433dd87e51
commit e6bbc3442b
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ define(
*/ */
function MCTRepresentation(representations, views, representers, $q, templateLinker, $log) { function MCTRepresentation(representations, views, representers, $q, templateLinker, $log) {
var representationMap = {}, var representationMap = {},
listeners = 0;
domainObjectListener; domainObjectListener;
// Assemble all representations and views // Assemble all representations and views
@@ -92,6 +93,7 @@ define(
couldEdit = false, couldEdit = false,
lastIdPath = [], lastIdPath = [],
lastKey, lastKey,
statusListener,
changeTemplate = templateLinker.link($scope, element); changeTemplate = templateLinker.link($scope, element);
// Populate scope with any capabilities indicated by the // Populate scope with any capabilities indicated by the
@@ -176,8 +178,6 @@ define(
return; return;
} }
console.log("changed");
// Create an empty object named "representation", for this // Create an empty object named "representation", for this
// representation to store local variables into. // representation to store local variables into.
$scope.representation = {}; $scope.representation = {};
@@ -240,16 +240,18 @@ define(
// Also update when the represented domain object changes // Also update when the represented domain object changes
// (to a different object) // (to a different object)
//$scope.$watch("domainObject", refresh); $scope.$watch("domainObject", refresh);
$scope.$watch("domainObject", function(domainObject) {
$scope.$watch("domainObject", function (domainObject) { if (domainObject){
if (domainObjectListener) { if (statusListener) {
domainObjectListener(); statusListener();
listeners--;
console.log("directive listeners " + listeners);
}
statusListener = domainObject.getCapability("status").listen(refresh);
listeners++;
console.log("directive listeners " + listeners);
} }
if (domainObject) {
domainObjectListener = domainObject.getCapability('status').listen(refresh);
}
refresh();
}); });
// Finally, also update when there is a new version of that // Finally, also update when there is a new version of that
@@ -260,6 +262,13 @@ define(
// Make sure any resources allocated by representers also get // Make sure any resources allocated by representers also get
// released. // released.
$scope.$on("$destroy", destroyRepresenters); $scope.$on("$destroy", destroyRepresenters);
$scope.$on("$destroy", function () {
if (statusListener) {
statusListener();
listeners--;
console.log("directive listeners " + listeners);
}
});
// Do one initial refresh, so that we don't need another // Do one initial refresh, so that we don't need another
// digest iteration just to populate the scope. Failure to // digest iteration just to populate the scope. Failure to