ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 15:43:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Forms] Use ng-model for tree state

Browse Source 
Use ng-model when communicating state to/from the
tree in browse mode. This will simplify implementation
of the Locator control, which also uses a tree, but
which should not set navigation state. WTD-593.
This commit is contained in:
Victor Woeltjen
2014-12-03 13:18:51 -08:00
parent 80ba6f4da3
commit e04b9828ea
6 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
platform/commonUI/general/src/TreeNodeController.js
View File

@ -29,9 +29,9 @@ define(
* expand-to-show-navigated-object behavior.)
* @constructor
*/
function TreeNodeController($scope, navigationService) {
var navigatedObject = navigationService.getNavigation(),
isNavigated = false,
function TreeNodeController($scope) {
var selectedObject = ($scope.ngModel || {}).selectedObject,
isSelected = false,
hasBeenExpanded = false;
// Look up the id for a domain object. A convenience
@ -73,7 +73,7 @@ define(
// Check if the navigated object is in the subtree of this
// node's domain object, by comparing the paths reported
// by their context capability.
function isOnNavigationPath(nodeObject, navObject) {
function isOnSelectionPath(nodeObject, navObject) {
var nodeContext = nodeObject &&
nodeObject.getCapability('context'),
navContext = navObject &&
@ -92,19 +92,19 @@ define(
// Consider the currently-navigated object and update
// parameters which support display.
function checkNavigation() {
function checkSelection() {
var nodeObject = $scope.domainObject;
// Check if we are the navigated object. Check the parent
// as well to make sure we are the same instance of the
// navigated object.
isNavigated =
idsEqual(nodeObject, navigatedObject) &&
idsEqual(parentOf(nodeObject), parentOf(navigatedObject));
isSelected =
idsEqual(nodeObject, selectedObject) &&
idsEqual(parentOf(nodeObject), parentOf(selectedObject));
// Expand if necessary (if the navigated object will
// be in this node's subtree)
if (isOnNavigationPath(nodeObject, navigatedObject) &&
if (isOnSelectionPath(nodeObject, selectedObject) &&
$scope.toggle !== undefined) {
$scope.toggle.setState(true);
hasBeenExpanded = true;
@ -113,17 +113,14 @@ define(
// Callback for the navigation service; track the currently
// navigated object and update display parameters as needed.
function setNavigation(object) {
navigatedObject = object;
checkNavigation();
function setSelection(object) {
selectedObject = object;
checkSelection();
}
// Listen for changes which will effect display parameters
navigationService.addListener(setNavigation);
$scope.$on("$destroy", function () {
navigationService.removeListener(setNavigation);
});
$scope.$watch("domainObject", checkNavigation);
$scope.$watch("ngModel.selectedObject", setSelection);
$scope.$watch("domainObject", checkSelection);
return {
/**
@ -143,11 +140,13 @@ define(
},
/**
* Check whether or not the domain object represented by
* this tree node is currently the navigated object.
* @returns true if this is the navigated object
* this tree node should be highlighted.
* An object will be highlighted if it matches
* ngModel.selectedObject
* @returns true if this should be highlighted
*/
isNavigated: function () {
return isNavigated;
isSelected: function () {
return isSelected;
}
};
}