Changeset 4785

Timestamp:

08/18/06 05:54:57 (2 years ago)

Author:

madrobby

Message:

script.aculo.us: Fix autoscrolling when dragging an element unto a scrollable container, fixes #5017 [thx tomg]

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/src/dragdrop.js (modified) (3 diffs)
• spinoffs/scriptaculous/test/functional/dragdrop7_test.html (added)
• spinoffs/scriptaculous/test/functional/index.html (modified) (1 diff)
• spinoffs/scriptaculous/test/unit/element_test.html (modified) (2 diffs)

spinoffs/scriptaculous/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix autoscrolling when dragging an element unto a scrollable container, fixes #5017 [thx tomg]
-
-* Fix a condition where overriding the endeffect on Draggables without overriding the starteffect too leads to a Javascript error [thx Javier Martinez]

spinoffs/scriptaculous/src/dragdrop.js

@@ -259 +259 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+ {
-      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
-
-    Element.makePositioned(this.element); // fix IE    
@@ -427 +429 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && this._isScrollChild
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -491 +493 @@
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    if(this.options.change) this.options.change(this);

spinoffs/scriptaculous/test/functional/index.html

@@ -42 +42 @@
-  <li><a href="dragdrop5_test.html" target="test">dragdrop5_test</a></li>
-  <li><a href="dragdrop6_test.html" target="test">dragdrop6_test: snap option</a></li>
+  <li><a href="dragdrop7_test.html" target="test">dragdrop7_test</a></li>
-</ul>
-<ul>

spinoffs/scriptaculous/test/unit/element_test.html

@@ -48 +48 @@
-
-<!-- Test Element.childrenWithClassName -->
-
+ class="moo hoo"
-  <span id="1" class="firstClass">First class</span>
-  <span id="2" class="secondClass">Second class</span>
@@ -71 +71 @@
-        elems.each($)
-      },1);
+    }},
+    
+    testElementUp: function() { with(this) {
+      assertEqual('Container', $('collect').up().id);
+      assertEqual('Container', $('collect').up(1).id);
+      assertEqual('Container', $('5').up(2).id);
+
+      assertEqual('Container', $('collect').up({tagName:'DIV'}).id);
+      assertEqual('4', $('5').up({className:'thirdClass'}).id);
+      
+      assertEqual('Container',$('5').up({className:'moo',tagName:'DIV'}).id);
+      assertEqual('Container',$('5').up({tag:'div'}).id);
+      assertEqual('Container',$('5').up({'class':'moo','tag':'div'}).id);
+      assertNull($('5').up({className:'moo',tagName:'IMG'}));
-    }},
-