fix bug: null data support.

warfares · Nov 8, 2014 · 6c2c562 · 6c2c562
1 parent 02c46dc
commit 6c2c562
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/build/pretty-json-min.js b/build/pretty-json-min.js
diff --git a/build/tools/jsmin.pyc b/build/tools/jsmin.pyc
diff --git a/build/tools/mergejs.pyc b/build/tools/mergejs.pyc
diff --git a/build/tools/toposort.pyc b/build/tools/toposort.pyc
diff --git a/css/pretty-json.css b/css/pretty-json.css
@@ -45,4 +45,5 @@
 .number{ color:#ccaa00;}
 .boolean{ color:#1979d3;}
 .date{ color:#aa6655;}
+.null{ color:#ff5050;}
 /* eof leaf */
diff --git a/index.html b/index.html
@@ -9,10 +9,10 @@
     <script type="text/javascript" src="/libs/underscore-min.js" ></script>
     <script type="text/javascript" src="/libs/backbone-min.js" ></script>
 
-    <!-- src dev 
+    <!-- src dev
     <script type="text/javascript" src="/pretty-json-debug.js" ></script>
     -->
-    <!-- src build  -->
+    <!-- src build -->
     <script type="text/javascript" src="/build/pretty-json-min.js" ></script>
 
     <!-- just css for this page example -->

diff --git a/src/leaf.js b/src/leaf.js
@@ -36,6 +36,7 @@ PrettyJSON.view.Leaf = Backbone.View.extend({
         if(_.isNumber(d)) m = 'number';
         else if(_.isBoolean(d)) m = 'boolean';
         else if(_.isDate(d)) m = 'date';
+        else if(_.isNull(d)) m = 'null'
         return m;
     },
     getState:function(){
@@ -49,13 +50,17 @@ PrettyJSON.view.Leaf = Backbone.View.extend({
         };
         return state;
     },
-    render: function(){
+    render: function() {
         var state = this.getState();
 
-        if (state.type == "date" && this.dateFormat) {
+        if (state.type == 'date' && this.dateFormat) {
             state.data = PrettyJSON.util.dateFormat(this.data, this.dateFormat);
         }
 
+        if (state.type == 'null') {
+            state.data = 'null';
+        }
+
         this.tpl = _.template(PrettyJSON.tpl.Leaf, state);
         $(this.el).html(this.tpl);
         return this;