Remove errant collapsed document rep in edit mode.

Fixes #33
bobthecow · Sep 27, 2012 · 235b0dd · 235b0dd
1 parent 42cab1d
commit 235b0dd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,6 +1,7 @@
 ## v2.1
 
  * Fix #28 — Handle BSON BinData properly in documents and ids.
+ * Fix #33 — Remove unexpected collapsed document representation in edit mode.
  * Fix — Handle connection auth errors more gracefully.
  * Fix — Query bug when running under PHP 5.4 SAPI CLI server.
  * Add ObjectId timestamps to document headers.

diff --git a/genghis.php b/genghis.php
diff --git a/genghis.rb b/genghis.rb
diff --git a/src/js/genghis/json.js b/src/js/genghis/json.js
@@ -298,14 +298,16 @@ Genghis.JSON = {
     },
 
     stringify: function(value, pretty) {
-        return jQuery('<div>' + this.prettyPrint(value, pretty) + '</div>').text();
+        return jQuery('<div>' + this.prettyPrint(value, pretty, false) + '</div>').text();
     },
 
-    prettyPrint: function (value, pretty) {
+    prettyPrint: function (value, pretty, autoCollapse) {
         // This function borrows heavily from json2.js, a project in the public domain.
         //
         // See See http://www.JSON.org/js.html
 
+        autoCollapse = (autoCollapse !== false);
+
         function JsonView(value) {
 
             var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
@@ -501,7 +503,7 @@ Genghis.JSON = {
 
                             el = span('v a');
 
-                            if (gap) {
+                            if (autoCollapse && gap) {
                                 el.collapsible = true;
 
                                 if (value.length > 10) {
@@ -583,7 +585,7 @@ Genghis.JSON = {
                         }
 
                         el = span(spanClass);
-                        el.collapsible = true;
+                        el.collapsible = !!autoCollapse;
                         el.appendChild(t(gap ? ('{\n' + gap) : '{'));
 
                         glue = t(gap ? (',\n' + gap) : ',');