Changeset 4173

Timestamp:

12/16/07 04:09:53 (1 year ago)

Author:

brandon.aaron

Message:

Renaming variables to be more consistent

Files:

• trunk/jquery/src/event.js (modified) (14 diffs)

trunk/jquery/src/event.js

@@ -8 +8 @@
     // Bind an event to an element
     // Original by Dean Edwards
-    add: function(element, types, handler, data) {
-        if ( element.nodeType == 3 || element.nodeType == 8 )
+    add: function(elem, types, handler, data) {
+        if ( elem.nodeType == 3 || elem.nodeType == 8 )
             return;
 
         // For whatever reason, IE has trouble passing the window object
         // around, causing it to be cloned in the process
-        if ( jQuery.browser.msie && element.setInterval != undefined )
-            element = window;
+        if ( jQuery.browser.msie && elem.setInterval != undefined )
+            elem = window;
 
         // Make sure that the function being executed has a unique ID
@@ -40 +40 @@
 
         // Init the element's event structure
-        var events = jQuery.data(element, "events") || jQuery.data(element, "events", {}),
-            handle = jQuery.data(element, "handle") || jQuery.data(element, "handle", function(){
+        var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
+            handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
                 // returned undefined or false
                 var val;
@@ -50 +50 @@
                     return val;
         
-                val = jQuery.event.handle.apply(element, arguments);
+                val = jQuery.event.handle.apply(elem, arguments);
         
                 return val;
@@ -73 +73 @@
                     // Only use addEventListener/attachEvent if the special
                     // events handler returns false
-                    if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(element) === false ) {
+                    if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
                         // Bind the global event handler to the element
-                        if (element.addEventListener)
-                            element.addEventListener(type, handle, false);
-                        else if (element.attachEvent)
-                            element.attachEvent("on" + type, handle);
+                        if (elem.addEventListener)
+                            elem.addEventListener(type, handle, false);
+                        else if (elem.attachEvent)
+                            elem.attachEvent("on" + type, handle);
                     }
                 }
@@ -94 +94 @@
 
     // Detach an event or set of events from an element
-    remove: function(element, types, handler) {
+    remove: function(elem, types, handler) {
         // don't do events on text and comment nodes
-        if ( element.nodeType == 3 || element.nodeType == 8 )
+        if ( elem.nodeType == 3 || elem.nodeType == 8 )
             return;
 
-        var events = jQuery.data(element, "events"), ret, index;
+        var events = jQuery.data(elem, "events"), ret, index;
 
         if ( events ) {
@@ -105 +105 @@
             if ( !types )
                 for ( var type in events )
-                    this.remove( element, type );
+                    this.remove( elem, type );
             else {
                 // types is actually an event object here
@@ -135 +135 @@
                         for ( ret in events[type] ) break;
                         if ( !ret ) {
-                            if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(this, element) === false ) {
-                                if (element.removeEventListener)
-                                    element.removeEventListener(type, jQuery.data(element, "handle"), false);
-                                else if (element.detachEvent)
-                                    element.detachEvent("on" + type, jQuery.data(element, "handle"));
+                            if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(this, elem) === false ) {
+                                if (elem.removeEventListener)
+                                    elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
+                                else if (elem.detachEvent)
+                                    elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
                             }
                             ret = null;
@@ -151 +151 @@
             for ( ret in events ) break;
             if ( !ret ) {
-                jQuery.removeData( element, "events" );
-                jQuery.removeData( element, "handle" );
+                jQuery.removeData( elem, "events" );
+                jQuery.removeData( elem, "handle" );
             }
         }
     },
 
-    trigger: function(type, data, element, donative, extra) {
+    trigger: function(type, data, elem, donative, extra) {
         // Clone the incoming data, if any
         data = jQuery.makeArray(data || []);
 
         // Handle a global trigger
-        if ( !element ) {
+        if ( !elem ) {
             // Only trigger if we've ever bound an event for it
             if ( this.global[type] )
@@ -170 +170 @@
         } else {
             // don't do events on text and comment nodes
-            if ( element.nodeType == 3 || element.nodeType == 8 )
+            if ( elem.nodeType == 3 || elem.nodeType == 8 )
                 return undefined;
 
-            var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+            var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
                 // Check to see if we need to provide a fake event, or not
                 event = !data[0] || !data[0].preventDefault;
@@ -179 +179 @@
             // Pass along a fake event
             if ( event )
-                data.unshift( this.fix({ type: type, target: element }) );
+                data.unshift( this.fix({ type: type, target: elem }) );
 
             // Enforce the right trigger type
@@ -185 +185 @@
 
             // Trigger the event
-            if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
-                val = jQuery.data(element, "handle").apply( element, data );
+            if ( jQuery.isFunction( jQuery.data(elem, "handle") ) )
+                val = jQuery.data(elem, "handle").apply( elem, data );
 
             // Handle triggering native .onfoo handlers
-            if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+            if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
                 val = false;
 
@@ -199 +199 @@
             if ( extra ) {
                 // call the extra function and tack the current return value on the end for possible inspection
-                var ret = extra.apply( element, data.concat( val ) );
+                var ret = extra.apply( elem, data.concat( val ) );
                 // if anything is returned, give it precedence and have it overwrite the previous value
                 if (ret !== undefined)
@@ -206 +206 @@
 
             // Trigger the native events (except for clicks on links)
-            if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+            if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
                 this.triggered = true;
                 try {
-                    element[ type ]();
+                    elem[ type ]();
                 // prevent IE from throwing an error for some hidden elements
                 } catch (e) {}
@@ -490 +490 @@
 // Checks if an event happened on an element within another element
 // Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function(event, element) {
+var withinElement = function(event, elem) {
     // Check if mouse(over|out) are still within the same parent element
     var parent = event.relatedTarget;
     // Traverse up the tree
-    while ( parent && parent != element ) try { parent = parent.parentNode } catch(error) { parent = element; };
+    while ( parent && parent != elem ) try { parent = parent.parentNode } catch(error) { parent = elem; };
     // Return true if we actually just moused on to a sub-element
-    return parent == element;
+    return parent == elem;
 };