git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Adding missing radix for paresInt.
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
75d231c
..
5f0adff
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-26,10
+26,10
@@
jQuery.event = {
var fn = handler;
// Create unique handler function, wrapped around original handler
var fn = handler;
// Create unique handler function, wrapped around original handler
- handler = function() {
+ handler = this.proxy( fn, function() {
// Pass arguments and context to original handler
return fn.apply(this, arguments);
// Pass arguments and context to original handler
return fn.apply(this, arguments);
- };
+ });
// Store data in unique handler
handler.data = data;
// Store data in unique handler
handler.data = data;
@@
-184,8
+184,16
@@
jQuery.event = {
event = !data[0] || !data[0].preventDefault;
// Pass along a fake event
event = !data[0] || !data[0].preventDefault;
// Pass along a fake event
- if ( event )
- data.unshift( { type: type, target: elem } );
+ if ( event ) {
+ data.unshift({
+ type: type,
+ target: elem,
+ preventDefault: function(){},
+ stopPropagation: function(){},
+ timeStamp: +new Date
+ });
+ data[0][expando] = true; // no need to fix fake event
+ }
// Enforce the right trigger type
data[0].type = type;
// Enforce the right trigger type
data[0].type = type;
@@
-265,19
+273,23
@@
jQuery.event = {
}
}
}
}
- // Clean up added properties in IE to prevent memory leak
- if (jQuery.browser.msie)
- event.target = event.preventDefault = event.stopPropagation =
- event.handler = event.data = null;
-
return val;
},
fix: function(event) {
return val;
},
fix: function(event) {
+ if ( event[expando] == true )
+ return event;
+
// store a copy of the original event object
// store a copy of the original event object
- // and clone to set read-only properties
+ // and "clone" to set read-only properties
var originalEvent = event;
var originalEvent = event;
- event = jQuery.extend({}, originalEvent);
+ event = { originalEvent: originalEvent };
+ var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+ for ( var i=props.length; i; i-- )
+ event[ props[i] ] = originalEvent[ props[i] ];
+
+ // Mark it as fixed
+ event[expando] = true;
// add preventDefault and stopPropagation since
// they will not work on the clone
// add preventDefault and stopPropagation since
// they will not work on the clone
@@
-305,7
+317,7
@@
jQuery.event = {
// check if target is a textnode (safari)
if ( event.target.nodeType == 3 )
// check if target is a textnode (safari)
if ( event.target.nodeType == 3 )
- event.target = originalEvent.target.parentNode;
+ event.target = event.target.parentNode;
// Add relatedTarget, if necessary
if ( !event.relatedTarget && event.fromElement )
// Add relatedTarget, if necessary
if ( !event.relatedTarget && event.fromElement )
@@
-334,6
+346,12
@@
jQuery.event = {
return event;
},
return event;
},
+ proxy: function( fn, proxy ){
+ // Set the guid of unique handler to the same of original handler, so it can be removed
+ proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+ return proxy;//so proxy can be declared as an argument
+ },
+
special: {
ready: {
setup: function() {
special: {
ready: {
setup: function() {
@@
-399,11
+417,12
@@
jQuery.fn.extend({
},
one: function( type, data, fn ) {
},
one: function( type, data, fn ) {
+ var one = jQuery.event.proxy( fn || data, function(event) {
+ jQuery(this).unbind(event, one);
+ return (fn || data).apply( this, arguments );
+ });
return this.each(function(){
return this.each(function(){
- jQuery.event.add( this, type, function(event) {
- jQuery(this).unbind(event);
- return (fn || data).apply( this, arguments);
- }, fn && data);
+ jQuery.event.add( this, type, one, fn && data);
});
},
});
},
@@
-425,20
+444,24
@@
jQuery.fn.extend({
return undefined;
},
return undefined;
},
- toggle: function() {
+ toggle: function( fn ) {
// Save reference to arguments for access in closure
// Save reference to arguments for access in closure
- var args = arguments;
+ var args = arguments, i = 1;
+
+ // link all the functions, so any of them can unbind this click handler
+ while( i < args.length )
+ jQuery.event.proxy( fn, args[i++] );
- return this.click(function(event) {
+ return this.click( jQuery.event.proxy( fn, function(event) {
// Figure out which function to execute
// Figure out which function to execute
- this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+ this.lastToggle = ( this.lastToggle || 0 ) % i;
// Make sure that clicks stop
event.preventDefault();
// and execute the function
// Make sure that clicks stop
event.preventDefault();
// and execute the function
- return args[this.lastToggle].apply( this, arguments ) || false;
- });
+ return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+ }));
},
hover: function(fnOver, fnOut) {
},
hover: function(fnOver, fnOut) {