[Addressability] Obey view query string param

Obey the query string parameter for a view, if present.
WTD-1149.
This commit is contained in:
Victor Woeltjen 2015-06-16 14:58:03 -07:00
parent 26fd56a003
commit fec6f06849
4 changed files with 71 additions and 9 deletions

View File

@ -16,6 +16,11 @@
"implementation": "BrowseController.js", "implementation": "BrowseController.js",
"depends": [ "$scope", "$route", "$location", "objectService", "navigationService" ] "depends": [ "$scope", "$route", "$location", "objectService", "navigationService" ]
}, },
{
"key": "BrowseObjectController",
"implementation": "BrowseObjectController.js",
"depends": [ "$scope", "$location" ]
},
{ {
"key": "CreateMenuController", "key": "CreateMenuController",
"implementation": "creation/CreateMenuController", "implementation": "creation/CreateMenuController",

View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<span> <span ng-controller="BrowseObjectController">
<div class="object-browse-bar bar abs"> <div class="object-browse-bar bar abs">
<div class="items-select left abs"> <div class="items-select left abs">
<mct-representation key="'object-header'" mct-object="domainObject"> <mct-representation key="'object-header'" mct-object="domainObject">

View File

@ -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*/
define(
[],
function () {
"use strict";
/**
* Controller for the `browse-object` representation of a domain
* object (the right-hand side of Browse mode.)
* @constructor
*/
function BrowseObjectController($scope, $location) {
function setViewForDomainObject(domainObject) {
var locationViewKey = $location.search().view;
function selectViewIfMatching(view) {
if (view.key === locationViewKey) {
$scope.representation.selected = view;
}
}
if (locationViewKey) {
((domainObject && domainObject.useCapability('view')) || [])
.forEach(selectViewIfMatching);
}
}
$scope.$watch('domainObject', setViewForDomainObject);
}
return BrowseObjectController;
}
);

View File

@ -53,13 +53,15 @@ define(
// Get list of views, read from capability // Get list of views, read from capability
function updateOptions(views) { function updateOptions(views) {
if (Array.isArray(views)) {
$timeout(function () { $timeout(function () {
$scope.ngModel.selected = findMatchingOption( $scope.ngModel.selected = findMatchingOption(
views || [], views,
($scope.ngModel || {}).selected ($scope.ngModel || {}).selected
); );
}, 0); }, 0);
} }
}
// Update view options when the in-scope results of using the // Update view options when the in-scope results of using the
// view capability change. // view capability change.