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/core | |
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/core')
-rw-r--r-- | src/core/init.js | 5 | ||||
-rw-r--r-- | src/core/parseHTML.js | 3 | ||||
-rw-r--r-- | src/core/ready.js | 18 |
3 files changed, 18 insertions, 8 deletions
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 ); } |