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/parseHTML.js | |
| 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/parseHTML.js')
| -rw-r--r-- | src/core/parseHTML.js | 3 |
1 files changed, 2 insertions, 1 deletions
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" ) { |