Changeset 7769

Timestamp:

03/22/07 22:39:46 (20 months ago)

Author:

elazutkin

Message:

dnd2: testing and fixing border cases --- source but no target, and target but no source

Files:

• trunk/src/dnd2/source.js (modified) (2 diffs)

trunk/src/dnd2/source.js

@@ -80 +80 @@
                         }
                 }else{
-                        if(this.mouse_down){
+                        if(this.mouse_down && this.is_source){
                                 m.startDrag(this, this.getSelectedNodes(), e.ctrlKey);
                         }
@@ -109 +109 @@
                         this.changeState("Source", this == source ? (copy ? "Copied" : "Moved") : "");
                 }
-                if(this.accept){
-                        var accepted = this.checkAcceptance(source, nodes);
-                        this.changeState("Target", accepted ? "" : "Disabled");
-                        if(accepted){
-                                dojo.dnd2.manager().overSource(this);
-                        }
+                var accepted = this.accept && this.checkAcceptance(source, nodes);
+                this.changeState("Target", accepted ? "" : "Disabled");
+                if(accepted){
+                        dojo.dnd2.manager().overSource(this);
                 }
                 this.is_dragging = true;