Changeset 7770

Timestamp:

03/22/07 23:13:40 (22 months ago)

Author:

elazutkin

Message:

dnd2: added correct before/after calculations

Files:

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

trunk/src/dnd2/source.js

@@ -4 +4 @@
 dojo.require("dojo.event.*");
 dojo.require("dojo.html.style");
+dojo.require("dojo.html.layout");
 
 dojo.require("dojo.dnd2.selector");
@@ -42 +43 @@
         this.mouse_down = false;
         this.target_anchor = null;
+        this.target_box = null;
         this.before = true;
         // states
@@ -64 +66 @@
                         // calculate before/after
                         var before = false;
-                        /*
-                        THIS IS A PLACEHOLDER!
-                        
                         if(this.current){
+                                if(!this.target_box){
+                                        this.target_box = {
+                                                xy: dojo.html.getAbsolutePosition(this.current, true),
+                                                wh: dojo.html.getBorderBox(this.current)
+                                        };
+                                }
                                 if(this.horizontal){
-                                        before = (e.clientX - this.current.clientLeft) < (this.current.offsetWidth / 2);
+                                        before = (e.pageX - this.target_box.xy.x) < (this.target_box.wh.width / 2);
                                 }else{
-                                        before = (e.clientY - this.current.clientTop)  < (this.current.offsetHeight / 2);
-                                }
-                        }
-                        */
+                                        before = (e.pageY - this.target_box.xy.y) < (this.target_box.wh.height / 2);
+                                }
+                        }
                         if(this.current != this.target_anchor || before != this.before){
                                 this.markTargetAnchor(before);
@@ -189 +193 @@
                 }
                 this.target_anchor = this.current;
+                this.target_box = null;
                 this.before = before;
                 if(this.target_anchor){
@@ -198 +203 @@
                 this.removeItemClass(this.target_anchor, this.before ? "Before" : "After");
                 this.target_anchor = null;
+                this.target_box = null;
                 this.before = true;
         },