ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 07:38:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Tree] Display tree correctly

Browse Source
This commit is contained in:
Victor Woeltjen
2016-03-11 14:40:04 -08:00
parent dc2b3e85cc
commit 7ee8d0a3f7
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/general/src/ui/ToggleView.js
View File

@ -22,13 +22,13 @@
/*global define*/ /*global define*/
define([ define([
'angular', 'zepto',
'text!../../res/templates/tree/toggle.html' 'text!../../res/templates/tree/toggle.html'
], function (angular, toggleTemplate) { ], function ($, toggleTemplate) {
function ToggleView(state) { function ToggleView(state) {
this.expanded = !!state; this.expanded = !!state;
this.callbacks = []; this.callbacks = [];
this.el = angular.element(toggleTemplate); this.el = $(toggleTemplate);
this.el.on('click', function () { this.el.on('click', function () {
this.model(!this.expanded); this.model(!this.expanded);
}.bind(this)); }.bind(this));

12
platform/commonUI/general/src/ui/TreeNodeView.js
View File

@ -22,15 +22,13 @@
/*global define*/ /*global define*/
define([ define([
'angular', 'zepto',
'text!../../res/templates/tree/node.html', 'text!../../res/templates/tree/node.html',
'./ToggleView', './ToggleView',
'./TreeLabelView' './TreeLabelView'
], function (angular, nodeTemplate, ToggleView, TreeLabelView) { ], function ($, nodeTemplate, ToggleView, TreeLabelView) {
'use strict'; 'use strict';
var $ = angular.element.bind(angular);
function TreeNodeView(subtreeFactory) { function TreeNodeView(subtreeFactory) {
this.li = $('<li>'); this.li = $('<li>');
@ -40,6 +38,8 @@ define([
if (!this.subtreeView) { if (!this.subtreeView) {
this.subtreeView = subtreeFactory(); this.subtreeView = subtreeFactory();
this.subtreeView.model(this.activeObject); this.subtreeView.model(this.activeObject);
this.li.find('.tree-item-subtree').eq(0)
.append($(this.subtreeView.elements()));
} }
$(this.subtreeView.elements()).removeClass('hidden'); $(this.subtreeView.elements()).removeClass('hidden');
} else if (this.subtreeView) { } else if (this.subtreeView) {
@ -51,8 +51,8 @@ define([
this.li.append($(nodeTemplate)); this.li.append($(nodeTemplate));
this.li.find('span').eq(0) this.li.find('span').eq(0)
.append(this.toggleView.elements()) .append($(this.toggleView.elements()))
.append(this.labelView.elements()); .append($(this.labelView.elements()));
this.model(undefined); this.model(undefined);
} }

6
platform/commonUI/general/src/ui/TreeView.js
View File

@ -22,13 +22,11 @@
/*global define*/ /*global define*/
define([ define([
'angular', 'zepto',
'./TreeNodeView' './TreeNodeView'
], function (angular, TreeNodeView) { ], function ($, TreeNodeView) {
'use strict'; 'use strict';
var $ = angular.element.bind(angular);
function TreeView() { function TreeView() {
this.ul = $('<ul class="tree"></ul>'); this.ul = $('<ul class="tree"></ul>');
this.nodeViews = []; this.nodeViews = [];