diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2014-07-17 10:25:59 -0700 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2014-07-17 10:25:59 -0700 |
| commit | c869a1ef8a031342e817a2c063179a787ff57239 (patch) | |
| tree | bf70e1683cc53d5d3793a8deb0aaafe2bd684513 /src/core.js | |
| parent | 8e3a0ceafa2c7c78902d0eab07d21b793deb5366 (diff) | |
| download | jquery-c869a1ef8a031342e817a2c063179a787ff57239.tar.gz jquery-c869a1ef8a031342e817a2c063179a787ff57239.zip | |
Build: update grunt-jscs-checker and pass with the new rules
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 15e2077aa..2b3fbb180 100644 --- a/src/core.js +++ b/src/core.js @@ -162,7 +162,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 : []; @@ -458,7 +460,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(); }); |