git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed ajax array arguments in $.param
[jquery.git]
/
src
/
event
/
event.js
diff --git
a/src/event/event.js
b/src/event/event.js
index
623bcf3
..
b13e5a0
100644
(file)
--- a/
src/event/event.js
+++ b/
src/event/event.js
@@
-64,7
+64,7
@@
jQuery.event = {
// And bind the global event handler to the element
if (element.addEventListener)
element.addEventListener(type, element.$handle, false);
// 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);
}
element.attachEvent("on" + type, element.$handle);
}
@@
-112,7
+112,7
@@
jQuery.event = {
if ( !ret ) {
if (element.removeEventListener)
element.removeEventListener(type, element.$handle, false);
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];
element.detachEvent("on" + type, element.$handle);
ret = null;
delete events[type];
@@
-148,11
+148,15
@@
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 )
- this.triggered = true;
+ if ( jQuery.isFunction( element.$handle ) )
+ val = element.$handle.apply( element, data );
+ if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+ val = false;
- if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+ if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) {
+ this.triggered = true;
element[ type ]();
element[ type ]();
+ }
this.triggered = false;
}
this.triggered = false;
}
@@
-226,9
+230,9
@@
jQuery.event = {
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && event.clientX != null ) {
// 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 || 0);
+ event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
}
// Add which for key events
}
// Add which for key events
@@
-539,10
+543,9
@@
jQuery.fn.extend({
f.apply( document, [jQuery] );
// Otherwise, remember the function for later
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]) } );
// Add the function to the wait list
jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
- }
return this;
}
return this;
}
@@
-577,7
+580,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(); });
}
}
});
}
}
});
@@
-954,7
+958,7
@@
new function(){
// script does not exist if jQuery is loaded dynamically
if ( script )
script.onreadystatechange = function() {
// script does not exist if jQuery is loaded dynamically
if ( script )
script.onreadystatechange = function() {
- if ( this.readyState != "complete" ) return;
+ if ( document.readyState != "complete" ) return;
jQuery.ready();
};
jQuery.ready();
};
@@
-991,7
+995,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);
}
});