Fixed #121

angular-ui-tree · May 5, 2014 · 62bd804 · 62bd804
1 parent 1fb2f63
commit 62bd804
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-tree",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "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
@@ -831,6 +831,12 @@
                 return;
               }
 
+              var eventElmTagName = eventElm.prop('tagName').toLowerCase();
+              if (eventElmTagName == 'input' ||
+                eventElmTagName == 'button') { // if it's a input or button, ignore it
+                return;
+              }
+
               // check if it or it's parents has a 'data-nodrag' attribute
               while (eventElm && eventElm[0] && eventElm[0] != element) {
                 if ($uiTreeHelper.nodrag(eventElm)) { // if the node mark as `nodrag`, DONOT drag it.

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
@@ -831,6 +831,12 @@
                 return;
               }
 
+              var eventElmTagName = eventElm.prop('tagName').toLowerCase();
+              if (eventElmTagName == 'input' ||
+                eventElmTagName == 'button') { // if it's a input or button, ignore it
+                return;
+              }
+
               // check if it or it's parents has a 'data-nodrag' attribute
               while (eventElm && eventElm[0] && eventElm[0] != element) {
                 if ($uiTreeHelper.nodrag(eventElm)) { // if the node mark as `nodrag`, DONOT drag it.

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.0",
+  "version": "2.1.1",
   "dependencies": {
     "grunt": "~0.4.2",
     "grunt-contrib-jshint": "~0.8.0",

diff --git a/source/directives/uiTreeNode.js b/source/directives/uiTreeNode.js
@@ -66,6 +66,12 @@
                 return;
               }
 
+              var eventElmTagName = eventElm.prop('tagName').toLowerCase();
+              if (eventElmTagName == 'input' ||
+                eventElmTagName == 'button') { // if it's a input or button, ignore it
+                return;
+              }
+
               // check if it or it's parents has a 'data-nodrag' attribute
               while (eventElm && eventElm[0] && eventElm[0] != element) {
                 if ($uiTreeHelper.nodrag(eventElm)) { // if the node mark as `nodrag`, DONOT drag it.