Support objects that are created with Object.create(null)

mohsen1 · Dec 21, 2014 · 3d6f5c7 · 3d6f5c7
1 parent 78fc7ce
commit 3d6f5c7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/dist/json-formatter.css b/dist/json-formatter.css
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.6 - 2014-12-16T21:33:23.610Z
+ * Version: 0.2.7 - 2014-12-21T19:57:21.891Z
  * License: MIT
  */
 

diff --git a/dist/json-formatter.js b/dist/json-formatter.js
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.6 - 2014-12-16T21:33:46.343Z
+ * Version: 0.2.7 - 2014-12-21T19:57:21.887Z
  * License: MIT
  */
 
@@ -22,6 +22,9 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     if (object === null) {
       return 'Object';
     }
+    if (typeof object === 'object' && !object.constructor) {
+        return 'Object';
+    }
     var funcNameRegex = /function (.{1,})\(/;
     var results = (funcNameRegex).exec((object).constructor.toString());
     if (results && results.length > 1) {

diff --git a/dist/json-formatter.min.css b/dist/json-formatter.min.css
diff --git a/dist/json-formatter.min.js b/dist/json-formatter.min.js
diff --git a/src/json-formatter.js b/src/json-formatter.js
@@ -14,6 +14,9 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     if (object === null) {
       return 'Object';
     }
+    if (typeof object === 'object' && !object.constructor) {
+        return 'Object';
+    }
     var funcNameRegex = /function (.{1,})\(/;
     var results = (funcNameRegex).exec((object).constructor.toString());
     if (results && results.length > 1) {

diff --git a/test/json-formatter.spec.js b/test/json-formatter.spec.js
@@ -105,8 +105,7 @@ describe('json-formatter', function () {
       testEmptyObject('emptyObject');
     });
 
-    // TODO
-    xdescribe('empty object without prototype: Object.create(null)', function(){
+    describe('empty object without prototype: Object.create(null)', function(){
       testEmptyObject('emptyObjectWithoutPrototype');
     });