Add a function for getting type that covers 'null' case

mohsen1 · Dec 16, 2014 · e9d99ba · e9d99ba
1 parent f53a078
commit e9d99ba
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/dist/json-formatter.css b/dist/json-formatter.css
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.5 - 2014-12-16T18:51:42.214Z
+ * Version: 0.2.6 - 2014-12-16T21:33:23.610Z
  * License: MIT
  */
 

diff --git a/dist/json-formatter.js b/dist/json-formatter.js
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.5 - 2014-12-16T18:51:45.410Z
+ * Version: 0.2.6 - 2014-12-16T21:33:46.343Z
  * License: MIT
  */
 
@@ -31,6 +31,11 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     }
   }
 
+  function getType(object) {
+    if (object === null) { return 'null'; }
+    return typeof object;
+  }
+
   function link(scope, element, attributes) {
     scope.isArray = function () {
       return Array.isArray(scope.json);
@@ -45,22 +50,12 @@ angular.module('jsonFormatter', ['RecursionHelper'])
         return Object.keys(scope.json);
       }
     };
-    scope.type = typeof scope.json;
+    scope.type = getType(scope.json);
     scope.hasKey = typeof scope.key !== 'undefined';
     scope.getConstructorName = function(){
       return getObjectName(scope.json);
     };
 
-    // Set custom type for null
-    if (scope.json === null){
-      scope.type = 'null';
-    }
-
-    // Set custom type for null
-    if (scope.json === undefined){
-      scope.type = 'undefined';
-    }
-
     if (scope.type === 'string'){
 
       // Add custom type for date
@@ -99,7 +94,7 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     };
 
     scope.parseValue = function (value){
-      scope.type = typeof scope.json;
+      scope.type = getType(scope.json);
       if (scope.type === 'null') {
         return 'null';
       }

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
@@ -23,6 +23,11 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     }
   }
 
+  function getType(object) {
+    if (object === null) { return 'null'; }
+    return typeof object;
+  }
+
   function link(scope, element, attributes) {
     scope.isArray = function () {
       return Array.isArray(scope.json);
@@ -37,22 +42,12 @@ angular.module('jsonFormatter', ['RecursionHelper'])
         return Object.keys(scope.json);
       }
     };
-    scope.type = typeof scope.json;
+    scope.type = getType(scope.json);
     scope.hasKey = typeof scope.key !== 'undefined';
     scope.getConstructorName = function(){
       return getObjectName(scope.json);
     };
 
-    // Set custom type for null
-    if (scope.json === null){
-      scope.type = 'null';
-    }
-
-    // Set custom type for null
-    if (scope.json === undefined){
-      scope.type = 'undefined';
-    }
-
     if (scope.type === 'string'){
 
       // Add custom type for date
@@ -91,7 +86,7 @@ angular.module('jsonFormatter', ['RecursionHelper'])
     };
 
     scope.parseValue = function (value){
-      scope.type = typeof scope.json;
+      scope.type = getType(scope.json);
       if (scope.type === 'null') {
         return 'null';
       }