Avoid double escaping in Futon edit fields. Patch by Martin Haaß. Clo…

…ses COUCHDB-611. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@950696 13f79535-47bb-0310-9956-ffa450edef68
apage43 · Jun 2, 2010 · 85ceb17 · 85ceb17
1 parent faa27f9
commit 85ceb17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/THANKS b/THANKS
@@ -56,5 +56,6 @@ suggesting improvements or submitting changes. Some of these people are:
  * Jae Kwon <jkwon.work@gmail.com>
  * Gavin Sherry <swm@alcove.com.au>
  * Timothy Smith <tim@couch.io>
+ * Martin Haaß <MartinHaass@gmx.net>
 
 For a list of authors see the `AUTHORS` file.
diff --git a/share/www/script/futon.format.js b/share/www/script/futon.format.js
@@ -44,7 +44,11 @@
             if (type == "string" && !options.escapeStrings) {
               retval = indentLines(retval.replace(/\r\n/g, "\n"), tab.substr(options.indent));
             } else {
-              retval = escape(JSON.stringify(val));
+              if (options.html) {
+                retval = escape(JSON.stringify(val));
+              } else {
+                retval = JSON.stringify(val);
+              }
             }
             if (options.html) {
               retval = "<code class='" + type + "'>" + retval + "</code>";