Did some minor tidying up.

[jquery.git] / src / event / event.js

diff --git a/src/event/event.js b/src/event/event.js
index fe43579..5d8e89a 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -41,7 +41,17 @@ jQuery.event = {
                
                if (!element.$handle)
                        element.$handle = function() {
-                               jQuery.event.handle.apply(element, arguments);
+                               // returned undefined or false
+                               var val;
+
+                               // Handle the second event of a trigger and when
+                               // an event is called after a page has unloaded
+                               if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+                                 return val;
+                               
+                               val = jQuery.event.handle.apply(element, arguments);
+                               
+                               return val;
                        };
 
                // Get the current list of functions bound to this event
@@ -54,7 +64,7 @@ jQuery.event = {
                        // And bind the global event handler to the element
                        if (element.addEventListener)
                                element.addEventListener(type, element.$handle, false);
-                       else if (element.attachEvent)
+                       else
                                element.attachEvent("on" + type, element.$handle);
                }
 
@@ -102,7 +112,7 @@ jQuery.event = {
                                if ( !ret ) {
                                        if (element.removeEventListener)
                                                element.removeEventListener(type, element.$handle, false);
-                                       else if (element.detachEvent)
+                                       else
                                                element.detachEvent("on" + type, element.$handle);
                                        ret = null;
                                        delete events[type];
@@ -138,7 +148,7 @@ jQuery.event = {
                        data.unshift( this.fix({ type: type, target: element }) );
 
                        // Trigger the event
-                       if ( (val = this.handle.apply( element, data )) !== false )
+                       if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
                                this.triggered = true;
 
                        if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@@ -151,11 +161,6 @@ jQuery.event = {
        handle: function(event) {
                // returned undefined or false
                var val;
-               
-               // Handle the second event of a trigger and when
-               // an event is called after a page has unloaded
-               if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-                 return val;
 
                // Empty object is for triggered events with no data
                event = jQuery.event.fix( event || window.event || {} ); 
@@ -221,9 +226,9 @@ jQuery.event = {
 
                // Calculate pageX/Y if missing and clientX/Y available
                if ( event.pageX == null && event.clientX != null ) {
-                       var e = document.documentElement || document.body;
-                       event.pageX = event.clientX + e.scrollLeft;
-                       event.pageY = event.clientY + e.scrollTop;
+                       var e = document.documentElement, b = document.body;
+                       event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft);
+                       event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop);
                }
                        
                // Add which for key events
@@ -534,10 +539,9 @@ jQuery.fn.extend({
                        f.apply( document, [jQuery] );
                        
                // Otherwise, remember the function for later
-               else {
+               else
                        // Add the function to the wait list
                        jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
-               }
        
                return this;
        }
@@ -572,7 +576,8 @@ jQuery.extend({
                                document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
                        
                        // Remove script element used by IE hack
-                       jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+                       if( !window.frames.length ) // don't remove if frames are present (#1187)
+                               jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
                }
        }
 });
@@ -986,7 +991,7 @@ if (jQuery.browser.msie)
                        var els = global[type], i = els.length;
                        if ( i && type != 'unload' )
                                do
-                                       jQuery.event.remove(els[i-1], type);
+                                       els[i-1] && jQuery.event.remove(els[i-1], type);
                                while (--i);
                }
        });