diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 0f63130f86..9478213a0b 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -48,11 +48,6 @@ "key": "MenuArrowController", "implementation": "MenuArrowController.js", "depends": [ "$scope" ] - }, - { - "key": "BackArrowController", - "implementation": "BackArrowController.js", - "depends": [ "$scope" ] } ], "controls": [ @@ -101,7 +96,7 @@ }, { "key": "back-arrow", - "uses": [ "type", "action" ], + "uses": [ "context" ], "templateUrl": "templates/back-arrow.html" } ], diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html index 6085b91249..daa29de67a 100644 --- a/platform/commonUI/browse/res/templates/back-arrow.html +++ b/platform/commonUI/browse/res/templates/back-arrow.html @@ -21,7 +21,9 @@ --> -{ + + { + diff --git a/platform/commonUI/browse/src/BackArrowController.js b/platform/commonUI/browse/src/BackArrowController.js deleted file mode 100644 index b48740d288..0000000000 --- a/platform/commonUI/browse/src/BackArrowController.js +++ /dev/null @@ -1,64 +0,0 @@ -/***************************************************************************** - * 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. - *****************************************************************************/ - -/*global define*/ -define( - function () { - 'use strict'; - - function BackArrowController($scope) { - function navigateTo(parentObject) { - var action = - parentObject && parentObject.getCapability('action'); - if (action) { - action.perform('navigate'); - } - } - - function navigateToParent() { - var domainObject = $scope.domainObject, - context = - domainObject && domainObject.getCapability('context'); - if (context) { - navigateTo(context.getParent()); - } - } - - function checkRoot(domainObject) { - var context = - domainObject && domainObject.getCapability('context'); - - // We don't want to show the arrow if there is no context - // for this object, or if there is not a meaningful parent - // we can go back to. - $scope.atRoot = (!context) || (context.getPath().length < 3); - } - - $scope.navigateToParent = navigateToParent; - $scope.$watch("domainObject", checkRoot); - } - - return BackArrowController; - - - } -); diff --git a/platform/commonUI/browse/test/BackArrowControllerSpec.js b/platform/commonUI/browse/test/BackArrowControllerSpec.js deleted file mode 100644 index 9dfe0b5d2e..0000000000 --- a/platform/commonUI/browse/test/BackArrowControllerSpec.js +++ /dev/null @@ -1,28 +0,0 @@ -/***************************************************************************** - * 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. - *****************************************************************************/ -/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ - -define( - ["../src/BackArrowController"], - function (BackArrowController) { - } -); diff --git a/platform/commonUI/browse/test/suite.json b/platform/commonUI/browse/test/suite.json index 546cff128e..aa73dd358d 100644 --- a/platform/commonUI/browse/test/suite.json +++ b/platform/commonUI/browse/test/suite.json @@ -1,5 +1,4 @@ [ - "BackArrowController", "BrowseController", "BrowseObjectController", "BrowseTreeController",