ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 23:28:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[API] Merge in latest from master

Browse Source
This commit is contained in:
Victor Woeltjen
2016-09-29 10:47:52 -07:00
parent 7ce9bd969a 7439d949c4
commit ed8d331cd3
1110 changed files with 11447 additions and 10210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
platform/commonUI/browse/bundle.js
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* Open MCT, Copyright (c) 2014-2016, 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
* Open MCT 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.
@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* Open MCT 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.
@ -23,10 +23,12 @@
define([
"./src/BrowseController",
"./src/PaneController",
"./src/InspectorPaneController",
"./src/BrowseObjectController",
"./src/MenuArrowController",
"./src/navigation/NavigationService",
"./src/navigation/NavigateAction",
"./src/navigation/OrphanNavigationHandler",
"./src/windowing/NewTabAction",
"./src/windowing/FullscreenAction",
"./src/windowing/WindowTitler",
@ -44,10 +46,12 @@ define([
], function (
BrowseController,
PaneController,
InspectorPaneController,
BrowseObjectController,
MenuArrowController,
NavigationService,
NavigateAction,
OrphanNavigationHandler,
NewTabAction,
FullscreenAction,
WindowTitler,
@ -93,11 +97,9 @@ define([
"$scope",
"$route",
"$location",
"$window",
"objectService",
"navigationService",
"urlService",
"policyService",
"DEFAULT_PATH"
]
},
@ -126,6 +128,17 @@ define([
"depends": [
"$scope"
]
},
{
"key": "InspectorPaneController",
"implementation": InspectorPaneController,
"priority": "preferred",
"depends": [
"$scope",
"agentService",
"$window",
"navigationService"
]
}
],
"representations": [
@ -201,7 +214,9 @@ define([
"implementation": NavigateAction,
"depends": [
"navigationService",
"$q"
"$q",
"policyService",
"$window"
]
},
{
@ -218,7 +233,7 @@ define([
"$window"
],
"group": "windowing",
"glyph": "y",
"cssclass": "icon-new-window",
"priority": "preferred"
},
{
@ -226,7 +241,6 @@ define([
"implementation": FullscreenAction,
"category": "view-control",
"group": "windowing",
"glyph": "z",
"priority": "default"
}
],
@ -234,7 +248,7 @@ define([
{
"key": "items",
"name": "Items",
"glyph": "9",
"cssclass": "icon-thumbs-strip",
"description": "Grid of available items",
"template": itemsTemplate,
"uses": [
@ -255,6 +269,14 @@ define([
"$rootScope",
"$document"
]
},
{
"implementation": OrphanNavigationHandler,
"depends": [
"throttle",
"topic",
"navigationService"
]
}
],
"licenses": [