Return-Path: 
 <commits-return-6169-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 78846 invoked from network); 16 Apr 2011 20:41:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 16 Apr 2011 20:41:59 -0000
Received: (qmail 41576 invoked by uid 500); 16 Apr 2011 20:41:59 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 41541 invoked by uid 500); 16 Apr 2011 20:41:59 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 41534 invoked by uid 99); 16 Apr 2011 20:41:59 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Apr 2011 20:41:59 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Apr 2011 20:41:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DBE232388A38; Sat, 16 Apr 2011 20:41:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1094051 -
 /couchdb/branches/1.0.x/share/www/script/futon.browse.js
Date: Sat, 16 Apr 2011 20:41:35 -0000
To: commits@couchdb.apache.org
From: jan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110416204135.DBE232388A38@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jan
Date: Sat Apr 16 20:41:35 2011
New Revision: 1094051

URL: http://svn.apache.org/viewvc?rev=1094051&view=rev
Log:
Fix display issue with documents that have single or double quotes
in their id.

Closes COUCHDB-1111

Modified:
    couchdb/branches/1.0.x/share/www/script/futon.browse.js

Modified: couchdb/branches/1.0.x/share/www/script/futon.browse.js
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/share/www/script/futon.browse.js?rev=1094051&r1=1094050&r2=1094051&view=diff
==============================================================================
--- couchdb/branches/1.0.x/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/branches/1.0.x/share/www/script/futon.browse.js [utf-8] Sat Apr 16 20:41:35 2011
@@ -682,10 +682,12 @@
               key = $.futon.formatJSON(row.key, {indent: 0, linesep: ""});
             }
             if (row.id) {
-              $("<td class='key'><a href='document.html?" + encodeURIComponent(db.name) +
-                "/" + $.couch.encodeDocId(row.id) + "'><strong></strong><br>" +
-                "<span class='docid'>ID:&nbsp;" + $.futon.escape(row.id) + "</span></a></td>")
-                .find("strong").text(key).end()
+              key = key.replace(/\\"/, '"');
+              var rowlink = encodeURIComponent(db.name) +
+                "/" + $.couch.encodeDocId(row.id);
+              $("<td class='key'><a href=\"document.html?" + rowlink + "\"><strong>"
+                 + $.futon.escape(key) + "</strong><br>"
+                 + "<span class='docid'>ID:&nbsp;" + $.futon.escape(row.id) + "</span></a></td>")
                 .appendTo(tr);
             } else {
               $("<td class='key'><strong></strong></td>")