Changed $.sub internals to match sub naming, added some more spacing in some areas for readability

This commit is contained in:
Timmy Willison 2011-02-06 19:34:57 -05:00
parent d6fbbe1080
commit 82626799ca
3 changed files with 27 additions and 29 deletions

View file

@ -982,24 +982,24 @@ jQuery.extend({
},
sub: function() {
function jQuerySubclass( selector, context ) {
return new jQuerySubclass.fn.init( selector, context );
function jQuerySub( selector, context ) {
return new jQuerySub.fn.init( selector, context );
}
jQuery.extend( true, jQuerySubclass, this );
jQuerySubclass.superclass = this;
jQuerySubclass.fn = jQuerySubclass.prototype = this();
jQuerySubclass.fn.constructor = jQuerySubclass;
jQuerySubclass.subclass = this.subclass;
jQuerySubclass.fn.init = function init( selector, context ) {
if ( context && context instanceof jQuery && !(context instanceof jQuerySubclass) ) {
context = jQuerySubclass(context);
jQuery.extend( true, jQuerySub, this );
jQuerySub.superclass = this;
jQuerySub.fn = jQuerySub.prototype = this();
jQuerySub.fn.constructor = jQuerySub;
jQuerySub.sub = this.sub;
jQuerySub.fn.init = function init( selector, context ) {
if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
context = jQuerySub( context );
}
return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass );
return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
};
jQuerySubclass.fn.init.prototype = jQuerySubclass.fn;
var rootjQuerySubclass = jQuerySubclass(document);
return jQuerySubclass;
jQuerySub.fn.init.prototype = jQuerySub.fn;
var rootjQuerySub = jQuerySub(document);
return jQuerySub;
},
browser: {}

View file

@ -294,11 +294,9 @@ jQuery.event = {
}
},
// bubbling is internal
trigger: function( event, data, elem /*, bubbling */ ) {
trigger: function( event, data, elem, bubbling /* For Internal Use Only */ ) {
// Event object or event type
var type = event.type || event,
bubbling = arguments[3];
var type = event.type || event;
if ( !bubbling ) {
event = typeof event === "object" ?