ca6f44f7b6
The URL malformation was caused by the same function returning the view and index path for both the newtab window and the browse controller window. As a result, the BrowseController now only uses a path that excludes the view and index paths, like before the UrlService was added. Another, separate function uses this url for the location and includes the view and index paths for new tabs, in order to maintain the current view. WTD 23.
67 lines
2.7 KiB
JavaScript
67 lines
2.7 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.
|
|
*****************************************************************************/
|
|
/*global define,Promise*/
|
|
|
|
/**
|
|
* Module defining NewTabAction (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
|
|
*/
|
|
define(
|
|
[],
|
|
function () {
|
|
"use strict";
|
|
var ROOT_ID = "ROOT",
|
|
DEFAULT_PATH = "/mine";
|
|
/**
|
|
* The new tab action allows a domain object to be opened
|
|
* into a new browser tab.
|
|
* @constructor
|
|
*/
|
|
function NewTabAction(urlService, $window, context) {
|
|
// Returns the selected domain object
|
|
// when using the context menu or the top right button
|
|
// based on the context and the existance of the object
|
|
// It is set to object an returned
|
|
function getSelectedObject() {
|
|
var object;
|
|
if (context.selectedObject) {
|
|
object = context.selectedObject;
|
|
} else {
|
|
object = context.domainObject;
|
|
}
|
|
return object;
|
|
}
|
|
|
|
return {
|
|
// Performs the open in new tab function
|
|
// By calling the url service, the mode needed
|
|
// (browse) and the domainObject is passed in and
|
|
// the path is returned and opened in a new tab
|
|
perform: function () {
|
|
$window.open(urlService.urlForNewTab("browse", getSelectedObject()),
|
|
"_blank");
|
|
}
|
|
};
|
|
}
|
|
|
|
return NewTabAction;
|
|
}
|
|
); |