diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index b5d6b47678..0f63130f86 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -25,6 +25,10 @@ "urlService" ] }, + { + "key": "BrowseTreeController", + "implementation": "BrowseTreeController.js" + }, { "key": "BrowseObjectController", "implementation": "BrowseObjectController.js", diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index dd97bbea3f..8ba06c122f 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -22,27 +22,29 @@
-
+
-
- - -
- - -
-
- - -
-
+
+ + +
+ + +
+
+ + +
+
@@ -52,7 +54,8 @@
-
m
+
m
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index 934a6a9f5d..9f6ca3e077 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -142,12 +142,6 @@ define( selectedObject: navigationService.getNavigation() }; - // SlideMenu boolean used to hide and show - // tree menu - $scope.treeSlide = function () { - $scope.treeClass = !$scope.treeClass; - }; - // Listen for changes in navigation state. navigationService.addListener(setNavigation); @@ -158,12 +152,6 @@ define( $scope.$on("$destroy", function () { navigationService.removeListener(setNavigation); }); - - // If the user has selected an object (and is portrait - // on a phone), then hide the tree menu - $scope.$on("select-obj", function () { - $scope.treeSlide(); - }); } return BrowseController; diff --git a/platform/commonUI/browse/src/BrowseTreeController.js b/platform/commonUI/browse/src/BrowseTreeController.js new file mode 100644 index 0000000000..882d563385 --- /dev/null +++ b/platform/commonUI/browse/src/BrowseTreeController.js @@ -0,0 +1,55 @@ +/***************************************************************************** + * 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*/ + +/** + * This bundle implements Browse mode. + * @namespace platform/commonUI/browse + */ +define( + [], + function () { + "use strict"; + + function BrowseTreeController() { + this.state = true; + } + + BrowseTreeController.prototype.toggle = function () { + this.state = !this.state; + }; + + BrowseTreeController.prototype.hide = function () { + this.state = false; + }; + + BrowseTreeController.prototype.show = function () { + this.state = true; + }; + + BrowseTreeController.prototype.visible = function () { + return this.state; + }; + + return BrowseTreeController; + } +);