From e1c0e70d0773462ddc5f6f967a35b96e67477fda Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Tue, 1 Oct 2013 15:36:42 +0200
Subject: [PATCH] Fixes: U4-3001 missing root node in tree selectors

---
 .../src/common/directives/umbtree.directive.js     | 14 ++++++++++++--
 .../src/common/directives/umbtreeitem.directive.js |  2 --
 src/Umbraco.Web.UI.Client/src/less/tree.less       | 10 ++++++++--
 .../src/views/common/dialogs/contentpicker.html    |  2 +-
 .../src/views/common/dialogs/treepicker.html       |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
index ed5031016e..389954ea71 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
@@ -29,7 +29,7 @@ angular.module("umbraco.directives")
 
          if(!hideheader){ 
            template +='<div>' + 
-           '<h5><a href="#{{section}}" class="root-link">{{tree.name}}</a></h5>' +
+           '<h5><a href="#{{section}}" ng-click="select(this, tree.root, $event)"  class="root-link">{{tree.name}}</a></h5>' +
                '<a href class="umb-options" ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-click="options(this, tree.root, $event)" ng-swipe-right="options(this, tree.root, $event)"><i></i><i></i><i></i></a>' +
            '</div>';
          }
@@ -56,7 +56,6 @@ angular.module("umbraco.directives")
 
             /** Helper function to emit tree events */
             function emitEvent(eventName, args) {
-
               if (scope.eventhandler) {
                 $(scope.eventhandler).trigger(eventName, args);
               }
@@ -109,6 +108,17 @@ angular.module("umbraco.directives")
                 emitEvent("treeOptionsClick", { element: e, node: n, event: ev });
             };
             
+            /**
+              Method called when an item is clicked in the tree, this passes the 
+              DOM element, the tree node object and the original click
+              and emits it as a treeNodeSelect element if there is a callback object
+              defined on the tree
+            */
+            scope.select = function(e,n,ev){
+                emitEvent("treeNodeSelect", { element: e, node: n, event: ev });
+            };
+            
+
             //watch for section changes
             scope.$watch("section", function (newVal, oldVal) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index fb9ee99cbd..9a4add773d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -47,11 +47,9 @@ angular.module("umbraco.directives")
 
         /** Helper function to emit tree events */
         function emitEvent(eventName, args) {
-
           if(scope.eventhandler){
             $(scope.eventhandler).trigger(eventName,args);
           }
-          //$rootScope.$broadcast(eventName, args);
         }
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index 750960407b..40cee95c94 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -44,9 +44,15 @@
 	background: #2e8aea;
 	border-color: #2e8aea;
 }
-.umb-tree li.root div {
-	padding-left: 20px
+.umb-tree li.root > div {
+	padding-left: 20px;
 }
+
+
+.umb-tree li.root > div h5 {
+	margin-top: 10px;
+}
+
 .umb-tree * {
 	white-space: nowrap
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
index ebe9151b4f..508767eba4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
@@ -5,7 +5,7 @@
 				<umb-tree 
 					section="content" 
 					cachekey="contentpickerDialog" 
-					showheader="false" 
+					showheader="true" 
 					showoptions="false"
 					eventhandler="dialogTreeEventHandler">
 				</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
index 01120accf8..77fe01587a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
@@ -5,7 +5,7 @@
 				<umb-tree 
 					section="{{section}}" 
 					cachekey="treepickerDialog" 
-					showheader="false" 
+					showheader="true" 
 					showoptions="false"
 					eventhandler="dialogTreeEventHandler">
 				</umb-tree>