Merge pull request #60 from cozyazure/master

use constructor.name property by default for custom name, if defined
mohsen1 · Aug 27, 2016 · 4351176 · 4351176
2 parents 70da0b6 + 4a3b930
commit 4351176
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/dist/json-formatter.css b/dist/json-formatter.css
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.6.0 - 2016-04-29T03:24:40.680Z
+ * Version: 0.6.0 - 2016-08-27T12:58:03.339Z
  * License: Apache-2.0
  */
 

diff --git a/dist/json-formatter.js b/dist/json-formatter.js
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.6.0 - 2016-04-29T03:24:40.672Z
+ * Version: 0.6.0 - 2016-08-27T12:58:03.306Z
  * License: Apache-2.0
  */
 
@@ -65,6 +65,12 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     if (typeof object === 'object' && !object.constructor) {
         return 'Object';
     }
+
+    //ES6 default gives name to constructor 
+    if (object.__proto__ !== undefined && object.__proto__.constructor !== undefined && object.__proto__.constructor.name !== undefined) {
+      return object.__proto__.constructor.name;
+    } 
+
     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
@@ -57,6 +57,12 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     if (typeof object === 'object' && !object.constructor) {
         return 'Object';
     }
+
+    //ES6 default gives name to constructor 
+    if (object.__proto__ !== undefined && object.__proto__.constructor !== undefined && object.__proto__.constructor.name !== undefined) {
+      return object.__proto__.constructor.name;
+    } 
+
     var funcNameRegex = /function (.{1,})\(/;
     var results = (funcNameRegex).exec((object).constructor.toString());
     if (results && results.length > 1) {