Merge pull request #911 from /issues/910@v2

objects: extend fails in case of target=null (close #910)
bem · Mar 12, 2015 · 4090469 · 4090469
2 parents 2fe510b + 408fff2
commit 4090469
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/common.blocks/objects/objects.spec.js b/common.blocks/objects/objects.spec.js
@@ -30,6 +30,11 @@ describe('objects', function() {
                 .should.be.eql({ p1 : 'v1' });
         });
 
+        it('should return new object if target is null', function() {
+            objects.extend(null, { p1 : 'v1' })
+                .should.be.eql({ p1 : 'v1' });
+        });
+
         it('should properly extend object with "hasOwnProperty" property', function() {
             objects.extend(
                 { hasOwnProperty : '' },

diff --git a/common.blocks/objects/objects.vanilla.js b/common.blocks/objects/objects.vanilla.js
@@ -15,7 +15,7 @@ provide(/** @exports */{
      * @returns {Object}
      */
     extend : function(target, source) {
-        typeof target !== 'object' && (target = {});
+        (typeof target !== 'object' || target === null) && (target = {});
 
         for(var i = 1, len = arguments.length; i < len; i++) {
             var obj = arguments[i];