Build v2.22.4

angular-ui-tree · Feb 16, 2017 · cbf532b · cbf532b
1 parent ea0ce89
commit cbf532b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-tree",
-  "version": "2.22.2",
+  "version": "2.22.4",
   "homepage": "https://github.com/angular-ui-tree/angular-ui-tree",
   "authors": [
     "Jim Liu <https://github.com/JimLiu>",

diff --git a/dist/angular-ui-tree.css b/dist/angular-ui-tree.css
@@ -37,7 +37,7 @@
 }
 
 .angular-ui-tree-placeholder {
-    margin: 5px 0;
+    margin: 10px;
     padding: 0;
     min-height: 30px;
 }
@@ -59,3 +59,7 @@
     z-index: 999;
     opacity: .8;
 }
+
+.angular-ui-tree-drag .tree-node-content {
+    margin-top: 0;
+}
diff --git a/dist/angular-ui-tree.js b/dist/angular-ui-tree.js
@@ -1,6 +1,6 @@
 /**
- * @license Angular UI Tree v2.22.2
- * (c) 2010-2016. https://github.com/angular-ui-tree/angular-ui-tree
+ * @license Angular UI Tree v2.22.4
+ * (c) 2010-2017. https://github.com/angular-ui-tree/angular-ui-tree
  * License: MIT
  */
 (function () {
@@ -756,6 +756,7 @@
 
               //Check if it or it's parents has a 'data-nodrag' attribute
               el = angular.element(e.target);
+              isUiTreeRoot = el[0].attributes['ui-tree'];
               while (el && el[0] && el[0] !== element && !isUiTreeRoot) {
 
                 //Checking that I can access attributes.
@@ -822,7 +823,7 @@
 
               //Getting starting position of element being moved.
               pos = UiTreeHelper.positionStarted(eventObj, element);
-              placeElm.css('height', UiTreeHelper.height(element) + 'px');
+              placeElm.css('height', element.prop('offsetHeight') + 'px');
 
               //Creating drag element to represent node.
               dragElm = angular.element($window.document.createElement(scope.$parentNodesScope.$element.prop('tagName')))
@@ -1150,6 +1151,7 @@
                       if (targetNode.collapsed) {
                         if (scope.expandOnHover === true || (angular.isNumber(scope.expandOnHover) && scope.expandOnHover === 0)) {
                           targetNode.collapsed = false;
+                          targetNode.$treeScope.$callbacks.toggle(false, targetNode);
                         } else if (scope.expandOnHover !== false && angular.isNumber(scope.expandOnHover) && scope.expandOnHover > 0) {
 
                           //Triggering expansion.
@@ -1161,6 +1163,7 @@
                             {
                               scope.$callbacks.expandTimeoutEnd();
                               targetNode.collapsed = false;
+                              targetNode.$treeScope.$callbacks.toggle(false, targetNode);
                             }, scope.expandOnHover);
                           }
                         }
@@ -1362,6 +1365,7 @@
       }
     ]);
 })();
+
 (function () {
   'use strict';
 

diff --git a/dist/angular-ui-tree.min.css b/dist/angular-ui-tree.min.css
diff --git a/dist/angular-ui-tree.min.js b/dist/angular-ui-tree.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-tree",
-  "version": "2.22.2",
+  "version": "2.22.4",
   "description": "An AngularJS UI component that can sort nested lists, provides drag & drop support and doesn't depend on jQuery",
   "license": "MIT",
   "repository": {

diff --git a/source/main.js b/source/main.js
@@ -1,6 +1,6 @@
 /**
- * @license Angular UI Tree v2.22.2
- * (c) 2010-2016. https://github.com/angular-ui-tree/angular-ui-tree
+ * @license Angular UI Tree v2.22.4
+ * (c) 2010-2017. https://github.com/angular-ui-tree/angular-ui-tree
  * License: MIT
  */
 (function () {