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

Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming

Browse source 
Conflicts:
	src/core.js
	src/css.js
	src/event.js
This commit is contained in:
John Resig 2011-04-12 16:05:40 -04:00
commit 978c065555
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/core.js
View file

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

2
src/event.js
View file

@ -275,7 +275,7 @@ jQuery.event = {
"changeData": true "changeData": true
}, },
trigger: function( event, data, elem ) { trigger: function( event, data, elem, bubbling /* For Internal Use Only */ ) {
// Event object or event type // Event object or event type
var type = event.type || event, var type = event.type || event,
namespaces = [], namespaces = [],