Changeset 533

Timestamp:

01/20/06 14:57:23 (3 years ago)

Author:

therve@gmail.com

Message:

Move some things out of new to controls, update sortable

Files:

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

mochikit/branches/scriptaculous/MochiKit/Controls.js

@@ -37 +37 @@
-
-***/
+
+MochiKit.Form = {
+    serialize: function (form) {
+        var elements = MochiKit.Form.getElements(form);
+        var queryComponents = new Array();
+
+        for (var i = 0; i < elements.length; i++) {
+            var queryComponent = MochiKit.Form.serializeElement(elements[i]);
+            if (queryComponent) {
+                queryComponents.push(queryComponent);
+            }
+        }
+
+        return queryComponents.join('&');
+    },
+
+    getElements: function (form) {
+        form = MochiKit.DOM.getElement(form);
+        var elements = new Array();
+
+        for (tagName in MochiKit.Form.Serializers) {
+            var tagElements = form.getElementsByTagName(tagName);
+            for (var j = 0; j < tagElements.length; j++) {
+                elements.push(tagElements[j]);
+            }
+        }
+        return elements;
+    },
+
+    serializeElement: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        var method = element.tagName.toLowerCase();
+        var parameter = MochiKit.Form.Serializers[method](element);
+
+        if (parameter) {
+            var key = encodeURIComponent(parameter[0]);
+            if (key.length === 0) {
+                return;
+            }
+
+            if (parameter[1].constructor != Array) {
+                parameter[1] = [parameter[1]];
+            }
+
+            return parameter[1].map(function (value) {
+                return key + '=' + encodeURIComponent(value);
+            }).join('&');
+        }
+    }
+};
+
+MochiKit.Form.Serializers = {
+    input: function (element) {
+        switch (element.type.toLowerCase()) {
+            case 'submit':
+            case 'hidden':
+            case 'password':
+            case 'text':
+                return MochiKit.Form.Serializers.textarea(element);
+            case 'checkbox':
+            case 'radio':
+                return MochiKit.Form.Serializers.inputSelector(element);
+        }
+        return false;
+    },
+
+    inputSelector: function (element) {
+        if (element.checked) {
+            return [element.name, element.value];
+        }
+    },
+
+    textarea: function (element) {
+        return [element.name, element.value];
+    },
+
+    select: function (element) {
+        return MochiKit.Form.Serializers[element.type == 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    },
+
+    selectOne: function (element) {
+        var value = '', opt, index = element.selectedIndex;
+        if (index >= 0) {
+            opt = element.options[index];
+            value = opt.value;
+            if (!value && !('value' in opt)) {
+                value = opt.text;
+            }
+        }
+        return [element.name, value];
+    },
+
+    selectMany: function (element) {
+        var value = new Array();
+        for (var i = 0; i < element.length; i++) {
+            var opt = element.options[i];
+            if (opt.selected) {
+                var optValue = opt.value;
+                if (!optValue && !('value' in opt)) {
+                    optValue = opt.text;
+                }
+                value.push(optValue);
+            }
+        }
+        return [element.name, value];
+    }
+};
+
+var Ajax = {
+    activeRequestCount: 0
+};
+
+Ajax.Responders = {
+    responders: [],
+
+    register: function (responderToAdd) {
+        if (MochiKit.Base.find(this.responders, responderToAdd) == -1) {
+            this.responders.push(responderToAdd);
+        }
+    },
+
+    unregister: function (responderToRemove) {
+        this.responders = this.responders.without(responderToRemove);
+    },
+
+    dispatch: function (callback, request, transport, json) {
+        MochiKit.Iter.forEach(this.responders, function (responder) {
+            if (responder[callback] && 
+                typeof(responder[callback]) == 'function') {
+                try {
+                    responder[callback].apply(responder, [request, transport, json]);
+                } catch (e) {}
+            }
+        });
+    }
+};
+
+Ajax.Responders.register({
+    onCreate: function () {
+        Ajax.activeRequestCount++;
+    },
+
+    onComplete: function () {
+        Ajax.activeRequestCount--;
+    }
+});
+
+Ajax.Base = function () {};
+
+Ajax.Base.prototype = {
+    setOptions: function (options) {
+        this.options = {
+            method: 'post',
+            asynchronous: true,
+            parameters:   ''
+        }
+        MochiKit.Base.update(this.options, options || {});
+    },
+
+    responseIsSuccess: function () {
+        return this.transport.status == undefined
+            || this.transport.status === 0
+            || (this.transport.status >= 200 && this.transport.status < 300);
+    },
+
+    responseIsFailure: function () {
+        return !this.responseIsSuccess();
+    }
+};
+
+Ajax.Request = function (url, options) {
+    this.__init__(url, options);
+};
+
+Ajax.Request.Events = ['Uninitialized', 'Loading', 'Loaded',
+                       'Interactive', 'Complete'];
+
+MochiKit.Base.update(Ajax.Request.prototype, Ajax.Base.prototype);
+
+MochiKit.Base.update(Ajax.Request.prototype, {
+    __init__: function (url, options) {
+        this.transport = MochiKit.Async.getXMLHttpRequest();
+        this.setOptions(options);
+        this.request(url);
+    },
+
+    request: function (url) {
+        var parameters = this.options.parameters || '';
+        if (parameters.length > 0){
+            parameters += '&_=';
+        }
+
+        try {
+            this.url = url;
+            if (this.options.method == 'get' && parameters.length > 0) {
+                this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
+            }
+            Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+            this.transport.open(this.options.method, this.url,
+                                this.options.asynchronous);
+
+            if (this.options.asynchronous) {
+                this.transport.onreadystatechange = MochiKit.Base.bind(this.onStateChange, this);
+                setTimeout(MochiKit.Base.bind(function () {
+                    this.respondToReadyState(1);
+                }, this), 10);
+            }
+
+            this.setRequestHeaders();
+
+            var body = this.options.postBody ? this.options.postBody : parameters;
+            this.transport.send(this.options.method == 'post' ? body : null);
+
+        } catch (e) {
+            this.dispatchException(e);
+        }
+    },
+
+    setRequestHeaders: function () {
+        var requestHeaders = ['X-Requested-With', 'XMLHttpRequest'];
+
+        if (this.options.method == 'post') {
+            requestHeaders.push('Content-type',
+                                'application/x-www-form-urlencoded');
+
+            /* Force 'Connection: close' for Mozilla browsers to work around
+             * a bug where XMLHttpRequest sends an incorrect Content-length
+             * header. See Mozilla Bugzilla #246651.
+             */
+            if (this.transport.overrideMimeType) {
+                requestHeaders.push('Connection', 'close');
+            }
+        }
+
+        if (this.options.requestHeaders) {
+            requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+        }
+
+        for (var i = 0; i < requestHeaders.length; i += 2) {
+            this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+        }
+    },
+
+    onStateChange: function () {
+        var readyState = this.transport.readyState;
+        if (readyState != 1) {
+            this.respondToReadyState(this.transport.readyState);
+        }
+    },
+
+    header: function (name) {
+        try {
+          return this.transport.getResponseHeader(name);
+        } catch (e) {}
+    },
+
+    evalJSON: function () {
+        try {
+          return eval(this.header('X-JSON'));
+        } catch (e) {}
+    },
+
+    evalResponse: function () {
+        try {
+          return eval(this.transport.responseText);
+        } catch (e) {
+          this.dispatchException(e);
+        }
+    },
+
+    respondToReadyState: function (readyState) {
+        var event = Ajax.Request.Events[readyState];
+        var transport = this.transport, json = this.evalJSON();
+
+        if (event == 'Complete') {
+            try {
+                (this.options['on' + this.transport.status]
+                || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+                || MochiKit.Base.emptyFunction)(transport, json);
+            } catch (e) {
+                this.dispatchException(e);
+            }
+
+            if ((this.header('Content-type') || '').match(/^text\/javascript/i)) {
+                this.evalResponse();
+            }
+        }
+
+        try {
+            (this.options['on' + event] || MochiKit.Base.emptyFunction)(transport, json);
+            Ajax.Responders.dispatch('on' + event, this, transport, json);
+        } catch (e) {
+            this.dispatchException(e);
+        }
+
+        /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
+        if (event == 'Complete') {
+            this.transport.onreadystatechange = MochiKit.Base.emptyFunction;
+        }
+    },
+
+    dispatchException: function (exception) {
+        (this.options.onException || MochiKit.Base.emptyFunction)(this, exception);
+        Ajax.Responders.dispatch('onException', this, exception);
+    }
+});
+
+Ajax.Updater = function (container, url, options) {
+    this.__init__(container, url, options);
+};
+
+MochiKit.Base.update(Ajax.Updater.prototype, Ajax.Request.prototype);
+
+MochiKit.Base.update(Ajax.Updater.prototype, {
+    __init__: function (container, url, options) {
+        this.containers = {
+            success: container.success ? MochiKit.DOM.getElement(container.success) : MochiKit.DOM.getElement(container),
+            failure: container.failure ? MochiKit.DOM.getElement(container.failure) :
+                (container.success ? null : MochiKit.DOM.getElement(container))
+        }
+        this.transport = MochiKit.Async.getXMLHttpRequest();
+        this.setOptions(options);
+
+        var onComplete = this.options.onComplete || MochiKit.Base.emptyFunction;
+        this.options.onComplete = MochiKit.Base.bind(function (transport, object) {
+            this.updateContent();
+            onComplete(transport, object);
+        }, this);
+
+        this.request(url);
+    },
+
+    updateContent: function () {
+        var receiver = this.responseIsSuccess() ?
+            this.containers.success : this.containers.failure;
+        var response = this.transport.responseText;
+
+        if (!this.options.evalScripts) {
+            response = MochiKit.Base.stripScripts(response);
+        }
+
+        if (receiver) {
+            if (this.options.insertion) {
+                new this.options.insertion(receiver, response);
+            } else {
+                MochiKit.DOM.getElement(receiver).innerHTML =
+                    MochiKit.Base.stripScripts(response);
+                setTimeout(function() {
+                    MochiKit.Base.evalScripts(response);
+                }, 10);
+            }
+        }
+
+        if (this.responseIsSuccess()) {
+            if (this.onComplete) {
+                setTimeout(MochiKit.Base.bind(this.onComplete, this), 10);
+            }
+        }
+    }
+});
+
+var Field = {
+    clear: function () {
+        for (var i = 0; i < arguments.length; i++) {
+            MochiKit.DOM.getElement(arguments[i]).value = '';
+        }
+    },
+
+    focus: function (element) {
+        MochiKit.DOM.getElement(element).focus();
+    },
+
+    present: function () {
+        for (var i = 0; i < arguments.length; i++) {
+            if (MochiKit.DOM.getElement(arguments[i]).value == '') {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    select: function (element) {
+        MochiKit.DOM.getElement(element).select();
+    },
+
+    activate: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        element.focus();
+        if (element.select) {
+            element.select();
+        }
+    },
+    
+    scrollFreeActivate: function (field) {
+        setTimeout(function () {
+            Field.activate(field);
+        }, 1);
+    }
+};
-
-var Autocompleter = {};

mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js

@@ -181 +181 @@
-
-        if (this.options.accept) {
-Iter
+Base
-        }
-

mochikit/branches/scriptaculous/MochiKit/New.js

@@ -39 +39 @@
-        }, MochiKit.Base.extractScripts(str)));
-    },
+    
+    flatten: function (array) {
+        return MochiKit.Base.map(function (item) {
+            if (item.constructor == Array) {
+                return MochiKit.Base.flatten(item);
+            } else {
+                return item;
+            }
+        }, array);
+    },
-
-    isIE: function () {
@@ -58 +68 @@
-    isOpera: function () {
-        return navigator.userAgent.indexOf('Opera') > 0;
-    }
-});
-
-MochiKit.Base.update(MochiKit.Iter, {
-    flatten: function (array) {
-        return MochiKit.Iter.list(MochiKit.Iter.imap(function (item) {
-            if (item.constructor == Array) {
-                return MochiKit.Iter.list(MochiKit.Iter.flatten(item));
-            } else {
-                return item;
-            }
-        }, array));
-    }
-});
@@ -221 +219 @@
-
-    collectTextNodes: function (element) {
-Iter.flatten(MochiKit.Iter.i
+Base.flatten(MochiKit.Base.
-            if (node.nodeType == 3) {
-                return node.nodeValue;
@@ -232 +230 @@
-
-    collectTextNodesIgnoreClass: function (element, className) {
-Iter.flatten(MochiKit.Iter.i
+Base.flatten(MochiKit.Base.
-            if (node.nodeType == 3) {
-                return node.nodeValue;
@@ -508 +506 @@
-MochiKit.Event.observe(window, 'unload', MochiKit.Event.unloadCache, false);
-
-MochiKit.Form = {
-    serialize: function (form) {
-        var elements = MochiKit.Form.getElements(form);
-        var queryComponents = new Array();
-
-        for (var i = 0; i < elements.length; i++) {
-            var queryComponent = MochiKit.Form.serializeElement(elements[i]);
-            if (queryComponent) {
-                queryComponents.push(queryComponent);
-            }
-        }
-
-        return queryComponents.join('&');
-    },
-
-    getElements: function (form) {
-        form = MochiKit.DOM.getElement(form);
-        var elements = new Array();
-
-        for (tagName in MochiKit.Form.Serializers) {
-            var tagElements = form.getElementsByTagName(tagName);
-            for (var j = 0; j < tagElements.length; j++) {
-                elements.push(tagElements[j]);
-            }
-        }
-        return elements;
-    },
-
-    serializeElement: function (element) {
-        element = MochiKit.DOM.getElement(element);
-        var method = element.tagName.toLowerCase();
-        var parameter = MochiKit.Form.Serializers[method](element);
-
-        if (parameter) {
-            var key = encodeURIComponent(parameter[0]);
-            if (key.length === 0) {
-                return;
-            }
-
-            if (parameter[1].constructor != Array) {
-                parameter[1] = [parameter[1]];
-            }
-
-            return parameter[1].map(function (value) {
-                return key + '=' + encodeURIComponent(value);
-            }).join('&');
-        }
-    }
-};
-
-MochiKit.Form.Serializers = {
-    input: function (element) {
-        switch (element.type.toLowerCase()) {
-            case 'submit':
-            case 'hidden':
-            case 'password':
-            case 'text':
-                return MochiKit.Form.Serializers.textarea(element);
-            case 'checkbox':
-            case 'radio':
-                return MochiKit.Form.Serializers.inputSelector(element);
-        }
-        return false;
-    },
-
-    inputSelector: function (element) {
-        if (element.checked) {
-            return [element.name, element.value];
-        }
-    },
-
-    textarea: function (element) {
-        return [element.name, element.value];
-    },
-
-    select: function (element) {
-        return MochiKit.Form.Serializers[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    },
-
-    selectOne: function (element) {
-        var value = '', opt, index = element.selectedIndex;
-        if (index >= 0) {
-            opt = element.options[index];
-            value = opt.value;
-            if (!value && !('value' in opt)) {
-                value = opt.text;
-            }
-        }
-        return [element.name, value];
-    },
-
-    selectMany: function (element) {
-        var value = new Array();
-        for (var i = 0; i < element.length; i++) {
-            var opt = element.options[i];
-            if (opt.selected) {
-                var optValue = opt.value;
-                if (!optValue && !('value' in opt)) {
-                    optValue = opt.text;
-                }
-                value.push(optValue);
-            }
-        }
-        return [element.name, value];
-    }
-};
-
-var Ajax = {
-    activeRequestCount: 0
-};
-
-Ajax.Responders = {
-    responders: [],
-
-    register: function (responderToAdd) {
-        if (MochiKit.Base.find(this.responders, responderToAdd) == -1) {
-            this.responders.push(responderToAdd);
-        }
-    },
-
-    unregister: function (responderToRemove) {
-        this.responders = this.responders.without(responderToRemove);
-    },
-
-    dispatch: function (callback, request, transport, json) {
-        MochiKit.Iter.forEach(this.responders, function (responder) {
-            if (responder[callback] && 
-                typeof(responder[callback]) == 'function') {
-                try {
-                    responder[callback].apply(responder, [request, transport, json]);
-                } catch (e) {}
-            }
-        });
-    }
-};
-
-Ajax.Responders.register({
-    onCreate: function () {
-        Ajax.activeRequestCount++;
-    },
-
-    onComplete: function () {
-        Ajax.activeRequestCount--;
-    }
-});
-
-Ajax.Base = function () {};
-
-Ajax.Base.prototype = {
-    setOptions: function (options) {
-        this.options = {
-            method: 'post',
-            asynchronous: true,
-            parameters:   ''
-        }
-        MochiKit.Base.update(this.options, options || {});
-    },
-
-    responseIsSuccess: function () {
-        return this.transport.status == undefined
-            || this.transport.status === 0
-            || (this.transport.status >= 200 && this.transport.status < 300);
-    },
-
-    responseIsFailure: function () {
-        return !this.responseIsSuccess();
-    }
-};
-
-Ajax.Request = function (url, options) {
-    this.__init__(url, options);
-};
-
-Ajax.Request.Events = ['Uninitialized', 'Loading', 'Loaded',
-                       'Interactive', 'Complete'];
-
-MochiKit.Base.update(Ajax.Request.prototype, Ajax.Base.prototype);
-
-MochiKit.Base.update(Ajax.Request.prototype, {
-    __init__: function (url, options) {
-        this.transport = MochiKit.Async.getXMLHttpRequest();
-        this.setOptions(options);
-        this.request(url);
-    },
-
-    request: function (url) {
-        var parameters = this.options.parameters || '';
-        if (parameters.length > 0){
-            parameters += '&_=';
-        }
-
-        try {
-            this.url = url;
-            if (this.options.method == 'get' && parameters.length > 0) {
-                this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
-            }
-            Ajax.Responders.dispatch('onCreate', this, this.transport);
-
-            this.transport.open(this.options.method, this.url,
-                                this.options.asynchronous);
-
-            if (this.options.asynchronous) {
-                this.transport.onreadystatechange = MochiKit.Base.bind(this.onStateChange, this);
-                setTimeout(MochiKit.Base.bind(function () {
-                    this.respondToReadyState(1);
-                }, this), 10);
-            }
-
-            this.setRequestHeaders();
-
-            var body = this.options.postBody ? this.options.postBody : parameters;
-            this.transport.send(this.options.method == 'post' ? body : null);
-
-        } catch (e) {
-            this.dispatchException(e);
-        }
-    },
-
-    setRequestHeaders: function () {
-        var requestHeaders = ['X-Requested-With', 'XMLHttpRequest'];
-
-        if (this.options.method == 'post') {
-            requestHeaders.push('Content-type',
-                                'application/x-www-form-urlencoded');
-
-            /* Force 'Connection: close' for Mozilla browsers to work around
-             * a bug where XMLHttpRequest sends an incorrect Content-length
-             * header. See Mozilla Bugzilla #246651.
-             */
-            if (this.transport.overrideMimeType) {
-                requestHeaders.push('Connection', 'close');
-            }
-        }
-
-        if (this.options.requestHeaders) {
-            requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
-        }
-
-        for (var i = 0; i < requestHeaders.length; i += 2) {
-            this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
-        }
-    },
-
-    onStateChange: function () {
-        var readyState = this.transport.readyState;
-        if (readyState != 1) {
-            this.respondToReadyState(this.transport.readyState);
-        }
-    },
-
-    header: function (name) {
-        try {
-          return this.transport.getResponseHeader(name);
-        } catch (e) {}
-    },
-
-    evalJSON: function () {
-        try {
-          return eval(this.header('X-JSON'));
-        } catch (e) {}
-    },
-
-    evalResponse: function () {
-        try {
-          return eval(this.transport.responseText);
-        } catch (e) {
-          this.dispatchException(e);
-        }
-    },
-
-    respondToReadyState: function (readyState) {
-        var event = Ajax.Request.Events[readyState];
-        var transport = this.transport, json = this.evalJSON();
-
-        if (event == 'Complete') {
-            try {
-                (this.options['on' + this.transport.status]
-                || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
-                || MochiKit.Base.emptyFunction)(transport, json);
-            } catch (e) {
-                this.dispatchException(e);
-            }
-
-            if ((this.header('Content-type') || '').match(/^text\/javascript/i)) {
-                this.evalResponse();
-            }
-        }
-
-        try {
-            (this.options['on' + event] || MochiKit.Base.emptyFunction)(transport, json);
-            Ajax.Responders.dispatch('on' + event, this, transport, json);
-        } catch (e) {
-            this.dispatchException(e);
-        }
-
-        /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
-        if (event == 'Complete') {
-            this.transport.onreadystatechange = MochiKit.Base.emptyFunction;
-        }
-    },
-
-    dispatchException: function (exception) {
-        (this.options.onException || MochiKit.Base.emptyFunction)(this, exception);
-        Ajax.Responders.dispatch('onException', this, exception);
-    }
-});
-
-Ajax.Updater = function (container, url, options) {
-    this.__init__(container, url, options);
-};
-
-MochiKit.Base.update(Ajax.Updater.prototype, Ajax.Request.prototype);
-
-MochiKit.Base.update(Ajax.Updater.prototype, {
-    __init__: function (container, url, options) {
-        this.containers = {
-            success: container.success ? MochiKit.DOM.getElement(container.success) : MochiKit.DOM.getElement(container),
-            failure: container.failure ? MochiKit.DOM.getElement(container.failure) :
-                (container.success ? null : MochiKit.DOM.getElement(container))
-        }
-        this.transport = MochiKit.Async.getXMLHttpRequest();
-        this.setOptions(options);
-
-        var onComplete = this.options.onComplete || MochiKit.Base.emptyFunction;
-        this.options.onComplete = MochiKit.Base.bind(function (transport, object) {
-            this.updateContent();
-            onComplete(transport, object);
-        }, this);
-
-        this.request(url);
-    },
-
-    updateContent: function () {
-        var receiver = this.responseIsSuccess() ?
-            this.containers.success : this.containers.failure;
-        var response = this.transport.responseText;
-
-        if (!this.options.evalScripts) {
-            response = MochiKit.Base.stripScripts(response);
-        }
-
-        if (receiver) {
-            if (this.options.insertion) {
-                new this.options.insertion(receiver, response);
-            } else {
-                MochiKit.DOM.getElement(receiver).innerHTML =
-                    MochiKit.Base.stripScripts(response);
-                setTimeout(function() {
-                    MochiKit.Base.evalScripts(response);
-                }, 10);
-            }
-        }
-
-        if (this.responseIsSuccess()) {
-            if (this.onComplete) {
-                setTimeout(MochiKit.Base.bind(this.onComplete, this), 10);
-            }
-        }
-    }
-});
-
-var Field = {
-    clear: function () {
-        for (var i = 0; i < arguments.length; i++) {
-            MochiKit.DOM.getElement(arguments[i]).value = '';
-        }
-    },
-
-    focus: function (element) {
-        MochiKit.DOM.getElement(element).focus();
-    },
-
-    present: function () {
-        for (var i = 0; i < arguments.length; i++) {
-            if (MochiKit.DOM.getElement(arguments[i]).value == '') {
-                return false;
-            }
-        }
-        return true;
-    },
-
-    select: function (element) {
-        MochiKit.DOM.getElement(element).select();
-    },
-
-    activate: function (element) {
-        element = MochiKit.DOM.getElement(element);
-        element.focus();
-        if (element.select) {
-            element.select();
-        }
-    },
-    
-    scrollFreeActivate: function (field) {
-        setTimeout(function () {
-            Field.activate(field);
-        }, 1);
-    }
-};
-

mochikit/branches/scriptaculous/MochiKit/Sortable.js

@@ -59 +59 @@
-                return s.element == element;
-            }, this.sortables), function (s) {
-
+MochiKit.
-                MochiKit.Iter.forEach(s.droppables, function (d) {
-
+MochiKit.
-                });
-            s.draggables.invoke('destroy');
@@ -141 +141 @@
-        // drop on empty handling
-        if (options.dropOnEmpty) {
-
+MochiKit.
-            {containment: options.containment,
-             onHover: Sortable.onEmptyHover,
@@ -154 +154 @@
-                    options.handle, e)[0] : e;
-            options.draggables.push(
-
+MochiKit.
-                    MochiKit.Base.update(options_for_draggable,
-                                         {handle: handle})));
-
+MochiKit.
-            options.droppables.push(e);
-        });
@@ -165 +165 @@
-
-        // for onupdate
-
+MochiKit.
-            new SortableObserver(element, options.onUpdate));
-    },
@@ -190 +190 @@
-        });
-
-Iter
+Base
-    },
-