Merge pull request #1221 from ajaxorg/quit_drag_on_esc

* quite drag on esc
hanselke · Apr 4, 2012 · 9bf6710 · 9bf6710
2 parents 4e985d8 + 5d532e6
commit 9bf6710
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/client/ext/tree/tree.js b/client/ext/tree/tree.js
@@ -341,7 +341,13 @@ module.exports = ext.register("ext/tree/tree", {
                 }
             });
         });
-
+
+        trFiles.addEventListener("keyup", this.$keyup = function(e){
+            if(this.dragging > 0) {
+                apf.DragServer.stop();
+            }
+        });
+
         trFiles.addEventListener("beforeadd", this.cancelWhenOffline);
         trFiles.addEventListener("renamestart", this.cancelWhenOffline);
         trFiles.addEventListener("beforeremove", this.cancelWhenOffline);
@@ -535,6 +541,7 @@ module.exports = ext.register("ext/tree/tree", {
         trFiles.removeEventListener("beforeremove", this.$cancelWhenOffline);
         trFiles.removeEventListener("dragstart", this.$cancelWhenOffline);
         trFiles.removeEventListener("dragdrop", this.$cancelWhenOffline);
+        trFiles.removeEventListener("keyup", this.$keyup);
 
         this.nodes.each(function(item){
             item.destroy(true, true);

diff --git a/support/ace b/support/ace