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.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.js')
| -rw-r--r-- | src/core.js | 7 |
1 files changed, 5 insertions, 2 deletions
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(); }); |