Changeset 498

Timestamp:

01/14/06 07:02:19 (3 years ago)

Author:

therve@gmail.com

Message:

Try to fit in 8O columns, add missing realOffset function

Files:

• mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js (modified) (25 diffs)
• mochikit/branches/scriptaculous/MochiKit/New.js (modified) (1 diff)

mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js

@@ -35 +35 @@
-        options = MochiKit.Base.update({
-            greedy: true,
-
+
+
-        }, options || {});
-
@@ -69 +70 @@
-    },
-
+    isAccepted: function (element, drop) {
+        return ((!drop.accept) || MochiKit.Iter.some(drop.accept, function (d) {
+            return MochiKit.Iter.some(element.className.split(' '),
+            function (c) {
+                return c == d;
+            }
+        )}));
+    },
+
-    isAffected: function (point, element, drop) {
-        return (
-            (drop.element != element) &&
-            ((!drop._containers) || this.isContained(element, drop)) &&
-
-
-
-
-
+
-            MochiKit.Position.within(drop.element, point[0], point[1]));
-    },
@@ -93 +99 @@
-        }
-        this.last_active = drop;
+    },
+
+    prepare: function (element) {
+        MochiKit.Iter.forEach(this.drops, function (drop) {
+            if (DragAndDrop.Droppables.isAccepted(element, drop)) {
+                if (drop.activeclass) {
+                    MochiKit.DOM.addElementClass(drop.element, drop.activeclass);
+                }
+            }
+        });
-    },
-
@@ -123 +139 @@
-        MochiKit.Position.prepare();
-
-
+
+
-            if (this.last_active.onDrop) {
-
+
+
-            }
-        }
@@ -131 +149 @@
-
-    reset: function () {
+        MochiKit.Iter.forEach(this.drops, function (drop) {
+            if (drop.activeclass) {
+                MochiKit.DOM.removeElementClass(drop.element, drop.activeclass);
+            }
+        });
-        if (this.last_active) {
-
+  
-        }
-    }
@@ -143 +166 @@
-    register: function (draggable) {
-        if (this.drags.length == 0) {
-
-
-
+
+
+
+
+
+
-
-            MochiKit.Event.observe(document, 'mouseup', this.eventMouseUp);
@@ -159 +185 @@
-        }, this.drags);
-        if (this.drags.length == 0) {
-
-
-
+
+
+
+
+
+
-        }
-    },
-
-    activate: function (draggable) {
-
+
+
+
-        this.activeDraggable = draggable;
-    },
@@ -178 +209 @@
-            return;
-        }
-
+
+
-        // Mozilla-based browsers fire successive mousemove events with
-        // the same coordinates, prevent needless redrawing (moz bug?)
-
+
+
-            return;
-        }
@@ -208 +241 @@
-    },
-
-
+
+
-        this.observers = MochiKit.Iter.ifilter(function (o) {
-            return o.element != element;
@@ -215 +249 @@
-    },
-
-
-
+
+
+
-            MochiKit.Iter.forEach(this.observers, function (o) {
-                if (o[eventName]) {
@@ -226 +261 @@
-
-    _cacheObserverCallbacks: function () {
-
-
-
-
+
+
+
+
+
+
-        });
-    }
@@ -249 +286 @@
-                var dur = Math.sqrt(Math.abs(top_offset^2) +
-                          Math.abs(left_offset^2))*0.02;
- 
+
-                            {x: -left_offset, y: -top_offset, duration: dur});
-            },
@@ -330 +367 @@
-    startDrag: function (event) {
-        this.dragging = true;
-C
+c
-            MochiKit.DOM.addElementClass(this.element,
-C
+c
-        }
-        if (this.options.zindex) {
@@ -345 +382 @@
-            this.element.parentNode.insertBefore(this._clone, this.element);
-        }
-
+
-        DragAndDrop.Draggables.notify('onStart', this, event);
-        if (this.options.starteffect) {
@@ -373 +410 @@
-    finishDrag: function (event, success) {
-        this.dragging = false;
-C
+c
-            MochiKit.DOM.removeElementClass(this.element,
-C
+c
-        }
-
-        if (this.options.ghosting) {
+            // XXX: from a user point of view, it would be better to remove
+            // the node only *after* the Effect.Move end
-            MochiKit.Position.relativize(this.element);
-            MochiKit.DOM.removeElement(this._clone);
@@ -397 +436 @@
-        if (revert && this.options.reverteffect) {
-            this.options.reverteffect(this.element,
--this.delta[1], d[0]-
+ - this.delta[1], d[0] - 
-        } else {
-            this.delta = d;
@@ -433 +472 @@
-        var pos = MochiKit.Position.cumulativeOffset(this.element);
-        var d = this.currentDelta();
-
+
+
-
-        var p = MochiKit.Base.map(MochiKit.Base.bind(function (i) {
@@ -445 +485 @@
-                if (this.options.snap instanceof Array) {
-                    p = MochiKit.Base.map(MochiKit.Base.bind(function (v, i) {
-
+
+
-                        }, this), p)
-                } else {
-                    p = MochiKit.Base.map(MochiKit.Base.bind(function (v) {
-
+
+
-                        }, this), p)
-                }
-            }
-        }
-
-        var style = this.element.style;
-
+
+
-            style.left = p[0] + 'px';
-        }
-
-
+
+
+
-        }
-        if (style.visibility == 'hidden') {
@@ -532 +575 @@
-            overlap: 'vertical',  // one of 'vertical', 'horizontal'
-            constraint: 'vertical',  // one of 'vertical', 'horizontal', false
-
+
+
-            handle: false,  // or a CSS class
-            only: false,
@@ -594 +638 @@
-        if (options.dropOnEmpty) {
-            DragAndDrop.Droppables.add(element,
-
+
+
+
-            options.droppables.push(element);
-        }
-
+
+
-            // handles are per-draggable
-            var handle = options.handle ?
-
+
+
-            options.draggables.push(
-
-
+
+
+
-            DragAndDrop.Droppables.add(e, options_for_droppable);
-            options.droppables.push(e);
@@ -612 +661 @@
-
-        // for onupdate
-
+
+
-    },
-
@@ -622 +672 @@
-        var elements = [];
-        MochiKit.Iter.forEach(element.childNodes, function (e) {
-
-
+
+
+
+
-                elements.push(e);
-            }
@@ -687 +739 @@
-
-        if (!Sortable._marker) {
-
+
+
-            MochiKit.DOM.hideElement(Sortable._marker);
-            MochiKit.DOM.addElementClass(Sortable._marker, 'dropmarker');
-            Sortable._marker.style.position = 'absolute';
-
+
+
-        }
-        var offsets = MochiKit.Position.cumulativeOffset(dropon);
@@ -699 +753 @@
-        if (position == 'after') {
-            if (sortable.overlap == 'horizontal') {
-
+
+
-            } else {
-
+
+
-            }
-        }
@@ -719 +775 @@
-        return MochiKit.Base.map(function (item) {
-          return (encodeURIComponent(options.name) + '[]=' +
-
-
+
+
+
+
-    }
-};

mochikit/branches/scriptaculous/MochiKit/New.js

@@ -300 +300 @@
-        var valueT = 0, valueL = 0;
-        do {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } while (element);
-        return [valueL, valueT];