Fixed jquery bug #81 #84

angular-ui-tree · Apr 2, 2014 · 3ab9efb · 3ab9efb
1 parent d6c5357
commit 3ab9efb
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-tree",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.0.2
+ * @license Angular UI Tree v2.0.3
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */
@@ -737,9 +737,10 @@
                 // disable right click
                 return;
               }
-              if (e.uiTreeDragging) { // event has already fired in other scope.
+              if (e.uiTreeDragging || (e.originalEvent && e.originalEvent.uiTreeDragging)) { // event has already fired in other scope.
                 return;
               }
+
               // the element which is clicked.
               var eventElm = angular.element(e.target);
               var eventScope = eventElm.scope();
@@ -760,7 +761,10 @@
                 eventElm = eventElm.parent();
               }
 
-              e.uiTreeDragging = scope; // stop event bubbling
+              e.uiTreeDragging = true; // stop event bubbling
+              if (e.originalEvent) {
+                e.originalEvent.uiTreeDragging = true;
+              }
               e.preventDefault();
               var eventObj = $uiTreeHelper.eventObj(e);
 

diff --git a/demo/dist/angular-ui-tree.min.js b/demo/dist/angular-ui-tree.min.js
diff --git a/demo/test.html b/demo/test.html
@@ -4,6 +4,7 @@
   <title>Demo</title>
 <link rel="stylesheet" type="text/css" href="http://jimliu.github.io/angular-ui-tree/dist/angular-ui-tree.min.css">
 <link rel="stylesheet" type="text/css" href="http://jimliu.github.io/angular-ui-tree/css/demo.css">
+
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.4/angular.min.js"></script>
 <script type="text/javascript" src="dist/angular-ui-tree.js"></script>
 <script type="text/javascript">

diff --git a/dist/angular-ui-tree.js b/dist/angular-ui-tree.js
@@ -1,5 +1,5 @@
 /**
- * @license Angular UI Tree v2.0.2
+ * @license Angular UI Tree v2.0.3
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */
@@ -737,9 +737,10 @@
                 // disable right click
                 return;
               }
-              if (e.uiTreeDragging) { // event has already fired in other scope.
+              if (e.uiTreeDragging || (e.originalEvent && e.originalEvent.uiTreeDragging)) { // event has already fired in other scope.
                 return;
               }
+
               // the element which is clicked.
               var eventElm = angular.element(e.target);
               var eventScope = eventElm.scope();
@@ -760,7 +761,10 @@
                 eventElm = eventElm.parent();
               }
 
-              e.uiTreeDragging = scope; // stop event bubbling
+              e.uiTreeDragging = true; // stop event bubbling
+              if (e.originalEvent) {
+                e.originalEvent.uiTreeDragging = true;
+              }
               e.preventDefault();
               var eventObj = $uiTreeHelper.eventObj(e);
 

diff --git a/dist/angular-ui-tree.min.js b/dist/angular-ui-tree.min.js
diff --git a/source/directives/uiTreeNode.js b/source/directives/uiTreeNode.js
@@ -28,9 +28,10 @@
                 // disable right click
                 return;
               }
-              if (e.uiTreeDragging) { // event has already fired in other scope.
+              if (e.uiTreeDragging || (e.originalEvent && e.originalEvent.uiTreeDragging)) { // event has already fired in other scope.
                 return;
               }
+
               // the element which is clicked.
               var eventElm = angular.element(e.target);
               var eventScope = eventElm.scope();
@@ -51,7 +52,10 @@
                 eventElm = eventElm.parent();
               }
 
-              e.uiTreeDragging = scope; // stop event bubbling
+              e.uiTreeDragging = true; // stop event bubbling
+              if (e.originalEvent) {
+                e.originalEvent.uiTreeDragging = true;
+              }
               e.preventDefault();
               var eventObj = $uiTreeHelper.eventObj(e);
 

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