Ticket #5518: adjust_scrolling_offsets.diff

dragdrop.js

@@ -61 +61 @@
-  },
-  
-  isAffected: function(point, element, drop) {
+    Position.prepare();
-    return (
-      (drop.element!=element) &&
-      ((!drop._containers) ||
@@ -68 +69 @@
-      ((!drop.accept) ||
-        (Element.classNames(element).detect( 
-          function(v) { return drop.accept.include(v) } ) )) &&
-
+IncludingScrolloffsets
-  },
-
-  deactivate: function(drop) {
@@ -83 +84 @@
-    this.last_active = drop;
-  },
-
-
+
+
-    if(!this.drops.length) return;
-    var affected = [];
-    
@@ -94 +96 @@
-    });
-        
-    if(affected.length>0) {
+      Position.prepare();
-      drop = Droppables.findDeepestChild(affected);
-
+IncludingScrolloffsets
-      if(drop.onHover)
-element
+draggingObj
-      
-      Droppables.activate(drop);
-    }
@@ -282 +285 @@
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
-      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-
+
+
-      Draggables.activate(this);
-      Event.stop(event);
-    }
-  },
-  
-
+ 
-    this.dragging = true;
-
+
-    if(this.options.zindex) {
-      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
-      this.element.style.zIndex = this.options.zindex;
@@ -298 +302 @@
-    
-    if(this.options.ghosting) {
-      this._clone = this.element.cloneNode(true);
-
+ 
-      this.element.parentNode.insertBefore(this._clone, this.element);
-    }
-    
@@ -312 +316 @@
-        this.originalScrollTop = this.options.scroll.scrollTop;
-      }
-    }
-
+
-    Draggables.notify('onStart', this, event);
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
@@ -320 +324 @@
-  updateDrag: function(event, pointer) {
-    if(!this.dragging) this.startDrag(event);
-    Position.prepare();
-.element
+
-    Draggables.notify('onDrag', this, event);
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
@@ -329 +333 @@
-      this.stopScrolling();
-      
-      var p;
+      var do_scroll = false;
-      if (this.options.scroll == window) {
-        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
-
+
+
-        p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft;
-        p[1] += this.options.scroll.scrollTop;
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
+        do_scroll = true;
-      }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    
-    // fix AppleWebKit rendering
@@ -402 +412 @@
-    var pos = Position.cumulativeOffset(this.element);
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-
+
-    if(this.options.scroll && (this.options.scroll != window)) {
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -432 +442 @@
-      style.top  = p[1] + "px";
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-
+
+
+
+
+
+
+
+
+
+
+
-  stopScrolling: function() {
-    if(this.scrollInterval) {
-      clearInterval(this.scrollInterval);
@@ -463 +483 @@
-      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
-      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
-    }
-
+
+
+
-    Position.prepare();
-.element
+
-    Draggables.notify('onDrag', this);
-    Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
-    Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
@@ -673 +695 @@
-      element, options.only, options.tree ? true : false, options.treeTag);
-  },
-
-
+
+
-    if(Element.isParent(dropon, element)) return;
-
-    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
-      return;
-
+ 
-      Sortable.mark(dropon, 'before');
-      if(dropon.previousSibling != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, dropon);
+        draggingObj.adjustScrollOffset();
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
@@ -695 +719 @@
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, nextElement);
+        draggingObj.adjustScrollOffset();
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
@@ -702 +727 @@
-    }
-  },
-  
-
+
+
-    var oldParentNode = element.parentNode;
-    var droponOptions = Sortable.options(dropon);
-        
@@ -729 +755 @@
-      }
-      
-      dropon.insertBefore(element, child);
-
+draggingObj.adjustScrollOffset();      
-      Sortable.options(oldParentNode).onChange(element);
-      droponOptions.onChange(element);
-    }