diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2014-07-17 10:25:59 -0700 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2014-07-17 11:08:37 -0700 |
commit | 91e06e9aebecf67a5c4997408bf0a28fffd03f9d (patch) | |
tree | 2542fcea18d695dec17642b89ff0beb9dcc3f330 /src | |
parent | 511eb1540bba2fbd45b6399c60ca361f11e572df (diff) | |
download | jquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.tar.gz jquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.zip |
Build: update grunt-jscs-checker and pass with the new rules
Conflicts:
build/tasks/build.js
src/ajax/xhr.js
src/attributes/classes.js
src/attributes/prop.js
src/attributes/val.js
src/core/init.js
src/core/ready.js
src/css.js
src/css/curCSS.js
src/css/defaultDisplay.js
src/data.js
src/data/var/dataPriv.js
src/data/var/dataUser.js
src/dimensions.js
src/effects.js
src/event.js
src/manipulation.js
src/offset.js
src/queue.js
src/selector-native.js
test/data/testrunner.js
Diffstat (limited to 'src')
34 files changed, 300 insertions, 138 deletions
diff --git a/src/ajax.js b/src/ajax.js index caffe883d..7a0ac1f07 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -49,7 +49,7 @@ var // a field from window.location if document.domain has been set try { ajaxLocation = location.href; -} catch( e ) { +} catch ( e ) { // Use the href attribute of an A element // since IE will modify it given document.location ajaxLocation = document.createElement( "a" ); @@ -103,7 +103,9 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX inspected[ dataType ] = true; jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) { var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR ); - if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) { + if ( typeof dataTypeOrTransport === "string" && + !seekingTransport && !inspected[ dataTypeOrTransport ] ) { + options.dataTypes.unshift( dataTypeOrTransport ); inspect( dataTypeOrTransport ); return false; @@ -275,7 +277,10 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) { try { response = conv( response ); } catch ( e ) { - return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current }; + return { + state: "parsererror", + error: conv ? e : "No conversion from " + prev + " to " + current + }; } } } @@ -412,9 +417,10 @@ jQuery.extend({ // Callbacks context callbackContext = s.context || s, // Context for global events is callbackContext if it is a DOM node or jQuery collection - globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ? - jQuery( callbackContext ) : - jQuery.event, + globalEventContext = s.context && + ( callbackContext.nodeType || callbackContext.jquery ) ? + jQuery( callbackContext ) : + jQuery.event, // Deferreds deferred = jQuery.Deferred(), completeDeferred = jQuery.Callbacks("once memory"), @@ -506,7 +512,9 @@ jQuery.extend({ // Add protocol if not provided (#5866: IE7 issue with protocol-less urls) // Handle falsy url in the settings object (#10093: consistency with old signature) // We also use the url parameter if available - s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" ); + s.url = ( ( url || s.url || ajaxLocation ) + "" ) + .replace( rhash, "" ) + .replace( rprotocol, ajaxLocParts[ 1 ] + "//" ); // Alias method option to type as per ticket #12004 s.type = options.method || options.type || s.method || s.type; @@ -597,7 +605,8 @@ jQuery.extend({ jqXHR.setRequestHeader( "Accept", s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? - s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : + s.accepts[ s.dataTypes[0] ] + + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : s.accepts[ "*" ] ); @@ -607,7 +616,9 @@ jQuery.extend({ } // Allow custom headers/mimetypes and early abort - if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) { + if ( s.beforeSend && + ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) { + // Abort if not done already and return return jqXHR.abort(); } diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index ff0d53899..d7ca7e1a7 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -24,7 +24,9 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { var callbackName, overwritten, responseContainer, jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ? "url" : - typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data" + typeof s.data === "string" && + !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && + rjsonp.test( s.data ) && "data" ); // Handle iff the expected data type is "jsonp" or we have a parameter to set diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js index 0b92c7a42..9fbd9da9a 100644 --- a/src/ajax/parseXML.js +++ b/src/ajax/parseXML.js @@ -17,7 +17,7 @@ jQuery.parseXML = function( data ) { xml.async = "false"; xml.loadXML( data ); } - } catch( e ) { + } catch ( e ) { xml = undefined; } if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { diff --git a/src/ajax/script.js b/src/ajax/script.js index f6598aaf3..416a45ddb 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -6,7 +6,8 @@ define([ // Install script dataType jQuery.ajaxSetup({ accepts: { - script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript" + script: "text/javascript, application/javascript, " + + "application/ecmascript, application/x-ecmascript" }, contents: { script: /(?:java|ecma)script/ diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 0f560f45a..31999d44e 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -60,7 +60,13 @@ if ( xhrSupported ) { id = ++xhrId; // Open the socket - xhr.open( options.type, options.url, options.async, options.username, options.password ); + xhr.open( + options.type, + options.url, + options.async, + options.username, + options.password + ); // Apply custom fields if provided if ( options.xhrFields ) { @@ -132,7 +138,7 @@ if ( xhrSupported ) { // statusText for faulty cross-domain requests try { statusText = xhr.statusText; - } catch( e ) { + } catch ( e ) { // We normalize with Webkit giving an empty statusText statusText = ""; } @@ -184,13 +190,13 @@ if ( xhrSupported ) { function createStandardXHR() { try { return new window.XMLHttpRequest(); - } catch( e ) {} + } catch ( e ) {} } function createActiveXHR() { try { return new window.ActiveXObject( "Microsoft.XMLHTTP" ); - } catch( e ) {} + } catch ( e ) {} } }); diff --git a/src/attributes/attr.js b/src/attributes/attr.js index 47639c97e..6152680c0 100644 --- a/src/attributes/attr.js +++ b/src/attributes/attr.js @@ -54,7 +54,9 @@ jQuery.extend({ if ( value === null ) { jQuery.removeAttr( elem, name ); - } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + } else if ( hooks && "set" in hooks && + (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; } else { diff --git a/src/attributes/classes.js b/src/attributes/classes.js index 64bc747c5..a7b423035 100644 --- a/src/attributes/classes.js +++ b/src/attributes/classes.js @@ -103,7 +103,9 @@ jQuery.fn.extend({ if ( jQuery.isFunction( value ) ) { return this.each(function( i ) { - jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); + jQuery( this ).toggleClass( + value.call(this, i, this.className, stateVal), stateVal + ); }); } @@ -135,7 +137,9 @@ jQuery.fn.extend({ // then remove the whole classname (if there was one, the above saved it). // Otherwise bring back whatever was previously saved (if anything), // falling back to the empty string if nothing was stored. - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + this.className = this.className || value === false ? + "" : + jQuery._data( this, "__className__" ) || ""; } }); }, @@ -145,7 +149,9 @@ jQuery.fn.extend({ i = 0, l = this.length; for ( ; i < l; i++ ) { - if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) { + if ( this[i].nodeType === 1 && + (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) { + return true; } } diff --git a/src/attributes/prop.js b/src/attributes/prop.js index 817a1b621..92fa8c3b3 100644 --- a/src/attributes/prop.js +++ b/src/attributes/prop.js @@ -19,7 +19,7 @@ jQuery.fn.extend({ try { this[ name ] = undefined; delete this[ name ]; - } catch( e ) {} + } catch ( e ) {} }); } }); @@ -48,9 +48,10 @@ jQuery.extend({ } if ( value !== undefined ) { - return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? - ret : - ( elem[ name ] = value ); + return hooks && "set" in hooks && + (ret = hooks.set( elem, value, name )) !== undefined ? + ret : + ( elem[ name ] = value ); } else { return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? @@ -62,16 +63,18 @@ jQuery.extend({ propHooks: { tabIndex: { get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // elem.tabIndex doesn't always return the + // correct value when it hasn't been explicitly set // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ // Use proper attribute retrieval(#12072) var tabindex = jQuery.find.attr( elem, "tabindex" ); return tabindex ? parseInt( tabindex, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - -1; + rfocusable.test( elem.nodeName ) || + rclickable.test( elem.nodeName ) && elem.href ? + 0 : + -1; } } } diff --git a/src/attributes/support.js b/src/attributes/support.js index 3f85d8aaa..665e836f6 100644 --- a/src/attributes/support.js +++ b/src/attributes/support.js @@ -19,7 +19,8 @@ define([ a.style.cssText = "top:1px"; - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + // Test setAttribute on camelCase class. + // If it works, we need attrFixes when doing get/setAttribute (ie6/7) support.getSetAttribute = div.className !== "t"; // Get the style information from getAttribute diff --git a/src/attributes/val.js b/src/attributes/val.js index 4a3b0e5c1..c51a1a3b8 100644 --- a/src/attributes/val.js +++ b/src/attributes/val.js @@ -13,7 +13,8 @@ jQuery.fn.extend({ if ( !arguments.length ) { if ( elem ) { - hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; + hooks = jQuery.valHooks[ elem.type ] || + jQuery.valHooks[ elem.nodeName.toLowerCase() ]; if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { return ret; @@ -98,8 +99,11 @@ jQuery.extend({ // oldIE doesn't update selected after form reset (#2551) if ( ( option.selected || i === index ) && // Don't return options that are disabled or in a disabled optgroup - ( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && - ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { + ( support.optDisabled ? + !option.disabled : + option.getAttribute("disabled") === null ) && + ( !option.parentNode.disabled || + !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { // Get the specific value for the option value = jQuery( option ).val(); diff --git a/src/callbacks.js b/src/callbacks.js index 9d12823d9..51e3a3ab9 100644 --- a/src/callbacks.js +++ b/src/callbacks.js @@ -70,7 +70,9 @@ jQuery.Callbacks = function( options ) { firingLength = list.length; firing = true; for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && + options.stopOnFalse ) { + memory = false; // To prevent further calls using add break; } diff --git a/src/core.js b/src/core.js index 9dacc48a8..27162f84a 100644 --- a/src/core.js +++ b/src/core.js @@ -159,7 +159,9 @@ jQuery.extend = jQuery.fn.extend = function() { } // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( deep && copy && ( jQuery.isPlainObject(copy) || + (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { copyIsArray = false; clone = src && jQuery.isArray(src) ? src : []; @@ -512,7 +514,8 @@ jQuery.extend({ }); // Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), +function(i, name) { class2type[ "[object " + name + "]" ] = name.toLowerCase(); }); diff --git a/src/core/init.js b/src/core/init.js index f2db547a9..340e378b8 100644 --- a/src/core/init.js +++ b/src/core/init.js @@ -26,7 +26,10 @@ var rootjQuery, // Handle HTML strings if ( typeof selector === "string" ) { - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + if ( selector.charAt(0) === "<" && + selector.charAt( selector.length - 1 ) === ">" && + selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check match = [ null, selector, null ]; diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js index 64cf2a18a..808d60e3d 100644 --- a/src/core/parseHTML.js +++ b/src/core/parseHTML.js @@ -5,7 +5,8 @@ define([ ], function( jQuery, rsingleTag ) { // data: string of html -// context (optional): If specified, the fragment will be created in this context, defaults to document +// context (optional): If specified, the fragment will be created in this context, +// defaults to document // keepScripts (optional): If true, will include scripts passed in the html string jQuery.parseHTML = function( data, context, keepScripts ) { if ( !data || typeof data !== "string" ) { diff --git a/src/core/ready.js b/src/core/ready.js index 392c4849f..095e6daeb 100644 --- a/src/core/ready.js +++ b/src/core/ready.js @@ -82,7 +82,10 @@ function detach() { */ function completed() { // readyState === "complete" is good enough for us to call the dom ready in oldIE - if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { + if ( document.addEventListener || + event.type === "load" || + document.readyState === "complete" ) { + detach(); jQuery.ready(); } @@ -93,9 +96,12 @@ jQuery.ready.promise = function( obj ) { readyList = jQuery.Deferred(); - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // we once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + // Catch cases where $(document).ready() is called + // after the browser event has already occurred. + // we once tried to use readyState "interactive" here, + // but it caused issues like the one + // discovered by ChrisS here: + // http://bugs.jquery.com/ticket/12282#comment:15 if ( document.readyState === "complete" ) { // Handle it asynchronously to allow scripts the opportunity to delay ready setTimeout( jQuery.ready ); @@ -122,7 +128,7 @@ jQuery.ready.promise = function( obj ) { try { top = window.frameElement == null && document.documentElement; - } catch(e) {} + } catch ( e ) {} if ( top && top.doScroll ) { (function doScrollCheck() { @@ -132,7 +138,7 @@ jQuery.ready.promise = function( obj ) { // Use the trick by Diego Perini // http://javascript.nwbox.com/IEContentLoaded/ top.doScroll("left"); - } catch(e) { + } catch ( e ) { return setTimeout( doScrollCheck, 50 ); } diff --git a/src/css.js b/src/css.js index 2c88f2bc3..bd858a203 100644 --- a/src/css.js +++ b/src/css.js @@ -24,8 +24,10 @@ var ralpha = /alpha\([^)]*\)/i, ropacity = /opacity\s*=\s*([^)]*)/, - // swappable if display is none or starts with table except "table", "table-cell", or "table-caption" - // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display + // swappable if display is none or starts with table except + // "table", "table-cell", or "table-caption" + // see here for display values: + // https://developer.mozilla.org/en-US/docs/CSS/display rdisplayswap = /^(none|table(?!-c[ea]).+)/, rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ), rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ), @@ -95,7 +97,11 @@ function showHide( elements, show ) { hidden = isHidden( elem ); if ( display && display !== "none" || !hidden ) { - jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) ); + jQuery._data( + elem, + "olddisplay", + hidden ? display : jQuery.css( elem, "display" ) + ); } } } @@ -168,7 +174,8 @@ function getWidthOrHeight( elem, name, extra ) { var valueIsBorderBox = true, val = name === "width" ? elem.offsetWidth : elem.offsetHeight, styles = getStyles( elem ), - isBorderBox = support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; + isBorderBox = support.boxSizing && + jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; // some non-html elements return undefined for offsetWidth, so check for null/undefined // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285 @@ -187,7 +194,8 @@ function getWidthOrHeight( elem, name, extra ) { // we need the check for style in case a browser which returns unreliable values // for getComputedStyle silently falls back to the reliable elem.style - valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] ); + valueIsBorderBox = isBorderBox && + ( support.boxSizingReliable() || val === elem.style[ name ] ); // Normalize "", auto, and prepare for extra val = parseFloat( val ) || 0; @@ -255,7 +263,8 @@ jQuery.extend({ origName = jQuery.camelCase( name ), style = elem.style; - name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) ); + name = jQuery.cssProps[ origName ] || + ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) ); // gets hook for the prefixed version // followed by the unprefixed version @@ -283,24 +292,28 @@ jQuery.extend({ } // Fixes #8908, it can be done more correctly by specifing setters in cssHooks, - // but it would mean to define eight (for every problematic property) identical functions + // but it would mean to define eight + // (for every problematic property) identical functions if ( !support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) { style[ name ] = "inherit"; } // If a hook was provided, use that value, otherwise just set the specified value - if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) { + if ( !hooks || !("set" in hooks) || + (value = hooks.set( elem, value, extra )) !== undefined ) { // Support: IE // Swallow errors from 'invalid' CSS values (#5509) try { style[ name ] = value; - } catch(e) {} + } catch (e) {} } } else { // If a hook was provided get the non-computed value from there - if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { + if ( hooks && "get" in hooks && + (ret = hooks.get( elem, false, extra )) !== undefined ) { + return ret; } @@ -314,7 +327,8 @@ jQuery.extend({ origName = jQuery.camelCase( name ); // Make sure that we're working with the right name - name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) ); + name = jQuery.cssProps[ origName ] || + ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) ); // gets hook for the prefixed version // followed by the unprefixed version @@ -350,11 +364,12 @@ jQuery.each([ "height", "width" ], function( i, name ) { if ( computed ) { // certain elements can have dimension info if we invisibly show them // however, it must have a current display style that would benefit from this - return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ? - jQuery.swap( elem, cssShow, function() { - return getWidthOrHeight( elem, name, extra ); - }) : - getWidthOrHeight( elem, name, extra ); + return rdisplayswap.test( jQuery.css( elem, "display" ) ) && + elem.offsetWidth === 0 ? + jQuery.swap( elem, cssShow, function() { + return getWidthOrHeight( elem, name, extra ); + }) : + getWidthOrHeight( elem, name, extra ); } }, @@ -365,7 +380,8 @@ jQuery.each([ "height", "width" ], function( i, name ) { elem, name, extra, - support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box", + support.boxSizing && + jQuery.css( elem, "boxSizing", false, styles ) === "border-box", styles ) : 0 ); @@ -377,9 +393,11 @@ if ( !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) || "" ) ? - ( 0.01 * parseFloat( RegExp.$1 ) ) + "" : - computed ? "1" : ""; + return ropacity.test( (computed && elem.currentStyle ? + elem.currentStyle.filter : + elem.style.filter) || "" ) ? + ( 0.01 * parseFloat( RegExp.$1 ) ) + "" : + computed ? "1" : ""; }, set: function( elem, value ) { @@ -392,7 +410,8 @@ if ( !support.opacity ) { // Force it by setting the zoom level style.zoom = 1; - // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652 + // if setting opacity to 1, and no other filters exist - + // attempt to remove filter attribute #6652 // if value === "", then remove inline opacity #12685 if ( ( value >= 1 || value === "" ) && jQuery.trim( filter.replace( ralpha, "" ) ) === "" && @@ -403,7 +422,8 @@ if ( !support.opacity ) { // style.removeAttribute is IE Only, but so apparently is this code path... style.removeAttribute( "filter" ); - // if there is no filter style applied in a css rule or unset inline opacity, we are done + // if there is no filter style applied in a css rule + // or unset inline opacity, we are done if ( value === "" || currentStyle && !currentStyle.filter ) { return; } diff --git a/src/css/curCSS.js b/src/css/curCSS.js index 9ab4f1126..66602cc80 100644 --- a/src/css/curCSS.js +++ b/src/css/curCSS.js @@ -37,9 +37,12 @@ if ( window.getComputedStyle ) { } // A tribute to the "awesome hack by Dean Edwards" - // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right - // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels - // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + // Chrome < 17 and Safari 5.0 uses "computed value" + // instead of "used value" for margin-right + // Safari 5.1.7 (at least) returns percentage for a larger set of values, + // but width seems to be reliably pixels + // this is against the CSSOM draft spec: + // http://dev.w3.org/csswg/cssom/#resolved-values if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { // Remember the original values @@ -87,8 +90,10 @@ if ( window.getComputedStyle ) { // If we're not dealing with a regular pixel number // but a number that has a weird ending, we need to convert it to pixels - // but not position css attributes, as those are proportional to the parent element instead - // and we can't measure the parent instead because it might trigger a "stacking dolls" problem + // but not position css attributes, as those are + // proportional to the parent element instead + // and we can't measure the parent instead because it + // might trigger a "stacking dolls" problem if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) { // Remember the original values diff --git a/src/css/defaultDisplay.js b/src/css/defaultDisplay.js index 210ad4a80..adf3f3748 100644 --- a/src/css/defaultDisplay.js +++ b/src/css/defaultDisplay.js @@ -17,9 +17,11 @@ function actualDisplay( name, doc ) { elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), // getDefaultComputedStyle might be reliably used only on attached element - display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? + display = window.getDefaultComputedStyle && + ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - // Use of this method is a temporary fix (more like optmization) until something better comes along, + // Use of this method is a temporary fix (more like optmization) + // until something better comes along, // since it was removed from specification and supported only in FF style.display : jQuery.css( elem[ 0 ], "display" ); @@ -45,7 +47,8 @@ function defaultDisplay( nodeName ) { if ( display === "none" || !display ) { // Use the already-created iframe if possible - iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement ); + iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )) + .appendTo( doc.documentElement ); // Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document; diff --git a/src/css/var/isHidden.js b/src/css/var/isHidden.js index 15ab81a97..c29f527ae 100644 --- a/src/css/var/isHidden.js +++ b/src/css/var/isHidden.js @@ -8,6 +8,7 @@ define([ // isHidden might be called from jQuery#filter function; // in that case, element will be second argument elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + return jQuery.css( elem, "display" ) === "none" || + !jQuery.contains( elem.ownerDocument, elem ); }; }); diff --git a/src/data.js b/src/data.js index 612d91ba0..e8f269b01 100644 --- a/src/data.js +++ b/src/data.js @@ -26,7 +26,7 @@ function dataAttr( elem, key, data ) { +data + "" === data ? +data : rbrace.test( data ) ? jQuery.parseJSON( data ) : data; - } catch( e ) {} + } catch ( e ) {} // Make sure we set the data so it isn't changed later jQuery.data( elem, key, data ); @@ -78,7 +78,8 @@ function internalData( elem, name, data, pvt /* Internal Use Only */ ) { // Avoid doing any more work than we need to when trying to get data on an // object that has no data at all - if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { + if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && + data === undefined && typeof name === "string" ) { return; } @@ -313,7 +314,6 @@ jQuery.fn.extend({ } return arguments.length > 1 ? - // Sets one value this.each(function() { jQuery.data( this, key, value ); diff --git a/src/data/support.js b/src/data/support.js index e57f6f7de..014e973c8 100644 --- a/src/data/support.js +++ b/src/data/support.js @@ -11,7 +11,7 @@ define([ support.deleteExpando = true; try { delete div.test; - } catch( e ) { + } catch ( e ) { support.deleteExpando = false; } } diff --git a/src/deferred.js b/src/deferred.js index 8dedbf74c..04cb77197 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -36,7 +36,10 @@ jQuery.extend({ .fail( newDefer.reject ) .progress( newDefer.notify ); } else { - newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + newDefer[ tuple[ 0 ] + "With" ]( + this === promise ? newDefer.promise() : this, + fn ? [ returned ] : arguments + ); } }); }); @@ -99,9 +102,11 @@ jQuery.extend({ length = resolveValues.length, // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + remaining = length !== 1 || + ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + // the master Deferred. + // If resolveValues consist of only a single Deferred, just use that. deferred = remaining === 1 ? subordinate : jQuery.Deferred(), // Update function for both resolve and progress values diff --git a/src/dimensions.js b/src/dimensions.js index 5898832f9..95f327b0f 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -6,7 +6,8 @@ define([ // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { - jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) { + jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, + function( defaultExtra, funcName ) { // margin is only for outerHeight, outerWidth jQuery.fn[ funcName ] = function( margin, value ) { var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ), @@ -26,8 +27,10 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { if ( elem.nodeType === 9 ) { doc = elem.documentElement; - // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest - // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it. + // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], + // whichever is greatest + // unfortunately, this causes bug #3838 in IE6/8 only, + // but there is currently no good, small way to fix it. return Math.max( elem.body[ "scroll" + name ], doc[ "scroll" + name ], elem.body[ "offset" + name ], doc[ "offset" + name ], diff --git a/src/effects.js b/src/effects.js index 225b31240..189658163 100644 --- a/src/effects.js +++ b/src/effects.js @@ -45,7 +45,8 @@ var do { // If previous iteration zeroed out, double until we get *something* - // Use a string for doubling factor so we don't accidentally see scale as unchanged below + // Use a string for doubling factor so we don't accidentally see scale + // as unchanged below scale = scale || ".5"; // Adjust and apply @@ -53,8 +54,11 @@ var jQuery.style( tween.elem, prop, start + unit ); // Update scale, tolerating zero or NaN from tween.cur() - // And breaking the loop if scale is unchanged or perfect, or if we've just had enough - } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations ); + // And breaking the loop if scale is unchanged or perfect, + // or if we've just had enough + } while ( + scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations + ); } // Update tween properties @@ -203,7 +207,8 @@ function defaultPrefilter( elem, props, opts ) { toggle = toggle || value === "toggle"; if ( value === ( hidden ? "hide" : "show" ) ) { - // If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden + // If there is dataShow left over from a stopped hide or show + // and we are going to proceed with show, we should pretend to be hidden if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) { hidden = true; } else { @@ -533,7 +538,9 @@ jQuery.fn.extend({ } for ( index = timers.length; index--; ) { - if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) { + if ( timers[ index ].elem === this && + (type == null || timers[ index ].queue === type) ) { + timers[ index ].anim.stop( gotoEnd ); dequeue = false; timers.splice( index, 1 ); diff --git a/src/effects/Tween.js b/src/effects/Tween.js index 12eec55cf..40a02659e 100644 --- a/src/effects/Tween.js +++ b/src/effects/Tween.js @@ -77,7 +77,9 @@ Tween.propHooks = { // available and use plain properties where available if ( jQuery.fx.step[ tween.prop ] ) { jQuery.fx.step[ tween.prop ]( tween ); - } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) { + } else if ( tween.elem.style && + ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || + jQuery.cssHooks[ tween.prop ] ) ) { jQuery.style( tween.elem, tween.prop, tween.now + tween.unit ); } else { tween.elem[ tween.prop ] = tween.now; diff --git a/src/event.js b/src/event.js index 16ca030bd..88911936c 100644 --- a/src/event.js +++ b/src/event.js @@ -74,7 +74,8 @@ jQuery.event = { jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : undefined; }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + // Add elem as a property of the handle fn to prevent a memory leak + // with IE non-native events eventHandle.elem = elem; } @@ -118,7 +119,9 @@ jQuery.event = { handlers.delegateCount = 0; // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element if ( elem.addEventListener ) { elem.addEventListener( type, eventHandle, false ); @@ -193,7 +196,8 @@ jQuery.event = { if ( ( mappedTypes || origType === handleObj.origType ) && ( !handler || handler.guid === handleObj.guid ) && ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { handlers.splice( j, 1 ); if ( handleObj.selector ) { @@ -208,7 +212,9 @@ jQuery.event = { // Remove generic event handler if we removed something and no more handlers exist // (avoids potential for endless recursion during removal of special event handlers) if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); } @@ -261,7 +267,7 @@ jQuery.event = { // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) event.isTrigger = onlyHandlers ? 2 : 3; event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? + event.rnamespace = event.namespace ? new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : null; @@ -310,7 +316,9 @@ jQuery.event = { special.bindType || type; // jQuery handler - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && + jQuery._data( cur, "handle" ); + if ( handle ) { handle.apply( cur, data ); } @@ -393,17 +401,19 @@ jQuery.event = { event.currentTarget = matched.elem; j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + while ( (handleObj = matched.handlers[ j++ ]) && + !event.isImmediatePropagationStopped() ) { // Triggered event must either 1) have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + // 2) have namespace(s) a subset or equal to those in the bound event + // (both can have no namespace). + if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { event.handleObj = handleObj; event.data = handleObj.data; - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || + handleObj.handler ).apply( matched.elem, args ); if ( ret !== undefined ) { if ( (event.result = ret) === false ) { @@ -519,7 +529,8 @@ jQuery.event = { }, // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + props: ( "altKey bubbles cancelable ctrlKey currentTarget eventPhase " + + "metaKey relatedTarget shiftKey target timeStamp view which" ).split(" "), fixHooks: {}, @@ -537,7 +548,8 @@ jQuery.event = { }, mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + props: ( "button buttons clientX clientY fromElement offsetX offsetY " + + "pageX pageY screenX screenY toElement" ).split(" "), filter: function( event, original ) { var body, eventDoc, doc, button = original.button, @@ -549,13 +561,19 @@ jQuery.event = { doc = eventDoc.documentElement; body = eventDoc.body; - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + event.pageX = original.clientX + + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - + ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - + ( doc && doc.clientTop || body && body.clientTop || 0 ); } // Add relatedTarget, if necessary if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + event.relatedTarget = fromElement === event.target ? + original.toElement : + fromElement; } // Add which for click: 1 === left; 2 === middle; 3 === right @@ -661,7 +679,8 @@ jQuery.removeEvent = document.removeEventListener ? if ( elem.detachEvent ) { // #8545, #7054, preventing memory leaks for custom events in IE6-8 - // detachEvent needed property on element, by name of that event, to properly expose it to GC + // detachEvent needed property on element, by name of that event, + // to properly expose it to GC if ( typeof elem[ name ] === strundefined ) { elem[ name ] = null; } @@ -804,10 +823,13 @@ if ( !support.submitBubbles ) { jQuery.event.add( this, "click._submit keypress._submit", function( e ) { // Node name check avoids a VML-related crash in IE (#9807) var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? + elem.form : + undefined; + if ( form && !jQuery._data( form, "submitBubbles" ) ) { jQuery.event.add( form, "submit._submit", function( event ) { - event._submit_bubble = true; + event._submitBubble = true; }); jQuery._data( form, "submitBubbles", true ); } @@ -817,8 +839,8 @@ if ( !support.submitBubbles ) { postDispatch: function( event ) { // If form was submitted by the user, bubble the event up the tree - if ( event._submit_bubble ) { - delete event._submit_bubble; + if ( event._submitBubble ) { + delete event._submitBubble; if ( this.parentNode && !event.isTrigger ) { jQuery.event.simulate( "submit", this.parentNode, event, true ); } @@ -851,12 +873,12 @@ if ( !support.changeBubbles ) { if ( this.type === "checkbox" || this.type === "radio" ) { jQuery.event.add( this, "propertychange._change", function( event ) { if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; + this._justChanged = true; } }); jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; + if ( this._justChanged && !event.isTrigger ) { + this._justChanged = false; } // Allow triggered, simulated change events (#11500) jQuery.event.simulate( "change", this, event, true ); @@ -883,7 +905,9 @@ if ( !support.changeBubbles ) { var elem = event.target; // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + if ( this !== elem || event.isSimulated || event.isTrigger || + (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); } }, @@ -994,7 +1018,9 @@ jQuery.fn.extend({ // ( event ) dispatched jQuery.Event handleObj = types.handleObj; jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, handleObj.selector, handleObj.handler ); diff --git a/src/event/ajax.js b/src/event/ajax.js index 278c403ee..c808b583e 100644 --- a/src/event/ajax.js +++ b/src/event/ajax.js @@ -4,7 +4,14 @@ define([ ], function( jQuery ) { // Attach a bunch of functions for handling common AJAX events -jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) { +jQuery.each([ + "ajaxStart", + "ajaxStop", + "ajaxComplete", + "ajaxError", + "ajaxSuccess", + "ajaxSend" +], function( i, type ) { jQuery.fn[ type ] = function( fn ) { return this.on( type, fn ); }; diff --git a/src/event/alias.js b/src/event/alias.js index 7e7917508..4ec920a03 100644 --- a/src/event/alias.js +++ b/src/event/alias.js @@ -5,7 +5,8 @@ define([ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { + "change select submit keydown keypress keyup error contextmenu").split(" "), + function( i, name ) { // Handle event binding jQuery.fn[ name ] = function( data, fn ) { @@ -32,7 +33,9 @@ jQuery.fn.extend({ }, undelegate: function( selector, types, fn ) { // ( namespace ) or ( selector, types [, fn] ) - return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn ); + return arguments.length === 1 ? + this.off( selector, "**" ) : + this.off( types, selector || "**", fn ); } }); diff --git a/src/manipulation.js b/src/manipulation.js index ee0baeb7c..48333b8ba 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -29,7 +29,8 @@ function createSafeFragment( document ) { return safeFrag; } -var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + +var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|" + + "datalist|details|figcaption|figure|footer|" + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), @@ -70,9 +71,11 @@ wrapMap.th = wrapMap.td; function getAll( context, tag ) { var elems, elem, i = 0, - found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) : - typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) : - undefined; + found = typeof context.getElementsByTagName !== strundefined ? + context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== strundefined ? + context.querySelectorAll( tag || "*" ) : + undefined; if ( !found ) { for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) { @@ -127,7 +130,11 @@ function setGlobalEval( elems, refElements ) { var elem, i = 0; for ( ; (elem = elems[i]) != null; i++ ) { - jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) ); + jQuery._data( + elem, + "globalEval", + !refElements || jQuery._data( refElements[i], "globalEval" ) + ); } } @@ -231,7 +238,9 @@ jQuery.extend({ var destElements, node, clone, i, srcElements, inPage = jQuery.contains( elem.ownerDocument, elem ); - if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { + if ( support.html5Clone || jQuery.isXMLDoc(elem) || + !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { + clone = elem.cloneNode( true ); // IE<=8 does not properly clone detached, unknown element nodes @@ -341,7 +350,9 @@ jQuery.extend({ j = elem && elem.childNodes.length; while ( j-- ) { - if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) { + if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && + !tbody.childNodes.length ) { + elem.removeChild( tbody ); } } @@ -467,7 +478,9 @@ jQuery.fn.extend({ return access( this, function( value ) { return value === undefined ? jQuery.text( this ) : - this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); + this.empty().append( + ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) + ); }, null, value, arguments.length ); }, @@ -594,7 +607,7 @@ jQuery.fn.extend({ elem = 0; // If using innerHTML throws an exception, use the fallback method - } catch(e) {} + } catch ( e ) {} } if ( elem ) { @@ -664,7 +677,8 @@ jQuery.fn.extend({ scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); hasScripts = scripts.length; - // Use the original fragment for the last item instead of the first because it can end up + // Use the original fragment for the last item + // instead of the first because it can end up // being emptied incorrectly in certain situations (#8070). for ( ; i < l; i++ ) { node = fragment; @@ -691,7 +705,8 @@ jQuery.fn.extend({ for ( i = 0; i < hasScripts; i++ ) { node = scripts[ i ]; if ( rscriptType.test( node.type || "" ) && - !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + !jQuery._data( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { if ( node.src ) { // Optional AJAX dependency, but won't run scripts if not present @@ -699,7 +714,10 @@ jQuery.fn.extend({ jQuery._evalUrl( node.src ); } } else { - jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); + jQuery.globalEval( + ( node.text || node.textContent || node.innerHTML || "" ) + .replace( rcleanScript, "" ) + ); } } } diff --git a/src/manipulation/support.js b/src/manipulation/support.js index 2567d7e70..e7345eb3f 100644 --- a/src/manipulation/support.js +++ b/src/manipulation/support.js @@ -65,7 +65,7 @@ define([ support.deleteExpando = true; try { delete div.test; - } catch( e ) { + } catch ( e ) { support.deleteExpando = false; } } diff --git a/src/offset.js b/src/offset.js index 42d07eb4f..954ab8add 100644 --- a/src/offset.js +++ b/src/offset.js @@ -46,7 +46,8 @@ jQuery.offset = { calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1; - // need to be able to calculate position if either top or left is auto and position is either absolute or fixed + // need to be able to calculate position if either top or left + // is auto and position is either absolute or fixed if ( calculatePosition ) { curPosition = curElem.position(); curTop = curPosition.top; @@ -122,7 +123,8 @@ jQuery.fn.extend({ parentOffset = { top: 0, left: 0 }, elem = this[ 0 ]; - // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent + // Fixed elements are offset from window (parentOffset = {top:0, left: 0}, + // because it is its only offset parent if ( jQuery.css( elem, "position" ) === "fixed" ) { // we assume that getBoundingClientRect is available when computed position is fixed offset = elem.getBoundingClientRect(); @@ -154,7 +156,8 @@ jQuery.fn.extend({ return this.map(function() { var offsetParent = this.offsetParent || docElem; - while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) { + while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && + jQuery.css( offsetParent, "position" ) === "static" ) ) { offsetParent = offsetParent.offsetParent; } return offsetParent || docElem; diff --git a/src/queue.js b/src/queue.js index 29e766078..3cc1dd22d 100644 --- a/src/queue.js +++ b/src/queue.js @@ -59,7 +59,8 @@ jQuery.extend({ } }, - // not intended for public consumption - generates a queueHooks object, or returns the current one + // not intended for public consumption - generates a queueHooks object, + // or returns the current one _queueHooks: function( elem, type ) { var key = type + "queueHooks"; return jQuery._data( elem, key ) || jQuery._data( elem, key, { diff --git a/src/serialize.js b/src/serialize.js index 5b09cb614..9b7ffa342 100644 --- a/src/serialize.js +++ b/src/serialize.js @@ -24,7 +24,12 @@ function buildParams( prefix, obj, traditional, add ) { } else { // Item is non-scalar (array or object), encode its numeric index. - buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add ); + buildParams( + prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", + v, + traditional, + add + ); } }); diff --git a/src/traversing.js b/src/traversing.js index ee3676963..2943987a1 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -20,7 +20,9 @@ jQuery.extend({ var matched = [], cur = elem[ dir ]; - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + while ( cur && cur.nodeType !== 9 && + (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { matched.push( cur ); } |