aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimmy Willison <tim.willison@thisismedium.com>2011-02-06 19:34:57 -0500
committerTimmy Willison <tim.willison@thisismedium.com>2011-02-06 19:34:57 -0500
commit82626799cacef94a1b35d0a0b4d284b38104704b (patch)
treeb8e3dd3899e7df419f3834618f6a4f4490cc71db /src
parentd6fbbe1080fdcaf8eb22753eddf000aeb7d99545 (diff)
downloadjquery-82626799cacef94a1b35d0a0b4d284b38104704b.tar.gz
jquery-82626799cacef94a1b35d0a0b4d284b38104704b.zip
Changed $.sub internals to match sub naming, added some more spacing in some areas for readability
Diffstat (limited to 'src')
-rw-r--r--src/core.js36
-rw-r--r--src/css.js14
-rw-r--r--src/event.js6
3 files changed, 27 insertions, 29 deletions
diff --git a/src/core.js b/src/core.js
index 2e6347236..1bc4c1cfb 100644
--- a/src/core.js
+++ b/src/core.js
@@ -441,7 +441,7 @@ jQuery.extend({
} else if ( document.attachEvent ) {
// ensure firing before onload,
// maybe late but safe also for iframes
- document.attachEvent("onreadystatechange", DOMContentLoaded);
+ document.attachEvent( "onreadystatechange", DOMContentLoaded );
// A fallback to window.onload, that will always work
window.attachEvent( "onload", jQuery.ready );
@@ -598,7 +598,7 @@ jQuery.extend({
each: function( object, callback, args ) {
var name, i = 0,
length = object.length,
- isObj = length === undefined || jQuery.isFunction(object);
+ isObj = length === undefined || jQuery.isFunction( object );
if ( args ) {
if ( isObj ) {
@@ -625,7 +625,7 @@ jQuery.extend({
}
} else {
for ( var value = object[0];
- i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+ i < length && callback.call( value, i, value ) !== false; value = object[ ++i ] ) {}
}
}
@@ -656,7 +656,7 @@ jQuery.extend({
// The extra typeof function check is to prevent crashes
// in Safari 2 (See: #3039)
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
- var type = jQuery.type(array);
+ var type = jQuery.type( array );
if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
push.call( ret, array );
@@ -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: {}
diff --git a/src/css.js b/src/css.js
index 19c6342d2..968188d6e 100644
--- a/src/css.js
+++ b/src/css.js
@@ -215,8 +215,8 @@ if ( !jQuery.support.opacity ) {
jQuery.cssHooks.opacity = {
get: function( elem, computed ) {
// IE uses filters for opacity
- return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
- (parseFloat(RegExp.$1) / 100) + "" :
+ return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+ ( parseFloat( RegExp.$1 ) / 100 ) + "" :
computed ? "1" : "";
},
@@ -228,13 +228,13 @@ if ( !jQuery.support.opacity ) {
style.zoom = 1;
// Set the alpha filter to set the opacity
- var opacity = jQuery.isNaN(value) ?
- "" :
- "alpha(opacity=" + value * 100 + ")",
+ var opacity = jQuery.isNaN( value ) ?
+ "" :
+ "alpha(opacity=" + value * 100 + ")",
filter = style.filter || "";
- style.filter = ralpha.test(filter) ?
- filter.replace(ralpha, opacity) :
+ style.filter = ralpha.test( filter ) ?
+ filter.replace( ralpha, opacity ) :
style.filter + ' ' + opacity;
}
};
diff --git a/src/event.js b/src/event.js
index 2d53562ad..01b05149a 100644
--- a/src/event.js
+++ b/src/event.js
@@ -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" ?