Changeset 7766

Timestamp:

03/22/07 18:55:22 (22 months ago)

Author:

elazutkin

Message:

dnd2: bugfixes for bugs introduced by renaming states

Location:

trunk/src/dnd2

Files:

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

trunk/src/dnd2/manager.js

@@ -21 +21 @@
         overSource: function(source){
                 if(this.avatar){
-                        this.target = source;
+                        this.target = (source && source.target_state != "Disabled") ? source : null;
+                        this.avatar.update();
                 }
                 dojo.event.topic.publish("dnd_source_over", source);

trunk/src/dnd2/source.js

@@ -59 +59 @@
         // mouse event processors
         onMouseMove: function(e){
-                if(this.is_dragging && this.target_state == "disabled"){ return; }
+                if(this.is_dragging && this.target_state == "Disabled"){ return; }
+                dojo.dnd2.Source.superclass.onMouseMove.call(this, e);
                 var m = dojo.dnd2.manager();
-                if(this.container_state != "over"){
-                        m.overSource(this);
-                }
-                dojo.dnd2.Source.superclass.onMouseMove.call(this, e);
                 if(this.is_dragging){
                         // calculate before/after
@@ -106 +103 @@
                 }else if(this.is_dragging){
                         var m = dojo.dnd2.manager();
-                        m.canDrop(!this.current || m.source != this || !(this.current.id in this.selection));
+                        m.canDrop(this.target_state != "Disabled" && (!this.current || m.source != this || !(this.current.id in this.selection)));
                 }
         },
@@ -155 +152 @@
                 this.changeState("Target", "");
         },
-        // methods
+        // utilities
+        onOverEvent: function(){
+                dojo.dnd2.Source.superclass.onOverEvent.call(this);
+                dojo.dnd2.manager().overSource(this);
+        },
         onOutEvent: function(){
                 dojo.dnd2.Source.superclass.onOutEvent.call(this);
                 dojo.dnd2.manager().outSource(this);
         },
+        // methods
         checkAcceptance: function(source, nodes){
                 if(this == source){ return true; }