Changeset 570

Timestamp:

01/25/06 02:57:43 (3 years ago)

Author:

therve@gmail.com

Message:

Reduce Event, update Controls for Signal

Files:

• mochikit/branches/scriptaculous/MochiKit/Controls.js (modified) (8 diffs)
• mochikit/branches/scriptaculous/MochiKit/New.js (modified) (2 diffs)

mochikit/branches/scriptaculous/MochiKit/Controls.js

@@ -488 +488 @@
-        MochiKit.DOM.hideElement(this.update);
-
-Event.observe(this.element, '
-MochiKit.DOM.bindAsEventListener
-Event.observe(this.element, '
-MochiKit.DOM.bindAsEventListener
+Signal.connect(this.element, 'on
+                    MochiKit.Base.bind
+Signal.connect(this.element, 'on
+                    MochiKit.Base.bind
-    },
-
@@ -542 +542 @@
-    onKeyPress: function (event) {
-        if (this.active) {
-
-
-
+
-                 this.selectEntry();
-                 MochiKit.Event.stop(event);
- case MochiKit.Event.KEY_ESC:
+} else if (event.keyString == "KEY_ESCAPE") {
-                 this.hide();
-                 this.active = false;
-                 MochiKit.Event.stop(event);
-                 return;
-
-
+
-                 return;
-
+
+
-                 this.markPrevious();
-                 this.render();
-                 if (MochiKit.Base.isSafari()) {
-MochiKit.Event.stop(event
+event.stop(
-                 }
-                 return;
-
+
+
-                 this.markNext();
-                 this.render();
-                 if (MochiKit.Base.isSafari()) {
-MochiKit.Event.stop(event
+event.stop(
-                 }
-                 return;
-            }
-        } else {
-Code == MochiKit.Event.KEY_TAB || event.keyCode == MochiKit.Event.KEY_RETURN
+String == "KEY_TAB" || event.keyString == "KEY_RETURN"
-                return;
-            }
@@ -592 +591 @@
-            this.render();
-        }
-MochiKit.Event.stop(event
+event.stop(
-    },
-
@@ -712 +711 @@
-
-    addObservers: function (element) {
-Event.observe(element, '
-MochiKit.DOM.bindAsEventListener
-Event.observe(element, '
-MochiKit.DOM.bindAsEventListener
+Signal.connect(element, 'on
+                    MochiKit.Base.bind
+Signal.connect(element, 'on
+                    MochiKit.Base.bind
-    },
-
@@ -964 +963 @@
-        this.element.title = this.options.clickToEditText;
-
-DOM.bindAsEventListener
-DOM.bindAsEventListener
-DOM.bindAsEventListener
-Event.observe
-Event.observe
-Event.observe
+Base.bind
+Base.bind
+Base.bind
+Signal.connect
+Signal.connect
+Signal.connect
-        if (this.options.externalControl) {
-Event.observe
-Event.observe
-Event.observe
+Signal.connect
+Signal.connect
+Signal.connect
-        }
-    },
@@ -995 +994 @@
-        // stop the event to avoid a page refresh in Safari
-        if (evt) {
-MochiKit.Event.stop(evt
+evt.stop(
-        }
-        return false;
@@ -1149 +1148 @@
-        // stop the event to avoid a page refresh in Safari
-        if (arguments.length > 1) {
-MochiKit.Event.stop(arguments[0]
+arguments[0].stop(
-        }
-        return false;
@@ -1233 +1232 @@
-        }
-        this.leaveEditMode();
-Event.stopObserving
-Event.stopObserving
-Event.stopObserving
+Signal.disconnect
+Signal.disconnect
+Signal.disconnect
-        if (this.options.externalControl) {
-Event.stopObserving
-Event.stopObserving
-Event.stopObserving
+Signal.disconnect
+Signal.disconnect
+Signal.disconnect
-        }
-    }

mochikit/branches/scriptaculous/MochiKit/New.js

@@ -400 +400 @@
-
-MochiKit.Event = {
-    KEY_BACKSPACE: 8,
-    KEY_TAB: 9,
-    KEY_RETURN: 13,
-    KEY_ESC: 27,
-    KEY_LEFT: 37,
-    KEY_UP: 38,
-    KEY_RIGHT: 39,
-    KEY_DOWN: 40,
-    KEY_DELETE: 46,
-
-    element: function (event) {
-        return event.target || event.srcElement;
-    },
-
-    isLeftClick: function (event) {
-        return (((event.which) && (event.which == 1)) ||
-                ((event.button) && (event.button == 1)));
-    },
-
-    pointerX: function (event) {
-        return event.pageX || (event.clientX +
-            (document.documentElement.scrollLeft || document.body.scrollLeft));
-    },
-
-    pointerY: function (event) {
-        return event.pageY || (event.clientY +
-            (document.documentElement.scrollTop || document.body.scrollTop));
-    },
-
-    stop: function (event) {
-        if (event.preventDefault) {
-            event.preventDefault();
-            event.stopPropagation();
-        } else {
-            event.returnValue = false;
-            event.cancelBubble = true;
-        }
-    },
-
-    // find the first node with the given tagName, starting from the
-    // node the event was triggered on; traverses the DOM upwards
-    findElement: function (event, tagName) {
-MochiKit.Event.element(event)
+event.target
-        while (element.parentNode && (!element.tagName ||
-              (element.tagName.toUpperCase() != tagName.toUpperCase()))) {
@@ -448 +409 @@
-        }
-        return element;
-    },
-
-    observers: false,
-
-    _observeAndCache: function (element, name, observer, useCapture) {
-        if (!this.observers) {
-            this.observers = [];
-        }
-        if (element.addEventListener) {
-            this.observers.push([element, name, observer, useCapture]);
-            element.addEventListener(name, observer, useCapture);
-        } else if (element.attachEvent) {
-            this.observers.push([element, name, observer, useCapture]);
-            element.attachEvent('on' + name, observer);
-        }
-    },
-
-    unloadCache: function () {
-        if (!MochiKit.Event.observers) {
-            return;
-        }
-        for (var i = 0; i < MochiKit.Event.observers.length; i++) {
-            MochiKit.Event.stopObserving.apply(this, MochiKit.Event.observers[i]);
-            MochiKit.Event.observers[i][0] = null;
-        }
-        MochiKit.Event.observers = false;
-    },
-
-    observe: function (element, name, observer, useCapture) {
-        var element = MochiKit.DOM.getElement(element);
-        useCapture = useCapture || false;
-
-        if (name == 'keypress' && (MochiKit.Base.isKHTML() || element.attachEvent)) {
-            name = 'keydown';
-        }
-
-        this._observeAndCache(element, name, observer, useCapture);
-    },
-
-    stopObserving: function (element, name, observer, useCapture) {
-        var element = MochiKit.DOM.getElement(element);
-        useCapture = useCapture || false;
-
-        if (name == 'keypress' && (MochiKit.Base.isKHTML() || element.detachEvent)) {
-            name = 'keydown';
-        }
-
-        if (element.removeEventListener) {
-            element.removeEventListener(name, observer, useCapture);
-        } else if (element.detachEvent) {
-            element.detachEvent('on' + name, observer);
-        }
-    }
-};
-
-/* prevent memory leaks in IE */
-MochiKit.Event.observe(window, 'unload', MochiKit.Event.unloadCache, false);
-