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

Merge remote-tracking branch 'origin/master' into frontend-1047

Browse Source
This commit is contained in:
Charles Hacskaylo
2016-07-21 08:53:23 -07:00
parent 9d9cabb760 14f1a1f740
commit 883f999215
21 changed files with 636 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
define([
"./src/BrowseController",
"./src/PaneController",
"./src/InspectorPaneController",
"./src/BrowseObjectController",
"./src/MenuArrowController",
"./src/navigation/NavigationService",
@ -44,6 +45,7 @@ define([
], function (
BrowseController,
PaneController,
InspectorPaneController,
BrowseObjectController,
MenuArrowController,
NavigationService,
@ -124,6 +126,17 @@ define([
"depends": [
"$scope"
]
},
{
"key": "InspectorPaneController",
"implementation": InspectorPaneController,
"priority": "preferred",
"depends": [
"$scope",
"agentService",
"$window",
"navigationService"
]
}
],
"representations": [