deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved jQuery.proxy() into core.

Browse source
This commit is contained in:
jeresig 2009-12-31 15:06:45 -05:00
parent 66975de2d2
commit a5dbca4a06
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core.js
View file

@ -614,6 +614,26 @@ jQuery.extend({
return ret.concat.apply( [], ret ); return ret.concat.apply( [], ret );
}, },
// A global GUID counter for objects
guid: 1,
proxy: function( fn, proxy, thisObject ) {
if ( arguments.length === 2 && proxy && !jQuery.isFunction( proxy ) ) {
thisObject = proxy;
proxy = undefined;
}
proxy = proxy || function() {
return fn.apply( thisObject || this, arguments );
};
// 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 || jQuery.guid++;
// So proxy can be declared as an argument
return proxy;
},
// Use of jQuery.browser is frowned upon. // Use of jQuery.browser is frowned upon.
// More details: http://docs.jquery.com/Utilities/jQuery.browser // More details: http://docs.jquery.com/Utilities/jQuery.browser
browser: { browser: {

23
src/event.js
View file

@ -26,7 +26,7 @@ jQuery.event = {
// Make sure that the function being executed has a unique ID // Make sure that the function being executed has a unique ID
if ( !handler.guid ) { if ( !handler.guid ) {
handler.guid = this.guid++; handler.guid = jQuery.guid++;
} }
// if data is passed, bind to handler // if data is passed, bind to handler
@ -114,7 +114,6 @@ jQuery.event = {
elem = null; elem = null;
}, },
guid: 1,
global: {}, global: {},
// Detach an event or set of events from an element // Detach an event or set of events from an element
@ -405,6 +404,8 @@ jQuery.event = {
return event; return event;
}, },
proxy: jQuery.proxy,
special: { special: {
ready: { ready: {
// Make sure the ready event is setup // Make sure the ready event is setup
@ -456,24 +457,6 @@ jQuery.event = {
} }
}; };
jQuery.event.proxy = jQuery.proxy = function( fn, proxy, thisObject ) {
if ( proxy !== undefined && !jQuery.isFunction( proxy ) ) {
thisObject = proxy;
proxy = undefined;
}
// FIXME: Should proxy be redefined to be applied with thisObject if defined?
proxy = proxy || function() {
return fn.apply( thisObject !== undefined ? thisObject : this, arguments );
};
// 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 || jQuery.event.guid++;
// So proxy can be declared as an argument
return proxy;
};
jQuery.Event = function( src ) { jQuery.Event = function( src ) {
// Allow instantiation without the 'new' keyword // Allow instantiation without the 'new' keyword
if ( !this.preventDefault ) { if ( !this.preventDefault ) {