From bf05e55d020984d51571c8140c6a6dc81ee8fab1 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 18 Sep 2015 12:25:51 -0700
Subject: [PATCH] [Mobile] Use mct-device in tree nodes

---
 .../commonUI/general/res/templates/tree-node.html | 15 ++++++++++++---
 platform/commonUI/mobile/src/MCTDevice.js         |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html
index 518f7980f5..a6d3560ee0 100644
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -26,7 +26,8 @@
             ng-class="{selected: treeNode.isSelected()}"
             >
             <span
-                class='ui-symbol view-control mobile-hide'
+                mct-device="desktop"
+                class='ui-symbol view-control'
                 ng-click="toggle.toggle(); treeNode.trackExpansion()"
                 ng-if="model.composition !== undefined"
                 >
@@ -34,6 +35,7 @@
             </span>
 
             <mct-representation
+                mct-device="desktop"
                 class="mobile-hide"
                 key="'label'"
                 mct-object="domainObject"
@@ -41,15 +43,22 @@
                 >
             </mct-representation>
             <mct-representation
+                mct-device="mobile"
                 class="desktop-hide"
                 key="'label'"
                 mct-object="domainObject"
-                ng-click="toggle.toggle(); treeNode.trackExpansion()"
+                ng-click="ngModel.selectedObject =
+                              model.composition === undefined ?
+                                  domainObject : ngModel.selectedObject;
+                          toggle.toggle();
+                          treeNode.trackExpansion();
+                          "
                 >
             </mct-representation>
 
             <span
-                class='ui-symbol view-control desktop-hide'
+                mct-device="mobile"
+                class='ui-symbol view-control'
                 ng-model="ngModel"
                 ng-click="ngModel.selectedObject = domainObject"
                 >
diff --git a/platform/commonUI/mobile/src/MCTDevice.js b/platform/commonUI/mobile/src/MCTDevice.js
index 87f16d721f..7928d34112 100644
--- a/platform/commonUI/mobile/src/MCTDevice.js
+++ b/platform/commonUI/mobile/src/MCTDevice.js
@@ -94,6 +94,10 @@ define(
                 link: link,
                 // We are transcluding the whole element (like ng-if)
                 transclude: 'element',
+                // 1 more than ng-if
+                priority: 601,
+                // Also terminal, since element will be transcluded
+                terminal: true,
                 // Only apply as an attribute
                 restrict: "A"
             };