ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-17 10:20:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[New Edit Mode] Selecting 'Go To Original' from elements pool navigates without prompting user to save changes #396

Browse Source
This commit is contained in:
Henry 2015-12-09 15:23:26 -08:00
parent 856c61816c
commit 2ca414d2a4
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/commonUI/browse/src/BrowseController.js
View File

@ -88,6 +88,7 @@ define(
} }
if (isDirty() && !confirm(CONFIRM_MSG)) { if (isDirty() && !confirm(CONFIRM_MSG)) {
$scope.treeModel.selectedObject = $scope.navigatedObject;
navigationService.setNavigation($scope.navigatedObject); navigationService.setNavigation($scope.navigatedObject);
} else { } else {
if ($scope.navigatedObject && $scope.navigatedObject.hasCapability("editor")){ if ($scope.navigatedObject && $scope.navigatedObject.hasCapability("editor")){
@ -100,17 +101,6 @@ define(
} }
} }
function setSelectedObject(domainObject) {
if (domainObject !== $scope.navigatedObject && isDirty() && !confirm(CONFIRM_MSG)) {
$scope.treeModel.selectedObject = $scope.navigatedObject;
} else {
if (domainObject !== $scope.navigatedObject && $scope.navigatedObject.hasCapability('editor')){
$scope.navigatedObject.getCapability('action').perform('cancel');
}
setNavigation(domainObject);
}
}
function navigateTo(domainObject) { function navigateTo(domainObject) {
// Check if an object has been navigated-to already... // Check if an object has been navigated-to already...
@ -188,7 +178,7 @@ define(
navigationService.addListener(setNavigation); navigationService.addListener(setNavigation);
// Also listen for changes which come from the tree // Also listen for changes which come from the tree
$scope.$watch("treeModel.selectedObject", setSelectedObject); $scope.$watch("treeModel.selectedObject", setNavigation);
// Clean up when the scope is destroyed // Clean up when the scope is destroyed
$scope.$on("$destroy", function () { $scope.$on("$destroy", function () {