Rolled back Joern's changes. They've been moved to another branch, and will be merged for 1.1.
This commit is contained in:
parent
44e4b36c08
commit
476cbd2f1a
|
@ -1583,8 +1583,8 @@ new function(){
|
||||||
var o = e[i];
|
var o = e[i];
|
||||||
|
|
||||||
// Handle event binding
|
// Handle event binding
|
||||||
jQuery.fn[o] = function(f, amount){
|
jQuery.fn[o] = function(f){
|
||||||
return f ? this.bind(o, f, amount) : this.trigger(o);
|
return f ? this.bind(o, f) : this.trigger(o);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Handle event unbinding
|
// Handle event unbinding
|
||||||
|
@ -1592,8 +1592,20 @@ new function(){
|
||||||
|
|
||||||
// Finally, handle events that only fire once
|
// Finally, handle events that only fire once
|
||||||
jQuery.fn["one"+o] = function(f){
|
jQuery.fn["one"+o] = function(f){
|
||||||
// use bind with amount param to bind only once
|
// Attach the event listener
|
||||||
return this.bind(o, f, 1);
|
return this.each(function(){
|
||||||
|
|
||||||
|
var count = 0;
|
||||||
|
|
||||||
|
// Add the event
|
||||||
|
jQuery.event.add( this, o, function(e){
|
||||||
|
// If this function has already been executed, stop
|
||||||
|
if ( count++ ) return true;
|
||||||
|
|
||||||
|
// And execute the bound function
|
||||||
|
return f.apply(this, [e]);
|
||||||
|
});
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
27
src/jquery/jquery.js
vendored
27
src/jquery/jquery.js
vendored
|
@ -2271,7 +2271,7 @@ jQuery.extend({
|
||||||
handle: function(event) {
|
handle: function(event) {
|
||||||
if ( typeof jQuery == "undefined" ) return false;
|
if ( typeof jQuery == "undefined" ) return false;
|
||||||
|
|
||||||
event = jQuery.event.fix( event );
|
event = event || jQuery.event.fix( window.event );
|
||||||
|
|
||||||
// If no correct event was found, fail
|
// If no correct event was found, fail
|
||||||
if ( !event ) return false;
|
if ( !event ) return false;
|
||||||
|
@ -2295,19 +2295,16 @@ jQuery.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
fix: function(event) {
|
fix: function(event) {
|
||||||
if(jQuery.browser.msie) {
|
if ( event ) {
|
||||||
event = window.event;
|
|
||||||
event.preventDefault = function() {
|
event.preventDefault = function() {
|
||||||
this.returnValue = false;
|
this.returnValue = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
event.stopPropagation = function() {
|
event.stopPropagation = function() {
|
||||||
this.cancelBubble = true;
|
this.cancelBubble = true;
|
||||||
};
|
};
|
||||||
event.target = event.srcElement;
|
|
||||||
} else if(jQuery.browser.safari && event.target.nodeType == 3) {
|
|
||||||
event = jQuery.extend({}, event);
|
|
||||||
event.target = event.target.parentNode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3399,29 +3396,15 @@ jQuery.macros = {
|
||||||
* } )
|
* } )
|
||||||
* @desc Stop only an event from bubbling by using the stopPropagation method.
|
* @desc Stop only an event from bubbling by using the stopPropagation method.
|
||||||
*
|
*
|
||||||
* @example $("form").bind( "submit", function(event) {
|
|
||||||
* // do something after submit
|
|
||||||
* }, 1 )
|
|
||||||
* @desc Executes the function only on the first submit event and removes it afterwards
|
|
||||||
*
|
|
||||||
* @name bind
|
* @name bind
|
||||||
* @type jQuery
|
* @type jQuery
|
||||||
* @param String type An event type
|
* @param String type An event type
|
||||||
* @param Function fn A function to bind to the event on each of the set of matched elements
|
* @param Function fn A function to bind to the event on each of the set of matched elements
|
||||||
* @param Number amount An optional amount of times to execute the bound function
|
|
||||||
* @cat Events
|
* @cat Events
|
||||||
*/
|
*/
|
||||||
bind: function( type, fn, amount ) {
|
bind: function( type, fn ) {
|
||||||
if ( fn.constructor == String )
|
if ( fn.constructor == String )
|
||||||
fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
|
fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
|
||||||
if( amount > 0 ) {
|
|
||||||
var element = this, handler = fn, count = 0;
|
|
||||||
fn = function(e) {
|
|
||||||
if( ++count >= amount )
|
|
||||||
jQuery(element).unbind(type, fn);
|
|
||||||
handler.apply(element, [e]);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
jQuery.event.add( this, type, fn );
|
jQuery.event.add( this, type, fn );
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue