ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 08:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Inspector] Merge paneModel and treeModel

Browse Source 
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.
This commit is contained in:
slhale 2015-08-27 10:49:57 -07:00
parent a957f87f61
commit 815b8e040e
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/commonUI/browse/res/templates/browse.html
View File

@ -32,11 +32,11 @@
<mct-split-pane class='contents abs' <mct-split-pane class='contents abs'
anchor='left'> anchor='left'>
<div class='split-pane-component treeview pane 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-representation key="'create-button'"
mct-object="navigatedObject" mct-object="navigatedObject"
ng-model="paneModel"> ng-model="treeModel">
</mct-representation> </mct-representation>
<div class='holder search-holder abs' <div class='holder search-holder abs'
@ -57,31 +57,31 @@
</div> </div>
<mct-splitter class="splitter-bar left" <mct-splitter class="splitter-bar left"
ng-class="{inactive: !paneModel.leftPane}"> ng-class="{inactive: !treeModel.leftPane}">
</mct-splitter> </mct-splitter>
<div class='split-pane-component secondary-split pane right slide' <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' <mct-split-pane class='contents abs'
anchor='right'> anchor='right'>
<div class='split-pane-component items pane slide' <div class='split-pane-component items pane slide'
ng-class='{rightInactive: !paneModel.rightPane}'> ng-class='{rightInactive: !treeModel.rightPane}'>
<div class='holder abs' <div class='holder abs'
id='content-area'> id='content-area'>
<mct-representation key="'browse-object'" <mct-representation key="'browse-object'"
mct-object="navigatedObject" mct-object="navigatedObject"
ng-model="paneModel"> ng-model="treeModel">
</mct-representation> </mct-representation>
</div> </div>
</div> </div>
<mct-splitter class="splitter-bar right" <mct-splitter class="splitter-bar right"
ng-class="{inactive: !paneModel.rightPane}"> ng-class="{inactive: !treeModel.rightPane}">
</mct-splitter> </mct-splitter>
<div class='split-pane-component object-inspector pane right' <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'> <div class='holder inspector-holder abs'>
<mct-representation key="'object-inspector'" <mct-representation key="'object-inspector'"
mct-object="domainObject" mct-object="domainObject"

6
platform/commonUI/browse/src/BrowseController.js
View File

@ -139,15 +139,11 @@ define(
}); });
// Provide a model for the tree to modify // Provide a model for the tree to modify
// Also use this model for the left and right pane controlling
$scope.treeModel = { $scope.treeModel = {
selectedObject: navigationService.getNavigation() selectedObject: navigationService.getNavigation()
}; };
// Provide a model for the left pane
$scope.paneModel = {
selectedObject: navigationService.getNavigation()
};
// Listen for changes in navigation state. // Listen for changes in navigation state.
navigationService.addListener(setNavigation); navigationService.addListener(setNavigation);