git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5bb0902
)
Fix for #1187, #1278 and #1279
author
Brandon Aaron
<brandon.aaron@gmail.com>
Thu, 21 Jun 2007 19:21:56 +0000
(19:21 +0000)
committer
Brandon Aaron
<brandon.aaron@gmail.com>
Thu, 21 Jun 2007 19:21:56 +0000
(19:21 +0000)
src/event/event.js
patch
|
blob
|
history
diff --git
a/src/event/event.js
b/src/event/event.js
index
623bcf3
..
bea2cba
100644
(file)
--- a/
src/event/event.js
+++ b/
src/event/event.js
@@
-148,7
+148,7
@@
jQuery.event = {
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
- if ( (val = element.$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') )
this.triggered = true;
if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@@
-577,7
+577,8
@@
jQuery.extend({
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
// Remove script element used by IE hack
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(); });
}
}
});
}
}
});
@@
-991,7
+992,7
@@
if (jQuery.browser.msie)
var els = global[type], i = els.length;
if ( i && type != 'unload' )
do
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);
}
});
while (--i);
}
});