Changeset 7767

Timestamp:

03/22/07 19:42:45 (20 months ago)

Author:

elazutkin

Message:

dnd2: added onkeydown/onkeyup handlers to watch for copy/move status, minor cleanup of the source

Location:

trunk/src/dnd2

Files:

• manager.js (modified) (4 diffs)
• source.js (modified) (1 diff)

trunk/src/dnd2/manager.js

@@ -47 +47 @@
                 dojo.event.connect(dojo.doc(), "onmousemove", this, "onMouseMove");
                 dojo.event.connect(dojo.doc(), "onmouseup",   this, "onMouseUp");
+                dojo.event.connect(dojo.doc(), "onkeydown",   this, "onKeyDown");
+                dojo.event.connect(dojo.doc(), "onkeyup",     this, "onKeyUp");
                 dojo.html.addClass(dojo.body(), "dojoDnd" + (copy ? "Copy" : "Move"));
         },
@@ -61 +63 @@
                 dojo.event.disconnect(dojo.doc(), "onmousemove", this, "onMouseMove");
                 dojo.event.disconnect(dojo.doc(), "onmouseup",   this, "onMouseUp");
+                dojo.event.disconnect(dojo.doc(), "onkeydown",   this, "onKeyDown");
+                dojo.event.disconnect(dojo.doc(), "onkeyup",     this, "onKeyUp");
                 this.avatar.destroy();
                 this.avatar = null;
@@ -74 +78 @@
                         s.left = (e.pageX + 10) + "px";
                         s.top  = (e.pageY + 10) + "px";
-                        if(this.copy != e.ctrlKey){
-                                this.copy = e.ctrlKey;
-                                this.source.markDndStatus(this.copy);
-                                this.updateAvatar();
-                                dojo.html.replaceClass(dojo.body(), "dojoDnd" + (this.copy ? "Copy" : "Move"), "dojoDnd" + (this.copy ? "Move" : "Copy"));
-                        }
+                        if(this.copy != e.ctrlKey){ this.setCopyStatus(e.ctrlKey); }
                 }
         },
@@ -91 +90 @@
                         this.stopDrag();
                 }
+        },
+        // keyboard event processors
+        onKeyDown: function(e){
+                if(this.avatar && e.keyCode == dojo.event.browser.keys.KEY_CTRL && !this.copy){ this.setCopyStatus(true); }
+        },
+        onKeyUp: function(e){
+                if(this.avatar && e.keyCode == dojo.event.browser.keys.KEY_CTRL && this.copy){ this.setCopyStatus(false); }
+        },
+        // utilities
+        setCopyStatus: function(copy){
+                this.copy = copy;
+                this.source.markDndStatus(this.copy);
+                this.updateAvatar();
+                dojo.html.replaceClass(dojo.body(), "dojoDnd" + (this.copy ? "Copy" : "Move"), "dojoDnd" + (this.copy ? "Move" : "Copy"));
         }
 });

trunk/src/dnd2/source.js

@@ -42 +42 @@
         this.mouse_down = false;
         this.target_anchor = null;
-        this.target_valid = false;
         this.before = true;
         // states