Resolved merge conflicts
This commit is contained in:
@@ -32,7 +32,8 @@ define(
|
||||
*/
|
||||
function InspectorController($scope, policyService) {
|
||||
var domainObject = $scope.domainObject,
|
||||
typeCapability = domainObject.getCapability('type');
|
||||
typeCapability = domainObject.getCapability('type'),
|
||||
listener;
|
||||
|
||||
/**
|
||||
* Filters region parts to only those allowed by region policies
|
||||
@@ -46,7 +47,20 @@ define(
|
||||
});
|
||||
}
|
||||
|
||||
$scope.regions = filterRegions(typeCapability.getDefinition().inspector || new InspectorRegion());
|
||||
function setRegions() {
|
||||
$scope.regions = filterRegions(typeCapability.getDefinition().inspector || new InspectorRegion());
|
||||
}
|
||||
|
||||
//Listen for changes to object status that might necessitate
|
||||
// recalculation of screen regions.
|
||||
//listener =
|
||||
// domainObject.getCapability("status").listen(setRegions);
|
||||
|
||||
setRegions();
|
||||
|
||||
$scope.$on("$destroy", function() {
|
||||
listener();
|
||||
})
|
||||
}
|
||||
|
||||
return InspectorController;
|
||||
|
||||
Reference in New Issue
Block a user