New attribute for empty region #153

angular-ui-tree · Jun 2, 2014 · 0d567c1 · 0d567c1
1 parent de79651
commit 0d567c1
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -144,6 +144,11 @@ If you write your own [$callbacks.accept](#accept) method, you have to check `da
 ##### data-drag-delay
 Number of milliseconds a click must be held to start a drag. (default 0)
 
+##### data-empty-place-holder-enabled
+If a tree is empty, there will be an empty place hoder which is used to drop node from other trees by default.
+- `true` (default): display an empty place holder if the tree is empty
+- `false`: do not display an empty place hoder
+
 ##### Example 
 - turn on/off drag and drop.
 - Limit depth to 5

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-tree",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "homepage": "https://github.com/JimLiu/angular-ui-tree",
   "authors": [
     "Jim Liu <https://github.com/JimLiu>",

diff --git a/demo/dist/angular-ui-tree.js b/demo/dist/angular-ui-tree.js
@@ -1,5 +1,5 @@
 /**
- * @license Angular UI Tree v2.1.3
+ * @license Angular UI Tree v2.1.4
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */
@@ -303,6 +303,7 @@
         $scope.$callbacks = null;
 
         $scope.dragEnabled = true;
+        $scope.emptyPlaceHolderEnabled = true;
         $scope.maxDepth = 0;
         $scope.dragDelay = 0;
 
@@ -319,7 +320,8 @@
         };
 
         $scope.resetEmptyElement = function() {
-          if ($scope.$nodesScope.$modelValue.length === 0) {
+          if ($scope.$nodesScope.$modelValue.length === 0 &&
+            $scope.emptyPlaceHolderEnabled) {
             $element.append($scope.$emptyElm);
           } else {
             $scope.$emptyElm.remove();
@@ -639,6 +641,13 @@
             }
           });
 
+          attrs.$observe('emptyPlaceHolderEnabled', function(val) {
+            var ep = scope.$eval(val);
+            if((typeof ep) == "boolean") {
+              scope.emptyPlaceHolderEnabled = ep;
+            }
+          });
+
           attrs.$observe('maxDepth', function(val) {
             var md = scope.$eval(val);
             if((typeof md) == "number") {

diff --git a/demo/dist/angular-ui-tree.min.js b/demo/dist/angular-ui-tree.min.js
diff --git a/dist/angular-ui-tree.js b/dist/angular-ui-tree.js
@@ -1,5 +1,5 @@
 /**
- * @license Angular UI Tree v2.1.3
+ * @license Angular UI Tree v2.1.4
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */
@@ -303,6 +303,7 @@
         $scope.$callbacks = null;
 
         $scope.dragEnabled = true;
+        $scope.emptyPlaceHolderEnabled = true;
         $scope.maxDepth = 0;
         $scope.dragDelay = 0;
 
@@ -319,7 +320,8 @@
         };
 
         $scope.resetEmptyElement = function() {
-          if ($scope.$nodesScope.$modelValue.length === 0) {
+          if ($scope.$nodesScope.$modelValue.length === 0 &&
+            $scope.emptyPlaceHolderEnabled) {
             $element.append($scope.$emptyElm);
           } else {
             $scope.$emptyElm.remove();
@@ -639,6 +641,13 @@
             }
           });
 
+          attrs.$observe('emptyPlaceHolderEnabled', function(val) {
+            var ep = scope.$eval(val);
+            if((typeof ep) == "boolean") {
+              scope.emptyPlaceHolderEnabled = ep;
+            }
+          });
+
           attrs.$observe('maxDepth', function(val) {
             var md = scope.$eval(val);
             if((typeof md) == "number") {

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-NestedSortable",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "dependencies": {
     "grunt": "~0.4.2",
     "grunt-contrib-jshint": "~0.8.0",

diff --git a/source/controllers/treeCtrl.js b/source/controllers/treeCtrl.js
@@ -14,6 +14,7 @@
         $scope.$callbacks = null;
 
         $scope.dragEnabled = true;
+        $scope.emptyPlaceHolderEnabled = true;
         $scope.maxDepth = 0;
         $scope.dragDelay = 0;
 
@@ -30,7 +31,8 @@
         };
 
         $scope.resetEmptyElement = function() {
-          if ($scope.$nodesScope.$modelValue.length === 0) {
+          if ($scope.$nodesScope.$modelValue.length === 0 &&
+            $scope.emptyPlaceHolderEnabled) {
             $element.append($scope.$emptyElm);
           } else {
             $scope.$emptyElm.remove();

diff --git a/source/directives/uiTree.js b/source/directives/uiTree.js
@@ -37,6 +37,13 @@
             }
           });
 
+          attrs.$observe('emptyPlaceHolderEnabled', function(val) {
+            var ep = scope.$eval(val);
+            if((typeof ep) == "boolean") {
+              scope.emptyPlaceHolderEnabled = ep;
+            }
+          });
+
           attrs.$observe('maxDepth', function(val) {
             var md = scope.$eval(val);
             if((typeof md) == "number") {

diff --git a/source/main.js b/source/main.js
@@ -1,5 +1,5 @@
 /**
- * @license Angular UI Tree v2.1.3
+ * @license Angular UI Tree v2.1.4
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */