From 815b8e040eaeb11a8a21ff2e617ce0d60160e12d Mon Sep 17 00:00:00 2001
From: slhale <sarah.hale@nasa.gov>
Date: Thu, 27 Aug 2015 10:49:57 -0700
Subject: [PATCH] [Inspector] Merge paneModel and treeModel

Use the treeModel for what the paneModel was
previously being used for. None of the
property names conflict. This allows the
right pane to access the treeModel info.
---
 .../commonUI/browse/res/templates/browse.html    | 16 ++++++++--------
 platform/commonUI/browse/src/BrowseController.js |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index b85fbb76c4..d3bb46c70a 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -32,11 +32,11 @@
         <mct-split-pane class='contents abs'
                         anchor='left'>
             <div class='split-pane-component treeview pane left'
-                 ng-class='{inactive: !paneModel.leftPane}'>
+                 ng-class='{inactive: !treeModel.leftPane}'>
                 
                 <mct-representation key="'create-button'"
                                     mct-object="navigatedObject"
-                                    ng-model="paneModel">
+                                    ng-model="treeModel">
                 </mct-representation>
                 
                 <div class='holder search-holder abs'
@@ -57,31 +57,31 @@
             </div>
             
             <mct-splitter class="splitter-bar left"
-                          ng-class="{inactive: !paneModel.leftPane}">
+                          ng-class="{inactive: !treeModel.leftPane}">
             </mct-splitter>
             
             <div class='split-pane-component secondary-split pane right slide'
-                 ng-class='{leftInactive: !paneModel.leftPane}'>
+                 ng-class='{leftInactive: !treeModel.leftPane}'>
                 <mct-split-pane class='contents abs'
                                 anchor='right'>
                     
                     <div class='split-pane-component items pane slide'
-                         ng-class='{rightInactive: !paneModel.rightPane}'>
+                         ng-class='{rightInactive: !treeModel.rightPane}'>
                         <div class='holder abs'
                              id='content-area'>
                             <mct-representation key="'browse-object'"
                                                 mct-object="navigatedObject"
-                                                ng-model="paneModel">
+                                                ng-model="treeModel">
                             </mct-representation>
                         </div>
                     </div>
                     
                     <mct-splitter class="splitter-bar right"
-                                  ng-class="{inactive: !paneModel.rightPane}">
+                                  ng-class="{inactive: !treeModel.rightPane}">
                     </mct-splitter>
                     
                     <div class='split-pane-component object-inspector pane right'
-                         ng-class='{inactive: !paneModel.rightPane}'>
+                         ng-class='{inactive: !treeModel.rightPane}'>
                         <div class='holder inspector-holder abs'>
                             <mct-representation key="'object-inspector'"
                                                 mct-object="domainObject"
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index d30b3e3b7a..eec5033442 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -139,15 +139,11 @@ define(
             });
 
             // Provide a model for the tree to modify
+            // Also use this model for the left and right pane controlling
             $scope.treeModel = {
                 selectedObject: navigationService.getNavigation()
             };
             
-            // Provide a model for the left pane
-            $scope.paneModel = {
-                selectedObject: navigationService.getNavigation()
-            };
-            
             // Listen for changes in navigation state.
             navigationService.addListener(setNavigation);