Merge branch 'Ovilia-clickable-title'

myopq · Apr 17, 2016 · 018e24e · 018e24e
2 parents 2a85d5d + 8985c36
commit 018e24e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/dist/jquery.jsonview.css b/dist/jquery.jsonview.css
diff --git a/dist/jquery.jsonview.js b/dist/jquery.jsonview.js
@@ -118,7 +118,7 @@ Licensed under the MIT License.
         value = object[prop];
         hasContents = true;
         key = this.options.escape ? this.jsString(prop) : prop;
-        output += "<li><span class=\"prop\"><span class=\"q\">\"</span>" + key + "<span class=\"q\">\"</span></span>: " + (this.valueToHTML(value, level + 1));
+        output += "<li><a class=\"prop\" href=\"javascript:;\"><span class=\"q\">\"</span>" + key + "<span class=\"q\">\"</span></a>: " + (this.valueToHTML(value, level + 1));
         if (numProps > 1) {
           output += ',';
         }
@@ -146,6 +146,11 @@ Licensed under the MIT License.
 
     Collapser.bindEvent = function(item, options) {
       var collapser;
+      item.firstChild.addEventListener('click', (function(_this) {
+        return function(event) {
+          return _this.toggle(event.target.parentNode.firstChild, options);
+        };
+      })(this));
       collapser = document.createElement('div');
       collapser.className = 'collapser';
       collapser.innerHTML = options.collapsed ? '+' : '-';

diff --git a/dist/jquery.jsonview.min.css b/dist/jquery.jsonview.min.css
diff --git a/dist/jquery.jsonview.min.js b/dist/jquery.jsonview.min.js
diff --git a/src/jquery.jsonview.scss b/src/jquery.jsonview.scss
@@ -5,6 +5,8 @@
 
   .prop {
     font-weight: bold;
+    text-decoration: none;
+    color: #000;
   }
 
   .null {

diff --git a/src/lib/collapser.coffee b/src/lib/collapser.coffee
@@ -1,5 +1,8 @@
 class Collapser
   @bindEvent: (item, options) ->
+    item.firstChild.addEventListener('click', (event) =>
+      @toggle(event.target.parentNode.firstChild, options)
+    )
     collapser = document.createElement('div')
     collapser.className = 'collapser'
     collapser.innerHTML = if options.collapsed then '+' else '-'

diff --git a/src/lib/json_formatter.coffee b/src/lib/json_formatter.coffee
@@ -93,7 +93,7 @@ class JSONFormatter
       hasContents = true
       key = if @options.escape then @jsString(prop) else prop
       output += """
-      <li><span class="prop"><span class="q">"</span>#{key}<span class="q">"</span></span>: #{@valueToHTML(value, level + 1)}
+      <li><a class="prop" href="javascript:;"><span class="q">"</span>#{key}<span class="q">"</span></a>: #{@valueToHTML(value, level + 1)}
       """
       output += ',' if numProps > 1
       output += '</li>'

diff --git a/test/json_formatter.coffee b/test/json_formatter.coffee
@@ -64,9 +64,9 @@ suite 'JSONFormatter', ->
       {
         <ul class="obj level0">
           <li>
-            <span class="prop">
+            <a class="prop" href="javascript:;">
               <span class="q">"</span>a<span class="q">"</span>
-            </span>: <span class="num">1</span>
+            </a>: <span class="num">1</span>
           </li>
         </ul>
       }
@@ -81,14 +81,14 @@ suite 'JSONFormatter', ->
       {
         <ul class="obj level0">
           <li>
-            <span class="prop">
+            <a class="prop" href="javascript:;">
               <span class="q">"</span>a<span class="q">"</span>
-            </span>: {
+            </a>: {
               <ul class="obj level1 collapsible">
                 <li>
-                  <span class="prop">
+                  <a class="prop" href="javascript:;">
                     <span class="q">"</span>b<span class="q">"</span>
-                  </span>: <span class="num">1</span>
+                  </a>: <span class="num">1</span>
                 </li>
               </ul>
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ @@
       .prop {
         font-weight: bold;
+        text-decoration: none;
+        color: #000;
       }
       .null {
@@ Expand Down @@