[Frontend] Manual integration of Inspector

open #90 open #73 In-progress manual integrated Sarah Hale's work on ObjectInspector;
nasa · Oct 23, 2015 · 2452b25 · 2452b25
1 parent 0c4d422
commit 2452b25
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
@@ -71,7 +71,10 @@
                         <mct-splitter class="splitter-inspect mobile-hide"></mct-splitter>
 
                         <div class="split-pane-component t-inspect pane right mobile-hide">
-                            <!--Inspector goes here-->
+                            <mct-representation key="'object-inspector'"
+                                                mct-object="domainObject"
+                                                ng-model="treeModel">
+                            </mct-representation>
                         </div>
                     </mct-split-pane>
                 </div>

diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
@@ -107,6 +107,11 @@
                 "key": "SelectorController",
                 "implementation": "controllers/SelectorController.js",
                 "depends": [ "objectService", "$scope" ]
+            },
+            {
+                "key": "ObjectInspectorController",
+                "implementation": "controllers/ObjectInspectorController.js",
+                "depends": [ "$scope", "objectService" ]
             }
         ],
         "directives": [
@@ -232,6 +237,10 @@
                 "key": "switcher",
                 "templateUrl": "templates/controls/switcher.html",
                 "uses": [ "view" ]
+            },
+            {
+                "key": "object-inspector",
+                "templateUrl": "templates/object-inspector.html"
             }
         ],
         "controls": [

diff --git a/platform/commonUI/general/test/suite.json b/platform/commonUI/general/test/suite.json
@@ -5,6 +5,7 @@
     "controllers/ContextMenuController",
     "controllers/DateTimePickerController",
     "controllers/GetterSetterController",
+    "controllers/ObjectInspectorController",
     "controllers/SelectorController",
     "controllers/SplitPaneController",
     "controllers/TimeRangeController",