Changeset 4011

Timestamp:

03/22/06 14:54:51 (2 years ago)

Author:

madrobby

Message:

script.aculo.us: Make it possible to scroll window on dragging, #3921 [thx rdmiller]

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/src/dragdrop.js (modified) (6 diffs)
• spinoffs/scriptaculous/test/functional/dragdrop2_test.html (modified) (1 diff)

spinoffs/scriptaculous/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make it possible to scroll window on dragging, #3921 [thx rdmiller]
-
-* Make Element.forceRerendering give up on any exception (this fixes various problems with IE)

spinoffs/scriptaculous/src/dragdrop.js

@@ -213 +213 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+
+
-
-    Element.makePositioned(this.element); // fix IE    
@@ -278 +279 @@
-    
-    if(this.options.scroll) {
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -295 +302 @@
-    
-    if(this.options.scroll) {
-      //if(this.scrollInterval) this.scroll();
-      this.stopScrolling();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
@@ -367 +379 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && !this.options.scroll.scrollTo
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -414 +426 @@
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-
-
+
+
+
+
+
+
+
+
+
+
+
-    
-    Position.prepare();
@@ -423 +444 @@
-    
-    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
-  }
-}

spinoffs/scriptaculous/test/functional/dragdrop2_test.html

@@ -33 +33 @@
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-
+scroll:window,
-  new Draggable('revertbox2',{handle:'handle2',revert:function(element){return ($('shouldrevert2').checked)}});
-  Droppables.add('droptarget1',{accept:['box1','otherstuff'],onDrop:function(){alert('drop!')}});