From 2f036a89e45d7790200f72b4edbc4d9a650f338d Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Fri, 26 Feb 2016 16:29:01 -0800
Subject: [PATCH] Refactoring out regions

---
 platform/commonUI/browse/bundle.js            |  2 +-
 .../commonUI/browse/res/templates/browse.html |  6 +-
 .../edit/res/templates/inspector-edit.html    | 80 -------------------
 .../res/templates/inspector-browse.html       | 64 ---------------
 4 files changed, 4 insertions(+), 148 deletions(-)
 delete mode 100644 platform/commonUI/edit/res/templates/inspector-edit.html
 delete mode 100644 platform/commonUI/general/res/templates/inspector-browse.html

diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js
index 4715440b76..1fcd810b96 100644
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -171,7 +171,7 @@ define([
             ],
             "representations": [
                 {
-                    "key": "view-region",
+                    "key": "view-object",
                     "templateUrl": "templates/view-object.html"
                 },
                 {
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 5b74709b2e..08a5cd4d5e 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -63,7 +63,7 @@
                     <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
                         <div class='split-pane-component t-object pane primary-pane left'>
                             <mct-representation mct-object="navigatedObject"
-                                                key="'view-region'"
+                                                key="'view-object'"
                                                 class="abs holder holder-object">
                             </mct-representation>
                         </div>
@@ -71,8 +71,8 @@
                         <mct-splitter class="splitter-inspect mobile-hide flush-right edge-shdw"></mct-splitter>
 
                         <div class="split-pane-component t-inspect pane right mobile-hide">
-                            <mct-representation key="'inspector-region'"
-                                                mct-object="navigatedObject"
+                            <mct-representation key="'object-inspector'"
+                                                mct-object="domainObject"
                                                 ng-model="treeModel">
                             </mct-representation>
                             <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect"
diff --git a/platform/commonUI/edit/res/templates/inspector-edit.html b/platform/commonUI/edit/res/templates/inspector-edit.html
deleted file mode 100644
index 5f3e4d522e..0000000000
--- a/platform/commonUI/edit/res/templates/inspector-edit.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
- 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.
--->
-<span class="l-inspect" ng-controller="ObjectInspectorController as controller">
-    <div ng-controller="PaneController as modelPaneEdit">
-        <mct-split-pane class='abs contents split-layout' anchor='bottom'>
-            <div class="split-pane-component pane top">
-                <div class="abs holder holder-inspector l-flex-col">
-                    <div class="pane-header flex-elem">Inspection</div>
-                    <ul class="flex-elem grows vscroll">
-                        <li>
-                            <em>Properties</em>
-                            <div class="inspector-properties"
-                                 ng-repeat="data in metadata"
-                                 ng-class="{ first:$index === 0 }">
-                                <div class="label">{{ data.name }}</div>
-                                <div class="value">{{ data.value }}</div>
-                            </div>
-                        </li>
-                        <li ng-if="contextutalParents.length > 0">
-                            <em title="The location of this linked object.">Location</em>
-                            <span class="inspector-location"
-                                  ng-repeat="parent in contextutalParents"
-                                  ng-class="{ last:($index + 1) === contextualParents.length }">
-                                <mct-representation key="'label'"
-                                                    mct-object="parent"
-                                                    ng-model="ngModel"
-                                                    ng-click="ngModel.selectedObject = parent"
-                                                    class="location-item">
-                                </mct-representation>
-                            </span>
-                        </li>
-                        <li ng-if="primaryParents.length > 0">
-                            <em title="The location of the original object that this was linked from.">Original Location</em>
-                            <span class="inspector-location"
-                                  ng-repeat="parent in primaryParents"
-                                  ng-class="{ last:($index + 1) === primaryParents.length }">
-                                <mct-representation key="'label'"
-                                                    mct-object="parent"
-                                                    ng-model="ngModel"
-                                                    ng-click="ngModel.selectedObject = parent"
-                                                    class="location-item">
-                                </mct-representation>
-                            </span>
-                        </li>
-                    </ul>
-                </div><!--/ holder-inspector -->
-            </div><!--/ split-pane-component -->
-            <mct-splitter class="splitter-inspect-panel mobile-hide"></mct-splitter>
-            <div class="split-pane-component pane bottom">
-                <div class="abs holder holder-elements l-flex-col">
-                    <em class="flex-elem">Elements</em>
-                    <mct-representation
-                            key="'edit-elements'"
-                            mct-object="domainObject"
-                            class="flex-elem holder grows vscroll current-elements">
-                    </mct-representation>
-                </div>
-            </div>
-        </mct-split-pane>
-    </div><!--/ PaneController -->
-</span>
diff --git a/platform/commonUI/general/res/templates/inspector-browse.html b/platform/commonUI/general/res/templates/inspector-browse.html
deleted file mode 100644
index 3a7a60f516..0000000000
--- a/platform/commonUI/general/res/templates/inspector-browse.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- 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.
--->
-<span class="l-inspect" ng-controller="ObjectInspectorController as controller">
-    <div class="abs holder holder-inspector l-flex-col">
-        <div class="pane-header flex-elem">Inspection</div>
-        <ul class="flex-elem grows vscroll">
-            <li>
-                <em>Properties</em>
-                <div class="inspector-properties"
-                     ng-repeat="data in metadata"
-                     ng-class="{ first:$index === 0 }">
-                    <div class="label">{{ data.name }}</div>
-                    <div class="value">{{ data.value }}</div>
-                </div>
-            </li>
-            <li ng-if="contextutalParents.length > 0">
-                <em title="The location of this linked object.">Location</em>
-                <span class="inspector-location"
-                      ng-repeat="parent in contextutalParents"
-                      ng-class="{ last:($index + 1) === contextualParents.length }">
-                    <mct-representation key="'label'"
-                                        mct-object="parent"
-                                        ng-model="ngModel"
-                                        ng-click="ngModel.selectedObject = parent"
-                                        class="location-item">
-                    </mct-representation>
-                </span>
-            </li>
-            <li ng-if="primaryParents.length > 0">
-                <em title="The location of the original object that this was linked from.">Original Location</em>
-                <span class="inspector-location"
-                      ng-repeat="parent in primaryParents"
-                      ng-class="{ last:($index + 1) === primaryParents.length }">
-                    <mct-representation key="'label'"
-                                        mct-object="parent"
-                                        ng-model="ngModel"
-                                        ng-click="ngModel.selectedObject = parent"
-                                        class="location-item">
-                    </mct-representation>
-                </span>
-            </li>
-        </ul>
-    </div><!--/ holder-inspector -->
-    </div><!--/ PaneController -->
-</span>