Changeset 723

Timestamp:

04/24/06 15:21:35 (2 years ago)

Author:

beau@hartshornesoftware.com

Message:

signal revamp

Files:

• mochikit/trunk/MochiKit/DOM.js (modified) (2 diffs)
• mochikit/trunk/MochiKit/Signal.js (modified) (10 diffs)
• mochikit/trunk/examples/draggable/draggable.js (modified) (3 diffs)
• mochikit/trunk/tests/test_Signal.js (modified) (3 diffs)

mochikit/trunk/MochiKit/DOM.js

@@ -204 +204 @@
-
-    /* 
-
-
-
+
+
+
+
+
-    */
-    elementPosition: function (elem, /* optional */relativeTo) {
@@ -239 +241 @@
-            
-                The IE shortcut is off by two:
-
-
+
-                
-            */

mochikit/trunk/MochiKit/Signal.js

@@ -49 +49 @@
-
-MochiKit.Base.update(MochiKit.Signal.Event.prototype, {
-
-    _fixPoint: function (point) {
-        /* 
-    
-            FIXME: inline this to avoid funciton call overhead? Does JS have
-            function call overhead? This code needs test coverage.
-        
-        */
-        if (typeof(point) == 'undefined' || point < 0) {
-            return 0;
-        }
-        return point;
-    },
-
-    event: function () {
@@ -90 +77 @@
-        m.alt = this._event.altKey;
-        m.ctrl = this._event.ctrlKey;
-ie and o
+IE and O
-        m.shift = this._event.shiftKey;
-        return m;
@@ -195 +182 @@
-            }
-        }
-Signal cannot handle this type of
+This is not a
-    },
-
-    mouse: function () {
-        var m = {};
+        var e = this._event;
+        
-        if (this.type() && (
-            this.type().indexOf('mouse') === 0 ||
-            this.type().indexOf('click') != -1 ||
-            this.type() == 'contextmenu')) {
-
+
+
+
-            m.client = new MochiKit.DOM.Coordinates(0, 0);
-this._event.clientX || this._event
-this._fixPoint(this._event.clientX)
-this._fixPoint(this._event.clientY)
+e.clientX || e
+(!e.clientX || e.clientX < 0) ? 0 : e.clientX
+(!e.clientY || e.clientY < 0) ? 0 : e.clientY
-            }
-
-            m.page = new MochiKit.DOM.Coordinates(0, 0);
-this._event.pageX || this._event
-this._fixPoint(this._event.pageX)
-this._fixPoint(this._event.pageY)
+e.pageX || e
+(!e.pageX || e.pageX < 0) ? 0 : e.pageX
+(!e.pageY || e.pageY < 0) ? 0 : e.pageY
-            } else {
-                /*
@@ -237 +228 @@
-                var b = MochiKit.DOM._document.body;
-            
-this._event
+e
-                    (de.scrollLeft || b.scrollLeft) - 
-                    (de.clientLeft || b.clientLeft);
-            
-this._event
+e
-                    (de.scrollTop || b.scrollTop) - 
-                    (de.clientTop || b.clientTop);
@@ -252 +243 @@
-                m.button.middle = false;
-
-this._event
-this._event
-this._event
-this._event
-this._event
+e
+e
+e
+e
+e
-
-                    /*
@@ -270 +261 @@
-                                                - Opera fires the event, and sets metaKey = true
-                                        
-browsers 
-
+
+browsers 
-                                        
-                    */
-                
-                } else {
-this._event
-this._event
-this._event
+e
+e
+e
-                }
-            }
@@ -407 +398 @@
-    },
-
-    _getSlot: function (slot, func) {
-        if (typeof(func) == 'string' || typeof(func) == 'function') {
-            if (typeof(func) == 'string' && 
-                typeof(slot[func]) == 'undefined') {
-                throw new Error('Invalid function slot');
-            }
-            slot = [slot, func];
-        } else if (!func && typeof(slot) == 'function') {
-            slot = [slot];
-        } else {
-            throw new Error('Invalid slot parameters');
-        }
-
-        return slot;
-    },
-
-    _unloadCache: function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        try {
-            window.onload = undefined;
@@ -462 +421 @@
-    },
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if (typeof(sig) != 'string') {
-            throw new Error("'sig' must be a string");
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            for (var i = 0; i < signals.length; i++) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    },
-
@@ -636 +536 @@
-    'connect',
-    'disconnect',
-signa
+disconnectAl
-];
-
@@ -663 +563 @@
-// XXX: Internet Explorer blows
-//
-signal = MochiKit.Signal.signal;
-connect = MochiKit.Signal.connect;
-disconnect = MochiKit.Signal.disconnect;
+disconnectAll = MochiKit.Signal.disconnectAll;
-
-MochiKit.Base._exportSymbols(this, MochiKit.Signal);

mochikit/trunk/examples/draggable/draggable.js

@@ -5 +5 @@
-*/
-Drag = {
+    _move: null,
+    _down: null,
+    
-    start: function(e) {
-        e.stop();
@@ -20 +23 @@
-            elementPosition(Drag._target));
-        
-
-
+Drag._move = 
+Drag._down = 
-    },
-
@@ -39 +42 @@
-    
-    _stop: function(e) {
-document, 'onmousemove', Drag._drag
-document, 'onmouseup', Drag._stop
+Drag._move
+Drag._down
-    }
-};

mochikit/trunk/tests/test_Signal.js

@@ -5 +5 @@
-tests.test_Signal = function (t) {
-    
-
-
-
-
+
+
-    var i = 0;
-        
-    var aFunction = function() {
-        i++;
@@ -22 +19 @@
-        i++;
-    };
-    
-    aObject.bMethod = function() {
-        i++;
-    };
-    
-    var bObject = {};
-    bObject.bMethod = function() {
-        i++;
-    };
-
+    ident = connect('submit', 'onclick', aFunction);
+    MochiKit.DOM.getElement('submit').click();
+    t.is(i, 1, 'HTML onclick event can be connected to a function');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    MochiKit.DOM.getElement('submit').click();
-
-
-
-
-
-
+
-
-    var submit = MochiKit.DOM.getElement('submit');
-
-
+ident = 
-    submit.click();
-6
+2
-
-submit, 'onclick', aFunction
+ident
-    submit.click();
-
-
-
-
-
-
-
+
-    
-    disconnect(hasSignals, 'signalOne', aObject, 'aMethod');
-    disconnect(hasSignals, 'signalOne', aObject, 'bMethod');
-    signal(hasSignals, 'signalOne');
-    t.is(i, 8, 'Disconnecting one signal from two slots in one object');
-
-
-    connect(hasSignals, 'signalOne', aObject, 'aMethod');
-    connect(hasSignals, 'signalOne', bObject, 'bMethod');
-    signal(hasSignals, 'signalOne');
-    t.is(i, 10, 'Connecting one signal to two slots in two objects');
-
-    disconnect(hasSignals, 'signalOne', aObject, 'aMethod');
-    disconnect(hasSignals, 'signalOne', bObject, 'bMethod');
-    signal(hasSignals, 'signalOne');
-    t.is(i, 10, 'Disconnecting one signal from two slots in two objects');
-    
-
-    try {
-        connect('submit', 'onclick', null);
-        submit.click();
-        t.ok(false, 'An exception was not raised when connecting null');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when connecting null');
-    }
-    try {
-        disconnect('submit', 'onclick', null);
-        t.ok(false, 'An exception was not raised when disconnecting null');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when disconnecting null');
-    }
-    
-    
-    try {
-        connect(nothing, 'signalOne', aObject, 'aMethod');
-        signal(nothing, 'signalOne');
-        t.ok(false, 'An exception was not raised when connecting undefined');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when connecting undefined');
-    }
-    try {
-        disconnect(nothing, 'signalOne', aObject, 'aMethod');
-        t.ok(false, 'An exception was not raised when disconnecting undefined');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when disconnecting undefined');
-    }
-    
-    
-    try {
-        connect(hasSignals, 'signalOne', nothing);
-        signal(hasSignals, 'signalOne');
-        t.ok(false, 'An exception was not raised when connecting an undefined function');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when connecting an undefined function');
-    }
-    try {
-        disconnect(hasSignals, 'signalOne', nothing);
-        t.ok(false, 'An exception was not raised when disconnecting an undefined function');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when disconnecting an undefined function');
-    }
-    
-    
-    try {
-        connect(hasSignals, 'signalOne', aObject, aObject.nothing);
-        signal(hasSignals, 'signalOne');
-        t.ok(false, 'An exception was not raised when connecting an undefined method');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when connecting an undefined method');
-    }
-    try {
-        disconnect(hasSignals, 'signalOne', aObject, aObject.nothing);
-        t.ok(false, 'An exception was not raised when disconnecting an undefined method');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when disconnecting an undefined method');
-    }
-    
-    try {
-        connect(hasSignals, 'signalOne', aObject, 'nothing');
-        signal(hasSignals, 'signalOne');
-        t.ok(false, 'An exception was not raised when connecting an undefined method (as string)');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when connecting an undefined method (as string)');
-    }
-    try {
-        disconnect(hasSignals, 'signalOne', aObject, 'nothing');
-        t.ok(false, 'An exception was not raised when disconnecting an undefined method (as string)');
-    } catch (e) {
-        t.ok(true, 'An exception was raised when disconnecting an undefined method (as string)');
-    }
-            
-    if (MochiKit.DOM.getElement('submit').fireEvent || 
-        (document.createEvent && 
@@ -247 +98 @@
-
-        
-
+ident = 
-        triggerMouseEvent('submit', 'mousedown', false);
-11
+3
-
-'submit', 'onmousedown', eventTes
+iden
-        triggerMouseEvent('submit', 'mousedown', false);
-11
+3
-        
-    }