Changeset 648

Timestamp:

03/30/06 12:53:38 (3 years ago)

Author:

therve@gmail.com

Message:

Upgrade to scriptaculous 1.6

Files:

• mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js (modified) (8 diffs)
• mochikit/branches/scriptaculous/MochiKit/New.js (modified) (1 diff)
• mochikit/branches/scriptaculous/MochiKit/Sortable.js (modified) (6 diffs)
• mochikit/branches/scriptaculous/MochiKit/Visual.js (modified) (4 diffs)

mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js

@@ -207 +207 @@
-
-    isAccepted: function (element) {
-
-
-
-
-
-
+
+
+
-    },
-
@@ -422 +419 @@
-
-        if (options.handle && (typeof(options.handle) == 'string')) {
-Elements
-[0]
+FirstElement
+
-        }
-        if (!this.handle) {
@@ -432 +429 @@
-        }
-
-
+ && !options.scroll.scrollTo && !options.scroll.outerHTML
-            options.scroll = MochiKit.DOM.getElement(options.scroll);
-        }
@@ -509 +506 @@
-
-        if (this.options.scroll) {
-
-
+
+
+
+
+
+
+
+
-        }
-
@@ -534 +537 @@
-        if (this.options.scroll) {
-            this.stopScrolling();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            var speed = [0, 0];
-            if (pointer.page.x < (p[0] + this.options.scrollSensitivity)) {
@@ -633 +642 @@
-        pos[1] -= d[1];
-
-
+ && !this.options.scroll.scrollTo
-            pos[0] -= this.options.scroll.scrollLeft - this.originalScrollLeft;
-            pos[1] -= this.options.scroll.scrollTop - this.originalScrollTop;
@@ -691 +700 @@
-        var delta = current - this.lastScrolled;
-        this.lastScrolled = current;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        MochiKit.Position.prepare();
-        MochiKit.DragAndDrop.Droppables.show(MochiKit.DragAndDrop.Draggables._lastPointer, this.element);
@@ -702 +721 @@
-    },
-
+    _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};
+    },
+
-    repr: function () {
-        return '[' + this.__class__.NAME + ", options:" + MochiKit.Base.repr(this.options) + "]";

mochikit/branches/scriptaculous/MochiKit/New.js

@@ -165 +165 @@
-            element.style.position = element.style.top = element.style.left = element.style.bottom = element.style.right = '';
-        }
+    },
+
+    getFirstElementByTagAndClassName: function (tagName, className,
+            /* optional */parent) {
+        var self = MochiKit.DOM;
+        if (typeof(tagName) == 'undefined' || tagName === null) {
+            tagName = '*';
+        }
+        if (typeof(parent) == 'undefined' || parent === null) {
+            parent = self._document;
+        }
+        parent = self.getElement(parent);
+        var children = (parent.getElementsByTagName(tagName)
+            || self._document.all);
+        if (typeof(className) == 'undefined' || className === null) {
+            return MochiKit.Base.extend(null, children);
+        }
+
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            var classNames = child.className.split(' ');
+            for (var j = 0; j < classNames.length; j++) {
+                if (classNames[j] == className) {
+                    return child;
+                }
+            }
+        }
-    }
-});

mochikit/branches/scriptaculous/MochiKit/Sortable.js

@@ -136 +136 @@
-            ghosting: false,
-            scroll: false,
+            scrollSensitivity: 20,
+            scrollSpeed: 15,
-            format: null,
-            onChange: MochiKit.Base.emptyFunction,
@@ -149 +151 @@
-            ghosting: options.ghosting,
-            scroll: options.scroll,
+            scrollSensitivity: options.scrollSensitivity,
+            scrollSpeed: options.scrollSpeed,
-            constraint: options.constraint,
-            handle: options.handle
@@ -203 +207 @@
-            // handles are per-draggable
-            var handle = options.handle ?
-Elements
-[0]
+FirstElement
+
-            options.draggables.push(
-                new MochiKit.DragAndDrop.Draggable(e,
@@ -231 +235 @@
-                e.tagName.toUpperCase() == options.tag.toUpperCase() &&
-               (!options.only ||
-
+
+
+
-                elements.push(e);
-            }
@@ -319 +325 @@
-    },
-
+    setSequence: function (element, newSequence) {
+        element = MochiKit.DOM.getElement(element);
+        var options = MochiKit.Base.update(arguments[2] || {}, this.options(element));
+
+        var nodeMap = {};
+        MochiKit.Base.map(function (n) {
+            var m = n.id.match(options.format);
+            if (m) {
+                nodeMap[m[1]] = [n, n.parentNode];
+            }
+            n.parentNode.removeChild(n);
+        }, this.findElements(element, options));
+
+        MochiKit.Base.map(function (ident) {
+            var n = nodeMap[ident];
+            if (n) {
+                n[1].appendChild(n[0]);
+                delete nodeMap[ident];
+            }
+        }, newSequence);
+    },
+
-    serialize: function (element, options) {
-        element = MochiKit.DOM.getElement(element);
@@ -328 +356 @@
-            format: sortableOptions.format || /^[^_]*_(.*)$/
-        }, options || {});
+
-        return MochiKit.Base.map(function (item) {
-          return (encodeURIComponent(options.name) + '[]=' +

mochikit/branches/scriptaculous/MochiKit/Visual.js

@@ -399 +399 @@
-        }
-    });
+};
+
+MochiKit.Visual.forceRerendering = function (element) {
+    try {
+        element = MochiKit.DOM.getElement(element);
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+    } catch(e) {
+    }
-};
-
@@ -1098 +1108 @@
-               MochiKit.DOM.getOpacity(element) || 0.0),
-        to: 1.0,
+        // force Safari to render floated elements properly
+        afterFinishInternal: function(effect) {
+            MochiKit.Visual.forceRerendering(effect.element);
+        },
-        beforeSetup: function (effect) {
-            MochiKit.DOM.setOpacity(effect.element, effect.options.from);
@@ -1164 +1178 @@
-    ***/
-    element = MochiKit.DOM.getElement(element);
-    var oldHeight = MochiKit.DOM.getStyle(element, 'height');
-    var elementDimensions = MochiKit.DOM.elementDimensions(element);
-    options = MochiKit.Base.update({
@@ -1180 +1193 @@
-        afterFinishInternal: function (effect) {
-            MochiKit.DOM.undoClipping(effect.element);
-            MochiKit.DOM.setStyle(effect.element, {height: oldHeight});
-        }
-    }, options || {});