Merge pull request #38 from ultrabluewolf/master

Wrap .key colon strings with a span tag
mohsen1 · Dec 3, 2015 · 05b48a3 · 05b48a3
2 parents b6836df + 78a4e46
commit 05b48a3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/dist/json-formatter.css b/dist/json-formatter.css
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.4.1 - 2015-11-10T20:59:41.458Z
+ * Version: 0.4.1 - 2015-12-01T20:27:41.499Z
  * License: MIT
  */
 
@@ -40,13 +40,13 @@
   color: red;
 }
 .json-formatter-row .null {
-  color: #855a00;
+  color: #855A00;
 }
 .json-formatter-row .undefined {
   color: #ca0b69;
 }
 .json-formatter-row .function {
-  color: #ff20ed;
+  color: #FF20ED;
 }
 .json-formatter-row .date {
   background-color: rgba(0, 0, 0, 0.05);
@@ -60,7 +60,7 @@
   color: blue;
 }
 .json-formatter-row .key {
-  color: #00008b;
+  color: #00008B;
   cursor: pointer;
 }
 .json-formatter-row .constructor-name {
@@ -112,38 +112,38 @@
   content: "[]";
 }
 .json-formatter-dark.json-formatter-row .string {
-  color: #31f031;
+  color: #31F031;
   white-space: pre;
   word-wrap: break-word;
 }
 .json-formatter-dark.json-formatter-row .number {
-  color: #66c2ff;
+  color: #66C2FF;
 }
 .json-formatter-dark.json-formatter-row .boolean {
-  color: #ec4242;
+  color: #EC4242;
 }
 .json-formatter-dark.json-formatter-row .null {
-  color: #eec97d;
+  color: #EEC97D;
 }
 .json-formatter-dark.json-formatter-row .undefined {
   color: #ef8fbe;
 }
 .json-formatter-dark.json-formatter-row .function {
-  color: #fd48cb;
+  color: #FD48CB;
 }
 .json-formatter-dark.json-formatter-row .date {
   background-color: rgba(255, 255, 255, 0.05);
 }
 .json-formatter-dark.json-formatter-row .url {
   text-decoration: underline;
-  color: #027bff;
+  color: #027BFF;
   cursor: pointer;
 }
 .json-formatter-dark.json-formatter-row .bracket {
-  color: #9494ff;
+  color: #9494FF;
 }
 .json-formatter-dark.json-formatter-row .key {
-  color: #23a0db;
+  color: #23A0DB;
   cursor: pointer;
 }
 .json-formatter-dark.json-formatter-row .constructor-name {

diff --git a/dist/json-formatter.js b/dist/json-formatter.js
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.4.1 - 2015-11-10T20:59:41.449Z
+ * Version: 0.4.1 - 2015-12-01T20:27:41.483Z
  * License: MIT
  */
 
@@ -275,4 +275,4 @@ angular.module('RecursionHelper', []).factory('RecursionHelper', ['$compile', fu
   };
 }]);
 
-angular.module("jsonFormatter").run(["$templateCache", function($templateCache) {$templateCache.put("json-formatter.html","<div ng-init=\"isOpen = open && open > 0\" class=\"json-formatter-row\"><a ng-click=\"toggleOpen()\"><span class=\"toggler {{isOpen ? \'open\' : \'\'}}\" ng-if=\"isObject()\"></span> <span class=\"key\" ng-if=\"hasKey\">{{key}}:</span> <span class=\"value\"><span ng-if=\"isObject()\"><span class=\"constructor-name\">{{getConstructorName(json)}}</span> <span ng-if=\"isArray()\"><span class=\"bracket\">[</span><span class=\"number\">{{json.length}}</span><span class=\"bracket\">]</span></span></span> <span ng-if=\"!isObject()\" ng-click=\"openLink(isUrl)\" class=\"{{type}}\" ng-class=\"{date: isDate, url: isUrl}\">{{parseValue(json)}}</span></span> <span ng-if=\"showThumbnail()\" class=\"thumbnail-text\">{{getThumbnail()}}</span></a><div class=\"children\" ng-if=\"getKeys().length && isOpen\"><json-formatter ng-repeat=\"key in getKeys() track by $index\" json=\"json[key]\" key=\"key\" open=\"childrenOpen()\"></json-formatter></div><div class=\"children empty object\" ng-if=\"isEmptyObject()\"></div><div class=\"children empty array\" ng-if=\"getKeys() && !getKeys().length && isOpen && isArray()\"></div></div>");}]);
+angular.module("jsonFormatter").run(["$templateCache", function($templateCache) {$templateCache.put("json-formatter.html","<div ng-init=\"isOpen = open && open > 0\" class=\"json-formatter-row\"><a ng-click=\"toggleOpen()\"><span class=\"toggler {{isOpen ? \'open\' : \'\'}}\" ng-if=\"isObject()\"></span> <span class=\"key\" ng-if=\"hasKey\"><span class=\"key-text\">{{key}}</span><span class=\"colon\">:</span></span> <span class=\"value\"><span ng-if=\"isObject()\"><span class=\"constructor-name\">{{getConstructorName(json)}}</span> <span ng-if=\"isArray()\"><span class=\"bracket\">[</span><span class=\"number\">{{json.length}}</span><span class=\"bracket\">]</span></span></span> <span ng-if=\"!isObject()\" ng-click=\"openLink(isUrl)\" class=\"{{type}}\" ng-class=\"{date: isDate, url: isUrl}\">{{parseValue(json)}}</span></span> <span ng-if=\"showThumbnail()\" class=\"thumbnail-text\">{{getThumbnail()}}</span></a><div class=\"children\" ng-if=\"getKeys().length && isOpen\"><json-formatter ng-repeat=\"key in getKeys() track by $index\" json=\"json[key]\" key=\"key\" open=\"childrenOpen()\"></json-formatter></div><div class=\"children empty object\" ng-if=\"isEmptyObject()\"></div><div class=\"children empty array\" ng-if=\"getKeys() && !getKeys().length && isOpen && isArray()\"></div></div>");}]);
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.html b/src/json-formatter.html
@@ -1,7 +1,7 @@
 <div ng-init="isOpen = open && open > 0" class="json-formatter-row">
   <a ng-click="toggleOpen()">
     <span class="toggler {{isOpen ? 'open' : ''}}" ng-if="isObject()"></span>
-    <span class="key" ng-if="hasKey">{{key}}:</span>
+    <span class="key" ng-if="hasKey"><span class="key-text">{{key}}</span><span class="colon">:</span></span>
     <span class="value">
       <span ng-if="isObject()">
         <span class="constructor-name">{{getConstructorName(json)}}</span>