mirror of
https://github.com/nasa/openmct.git
synced 2025-05-14 14:33:26 +00:00
* [Time Conductor] Prevent route change on setting search parameters. fixes #1341 * [Inspector] Fixed incorrect listener deregistration which was causing errors on scope destruction * Bare route is redirect to browse * [Browse] handle routing without breaking $route Manage route transitions such that route changes are properly prevented and navigation events occur while still updating the url. Resolves a number of issues where path and search updates had to be supported in a very hacky manner. https://github.com/nasa/openmct/pull/1342 * [URL] Set search without hacks Changes in previous commit allow the search parameters to be modified without accidentally triggering a page reload. https://github.com/nasa/openmct/pull/1342 * [Views] Update on location changes If the user has a bookmark or tries to change the current view of an object by specifying view=someView as a search parameter, the change would not previously take effect. This resolves that bug. https://github.com/nasa/openmct/pull/1342 * [TC] Set query params to undefined Instead of setting params to null, which would eventually result in those parameters equaling undefined, set them to undefined to skip the extra step. https://github.com/nasa/openmct/pull/1342 * [Instantiate] Instantiate objects with context Add context to instantiate objects so that they can be navigated to for editing. https://github.com/nasa/openmct/pull/1342 * [Tests] Update specs Update specs to match new expectations. * [Style] Fix style * [TC] Remove unused dependency Remove $route dependency from time conductor controller as it was not being used. Resolves review comments. https://github.com/nasa/openmct/pull/1342#pullrequestreview-11449260
80 lines
2.9 KiB
JavaScript
80 lines
2.9 KiB
JavaScript
/*****************************************************************************
|
|
* Open MCT Web, Copyright (c) 2014-2015, United States Government
|
|
* as represented by the Administrator of the National Aeronautics and Space
|
|
* Administration. All rights reserved.
|
|
*
|
|
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
* http://www.apache.org/licenses/LICENSE-2.0.
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
* Open MCT Web includes source code licensed under additional open source
|
|
* licenses. See the Open Source Licenses file (LICENSES.md) included with
|
|
* this source code distribution or the Licensing information page available
|
|
* at runtime from the About dialog for additional information.
|
|
*****************************************************************************/
|
|
|
|
|
|
define(
|
|
["./PaneController"],
|
|
function (PaneController) {
|
|
|
|
/**
|
|
* Pane controller that reveals inspector, if hidden, when object
|
|
* switches to edit mode.
|
|
*
|
|
* @param $scope
|
|
* @param agentService
|
|
* @param $window
|
|
* @param navigationService
|
|
* @constructor
|
|
*/
|
|
function InspectorPaneController($scope, agentService, $window, navigationService) {
|
|
PaneController.call(this, $scope, agentService, $window);
|
|
|
|
var statusListener,
|
|
self = this;
|
|
|
|
function showInspector(statuses) {
|
|
if (statuses.indexOf('editing') !== -1 && !self.visible()) {
|
|
self.toggle();
|
|
}
|
|
}
|
|
|
|
function attachStatusListener(domainObject) {
|
|
// Remove existing status listener if existing
|
|
if (statusListener) {
|
|
statusListener();
|
|
}
|
|
|
|
if (domainObject.hasCapability("status")) {
|
|
statusListener = domainObject.getCapability("status").listen(showInspector);
|
|
}
|
|
return statusListener;
|
|
}
|
|
|
|
var domainObject = navigationService.getNavigation();
|
|
if (domainObject) {
|
|
attachStatusListener(domainObject);
|
|
}
|
|
|
|
navigationService.addListener(attachStatusListener);
|
|
|
|
$scope.$on("$destroy", function () {
|
|
statusListener();
|
|
navigationService.removeListener(attachStatusListener);
|
|
});
|
|
}
|
|
|
|
InspectorPaneController.prototype = Object.create(PaneController.prototype);
|
|
|
|
return InspectorPaneController;
|
|
}
|
|
);
|