From 7ee8d0a3f738aedf189ee64b507614981088cc7e Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 11 Mar 2016 14:40:04 -0800
Subject: [PATCH] [Tree] Display tree correctly

---
 platform/commonUI/general/src/ui/ToggleView.js   |  6 +++---
 platform/commonUI/general/src/ui/TreeNodeView.js | 12 ++++++------
 platform/commonUI/general/src/ui/TreeView.js     |  6 ++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/platform/commonUI/general/src/ui/ToggleView.js b/platform/commonUI/general/src/ui/ToggleView.js
index 030ac5b416..4c8fed722d 100644
--- a/platform/commonUI/general/src/ui/ToggleView.js
+++ b/platform/commonUI/general/src/ui/ToggleView.js
@@ -22,13 +22,13 @@
 /*global define*/
 
 define([
-    'angular',
+    'zepto',
     'text!../../res/templates/tree/toggle.html'
-], function (angular, toggleTemplate) {
+], function ($, toggleTemplate) {
     function ToggleView(state) {
         this.expanded = !!state;
         this.callbacks = [];
-        this.el = angular.element(toggleTemplate);
+        this.el = $(toggleTemplate);
         this.el.on('click', function () {
             this.model(!this.expanded);
         }.bind(this));
diff --git a/platform/commonUI/general/src/ui/TreeNodeView.js b/platform/commonUI/general/src/ui/TreeNodeView.js
index ede9bf2a90..3b54422668 100644
--- a/platform/commonUI/general/src/ui/TreeNodeView.js
+++ b/platform/commonUI/general/src/ui/TreeNodeView.js
@@ -22,15 +22,13 @@
 /*global define*/
 
 define([
-    'angular',
+    'zepto',
     'text!../../res/templates/tree/node.html',
     './ToggleView',
     './TreeLabelView'
-], function (angular, nodeTemplate, ToggleView, TreeLabelView) {
+], function ($, nodeTemplate, ToggleView, TreeLabelView) {
     'use strict';
 
-    var $ = angular.element.bind(angular);
-
     function TreeNodeView(subtreeFactory) {
         this.li = $('<li>');
 
@@ -40,6 +38,8 @@ define([
                 if (!this.subtreeView) {
                     this.subtreeView = subtreeFactory();
                     this.subtreeView.model(this.activeObject);
+                    this.li.find('.tree-item-subtree').eq(0)
+                        .append($(this.subtreeView.elements()));
                 }
                 $(this.subtreeView.elements()).removeClass('hidden');
             } else if (this.subtreeView) {
@@ -51,8 +51,8 @@ define([
 
         this.li.append($(nodeTemplate));
         this.li.find('span').eq(0)
-            .append(this.toggleView.elements())
-            .append(this.labelView.elements());
+            .append($(this.toggleView.elements()))
+            .append($(this.labelView.elements()));
 
         this.model(undefined);
     }
diff --git a/platform/commonUI/general/src/ui/TreeView.js b/platform/commonUI/general/src/ui/TreeView.js
index 4e73c45071..5777321a88 100644
--- a/platform/commonUI/general/src/ui/TreeView.js
+++ b/platform/commonUI/general/src/ui/TreeView.js
@@ -22,13 +22,11 @@
 /*global define*/
 
 define([
-    'angular',
+    'zepto',
     './TreeNodeView'
-], function (angular, TreeNodeView) {
+], function ($, TreeNodeView) {
     'use strict';
 
-    var $ = angular.element.bind(angular);
-
     function TreeView() {
         this.ul = $('<ul class="tree"></ul>');
         this.nodeViews = [];