Changeset 654

Timestamp:

04/02/06 12:59:28 (3 years ago)

Author:

therve@gmail.com

Message:

* Make some shorcuts to gain bytes
* One type in example

Files:

• mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js (modified) (13 diffs)
• mochikit/branches/scriptaculous/MochiKit/Sortable.js (modified) (5 diffs)
• mochikit/branches/scriptaculous/MochiKit/Visual.js (modified) (43 diffs)
• mochikit/branches/scriptaculous/examples/effects_combi/index.html (modified) (1 diff)

mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js

@@ -172 +172 @@
-
-    __init__: function (element, /* optional */options) {
-
-
+
+
+
+
-            greedy: true,
-            hoverclass: null,
@@ -185 +187 @@
-            if ((typeof(containment) == 'object') &&
-                (containment.constructor == Array)) {
-MochiKit.Base
-MochiKit.DOM
+b
+d
-                }, this), containment);
-            } else {
-                this.options._containers.push(
-MochiKit.DOM
-
-
-
-MochiKit.DOM
+d
+
+
+
+d
-
-        MochiKit.DragAndDrop.Droppables.register(this);
@@ -278 +280 @@
-    register: function (draggable) {
-        if (this.drags.length === 0) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        this.drags.push(draggable);
@@ -293 +297 @@
-        }, this.drags);
-        if (this.drags.length === 0) {
-
-
-
-
-
-
+
+
+
+
-        }
-    },
@@ -368 +370 @@
-
-    _cacheObserverCallbacks: function () {
-
-
-
+
+
+
+
+
-                return o[eventName];
-MochiKit.DragAndDrop.Draggables
+self
-        }, ['onStart', 'onEnd', 'onDrag']);
-    }
@@ -392 +396 @@
-
-    __init__: function (element, /* optional */options) {
+        var v = MochiKit.Visual;
-        options = MochiKit.Base.update({
-            handle: false,
-            starteffect: function (element) {
-
-
+
-            },
-            reverteffect: function (element, top_offset, left_offset) {
-                var dur = Math.sqrt(Math.abs(top_offset^2) +
-                          Math.abs(left_offset^2))*0.02;
-MochiKit.Visual
+v
-                            {x: -left_offset, y: -top_offset, duration: dur});
-            },
-            endeffect: function (element) {
-MochiKit.Visual
+v
-            },
-            zindex: 1000,
@@ -416 +420 @@
-        }, options || {});
-
-
+
+
-
-        if (options.handle && (typeof(options.handle) == 'string')) {
-MochiKit.DOM
+d
-                                       options.handle, this.element);
-        }
-        if (!this.handle) {
-MochiKit.DOM
+d
-        }
-        if (!this.handle) {
@@ -430 +435 @@
-
-        if (options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
-MochiKit.DOM
-
-
-MochiKit.DOM
+d
+
+
+d
-
-        this.delta = this.currentDelta();
@@ -446 +451 @@
-    destroy: function () {
-        MochiKit.Signal.disconnect(this.handle, 'onmousedown',
-
+ 
-        MochiKit.DragAndDrop.Draggables.unregister(this);
-    },
-
-    currentDelta: function () {
+        var s = MochiKit.DOM.getStyle;
-        return [
-MochiKit.DOM.getStyle
-MochiKit.DOM.getStyle
+s
+s
-    },
-
@@ -572 +578 @@
-
-    finishDrag: function (event, success) {
+        var dr = MochiKit.DragAndDrop;
-        this.dragging = false;
-        if (this.options.selectclass) {
@@ -590 +597 @@
-
-        if (success) {
-MochiKit.DragAndDrop
-
-MochiKit.DragAndDrop
+dr
+
+dr
-
-        var revert = this.options.revert;
@@ -615 +622 @@
-        }
-
-MochiKit.DragAndDrop
-MochiKit.DragAndDrop
+dr
+dr
-    },
-
@@ -712 +719 @@
-        }
-        
+        var d = MochiKit.DragAndDrop;
+        
-        MochiKit.Position.prepare();
-
-
-
+
+
-        if (this.options.change) {
-            this.options.change(this);

mochikit/branches/scriptaculous/MochiKit/Sortable.js

@@ -90 +90 @@
-
-    options: function (element){
+        var i = MochiKit.Iter;
-        element = MochiKit.DOM.getElement(element);
-        var result;
-MochiKit.Iter
+i
-            if (s.element == element) {
-                result = s;
-MochiKit.Iter
+i
-            }
-        });
@@ -102 +103 @@
-
-    destroy: function (element){
-
-
+
+
+
+
-            return s.element == element;
-        }, this.sortables);
-MochiKit.Base
-MochiKit.DragAndDrop
-MochiKit.Base.map(function (d
-MochiKit.DragAndDrop.Droppables.remove(d
+b
+d
+b.map(function (dr
+d.Droppables.remove(dr
-            }, s.droppables);
-MochiKit.Base.map(function (d
-
+b.map(function (dr
+r
-            }, s.draggables);
-        }, toDestroy);
-MochiKit.Base
+b
-            return s.element != element;
-        }, this.sortables);
@@ -279 +282 @@
-
-    onEmptyHover: function (element, dropon) {
+        var o = MochiKit.Sortable.Sortable.options;
-        if (element.parentNode != dropon) {
-            var oldParentNode = element.parentNode;
-            dropon.appendChild(element);
-MochiKit.Sortable.Sortable.options
-MochiKit.Sortable.Sortable.options
+o
+o
-        }
-    },
-
-    unmark: function () {
-
-
+
+
+
-        }
-    },
@@ -295 +300 @@
-    mark: function (dropon, position) {
-        // mark on ghosting only
-
+
+
+
-        if (sortable && !sortable.ghosting) {
-            return;
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        var offsets = MochiKit.Position.cumulativeOffset(dropon);
-MochiKit.Sortable.Sortable
-MochiKit.Sortable.Sortable
+s
+s
-
-        if (position == 'after') {
-            if (sortable.overlap == 'horizontal') {
-
-
+
-            } else {
-
-
-
-
-
+
+
+
+
-    },
-
-    setSequence: function (element, newSequence) {
-
-
+
+
+
-
-        var nodeMap = {};
-MochiKit.Base
+b
-            var m = n.id.match(options.format);
-            if (m) {
@@ -338 +343 @@
-        }, this.findElements(element, options));
-
-MochiKit.Base
+b
-            var n = nodeMap[ident];
-            if (n) {

mochikit/branches/scriptaculous/MochiKit/Visual.js

@@ -389 +389 @@
-    }
-    element = MochiKit.DOM.getElement(element);
-
+
+
-        if (child.nodeType == 3) {
-MochiKit.Iter.forEach
+fe
-                element.insertBefore(
-                    MochiKit.DOM.SPAN({style: tagifyStyle},
@@ -450 +451 @@
-        queue: {position: 'end', scope: (element.id || 'global'), limit: 1}
-    }, options || {});
-
-
+
+
+
-};
-
@@ -517 +519 @@
-            effect.options.queue : effect.options.queue.position;
-
+        var fe = MochiKit.Iter.forEach;
-        switch(position) {
-            case 'front':
-                // move unstarted effects after this effect
-MochiKit.Iter.forEach
+fe
-                    if (e.state == 'idle') {
-                        e.startOn += effect.finishOn;
@@ -530 +533 @@
-                var finish;
-                // start effect after last queued effect has finished
-MochiKit.Iter.forEach
+fe
-                    var i = e.finishOn;
-                    if (i >= (finish || i)) {
@@ -613 +616 @@
-
-    start: function (options) {
+        var v = MochiKit.Visual;
-        this.options = MochiKit.Base.setdefault(options || {},
-MochiKit.Visual
+v
-        this.currentFrame = 0;
-        this.state = 'idle';
@@ -621 +625 @@
-        this.event('beforeStart');
-        if (!this.options.sync) {
-MochiKit.Visual
+v
-                'global' : this.options.queue.scope).add(this);
-        }
@@ -749 +753 @@
-    ***/
-    __init__: function (element, /* optional */options) {
-
+
+
+
-        // make this work on IE on elements without 'layout'
-MochiKit.Base
-MochiKit.DOM
-
-MochiKit.Base
-MochiKit.DOM
+b
+d
+
+b
+d
-            to: 1.0
-        }, options || {});
@@ -791 +797 @@
-
-    setup: function () {
+        var d = MochiKit.DOM;
-        // Bug in Opera: Opera returns the 'real' position of a static element
-        // or relative element that does not have top/left explicitly set.
-        // ==> Always set top and left for position relative elements in your
-        // stylesheets (to 0 if you do not need them)
-MochiKit.DOM
+d
-
-        var s = this.element.style;
@@ -805 +812 @@
-        }
-
-
-
-
-
+
+
-
-        if (this.options.mode == 'absolute') {
@@ -864 +869 @@
-                                                        'position');
-
+        var fe = MochiKit.Iter.forEach;
+        var b = MochiKit.Base.bind;
-        this.originalStyle = {};
-MochiKit.Iter.forEach
-MochiKit.Base.bind
+fe
+b
-                this.originalStyle[k] = this.element.style[k];
-            }, this));
@@ -875 +882 @@
-        var fontSize = MochiKit.DOM.getStyle(this.element,
-                                             'font-size') || '100%';
-MochiKit.Iter.forEach
-MochiKit.Base.bind
+fe
+b
-            if (fontSize.indexOf(fontSizeType) > 0) {
-                this.fontSize = parseFloat(fontSize);
@@ -971 +978 @@
-
-    setup: function () {
+        var d = MochiKit.DOM;
+        var b = MochiKit.Base;
-        // Prevent executing on elements not in the layout flow
-MochiKit.DOM
+d
-            this.cancel();
-            return;
@@ -978 +987 @@
-        // Disable background image during the effect
-        this.oldStyle = {
-
-
+
-        };
-MochiKit.DOM
+d
-            backgroundImage: 'none'
-        });
@@ -990 +998 @@
-        }
-        if(!this.options.restorecolor) {
-
-
+
-        }
-        // init color calculations
-MochiKit.Base.map(MochiKit.Base
+b.map(b
-            return parseInt(
-                this.options.startcolor.slice(i*2 + 1, i*2 + 3), 16);
-        }, this), [0, 1, 2]);
-MochiKit.Base.map(MochiKit.Base
+b.map(b
-            return parseInt(this.options.endcolor.slice(i*2 + 1, i*2 + 3), 16)
-                - this._base[i];
@@ -1041 +1048 @@
-
-    setup: function () {
-
-
+
+
+
-        if (this.options.offset) {
-            offsets[1] += this.options.offset;
@@ -1056 +1064 @@
-            max = document.body.clientHeight - document.body.scrollHeight;
-        }
-MochiKit.Position
+p
-        this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart;
-    },
-
-    update: function (position) {
-MochiKit.Position.prepare()
-window.scrollTo(MochiKit.Position.deltaX,
-    this.scrollStart + (position*
+var p = MochiKit.Position
+p.prepare();
+window.scrollTo(p.deltaX, this.scrollStart + (position * 
-    }
-});
@@ -1081 +1089 @@
-
-    ***/
-
+
+
-    options = MochiKit.Base.update({
-MochiKit.DOM
+d
-        to: 0.0,
-        afterFinishInternal: function (effect) {
@@ -1089 +1098 @@
-                return;
-            }
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        }
-    }, options || {});
@@ -1104 +1113 @@
-
-    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
-    options = MochiKit.Base.update({
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        to: 1.0,
-        // force Safari to render floated elements properly
-        afterFinishInternal: function(effect) {
-MochiKit.Visual
+v
-        },
-        beforeSetup: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        }
-    }, options || {});
-MochiKit.Visual
+v
-};
-
@@ -1126 +1137 @@
-
-    ***/
-
+
+
+
-    var oldStyle = {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-    };
-    options = MochiKit.Base.update({
-        beforeSetupInternal: function (effect) {
-MochiKit.DOM
+d
-                                  {position: 'absolute'});
-        },
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        }
-    }, options || {});
-MochiKit.Visual
-MochiKit.Visual
+v
+v
-            {sync: true, scaleFromCenter: true,
-             scaleContent: true, restoreAfterFinish: true}),
-
-
-
+
+
-};
-
@@ -1156 +1168 @@
-
-    ***/
-
-
+
+
+
-    options = MochiKit.Base.update({
-        scaleContent: false,
@@ -1163 +1176 @@
-        restoreAfterFinish: true,
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        }
-    }, options || {});
@@ -1177 +1190 @@
-
-    ***/
-
-
+
+
+
-    options = MochiKit.Base.update({
-        scaleContent: false,
@@ -1187 +1201 @@
-        restoreAfterFinish: true,
-        afterSetup: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
+d
+d
+d
-        },
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
+d
-        }
-    }, options || {});
@@ -1204 +1218 @@
-
-    ***/
-
-
+
+
+
-    var optionsScale = {
-        duration: 0.3,
@@ -1213 +1228 @@
-        restoreAfterFinish: true,
-        beforeSetup: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        },
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
+d
+d
+d
+d
-        }
-    };
-
+
+
-        duration: 0.4,
-        from: 0,
-MochiKit.Visual
+v
-        afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-        }
-    });
@@ -1239 +1255 @@
-
-    ***/
-
+
+
-    var oldStyle = {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
+d
+d
+d
-    };
-
@@ -1249 +1266 @@
-        duration: 0.5,
-        beforeSetup: function (effect) {
-MochiKit.DOM
+d
-        },
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
+d
+d
+d
-        }
-    }, options || {});
-
-
-
+
+
+
+
-        options);
-};
@@ -1269 +1287 @@
-
-    ***/
-
+
+
+
-    var oldStyle = {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.Visual
+d
+d
+v
-          {x: 20, y: 0, duration: 0.05, afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-          {x: -40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-           {x: 40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-          {x: -40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-           {x: 40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
-MochiKit.Visual
+v
-         {x: -20, y: 0, duration: 0.05, afterFinishInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-    }}) }}) }}) }}) }}) }});
-};
@@ -1298 +1318 @@
-
-    ***/
-
-
-
-
-
+
+
+
+
+
+
+
-        scaleContent: false,
-        scaleX: false,
@@ -1310 +1332 @@
-        restoreAfterFinish: true,
-        afterSetup: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.Base
-MochiKit.DOM
+d
+d
+b
+d
-            }
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.DOM
+d
+d
+d
-        },
-        afterUpdateInternal: function (effect) {
-MochiKit.DOM
+d
-               {bottom: (effect.dims[0] - effect.element.clientHeight) + 'px'})
-        },
-        afterFinishInternal: function (effect) {
-MochiKit.DOM
+d
-            // IE will crash if child is undoPositioned first
-MochiKit.Base
-MochiKit.DOM
-MochiKit.DOM
+b
+d
+d
-            } else {
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-            }
-MochiKit.DOM
+d
-                                  {bottom: oldInnerBottom});
-        }
@@ -1349 +1371 @@
-
-    ***/
-
-
-
-
+
+
+
+
+
+
-        scaleContent: false,
-        scaleX: false,
@@ -1359 +1383 @@
-        restoreAfterFinish: true,
-        beforeStartInternal: function (effect) {
-MochiKit.DOM
-MochiKit.DOM
-MochiKit.Base
-MochiKit.DOM
+d
+d
+b
+d
-            }
-MochiKit.DOM
-MochiKit.DOM
+d
+d
-        },
-        afterUpdateInternal: function (effect) {
-MochiKit.DOM
+d
-            {bottom: (effect.dims[0] - effect.element.clientHeight) + 'px'});