From 2452b25fd47288f8fed6ff9fd5987d9e9b1b5dd6 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo <charlesh88@gmail.com> Date: Fri, 23 Oct 2015 11:37:02 -0700 Subject: [PATCH] [Frontend] Manual integration of Inspector open #90 open #73 In-progress manual integrated Sarah Hale's work on ObjectInspector; --- platform/commonUI/browse/res/templates/browse.html | 5 ++++- platform/commonUI/general/bundle.json | 9 +++++++++ platform/commonUI/general/test/suite.json | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index d59ac222c0..79644b5bb5 100644 --- 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 index 1aa0b1dfc1..a927ee8a51 100644 --- 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 index 0d19fbb9e4..08e9c28e61 100644 --- 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",