Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 22053C7E0 for ; Mon, 9 Sep 2013 09:53:25 +0000 (UTC) Received: (qmail 20080 invoked by uid 500); 9 Sep 2013 09:53:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 19928 invoked by uid 500); 9 Sep 2013 09:53:24 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 19541 invoked by uid 99); 9 Sep 2013 09:53:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 09:53:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7B3FC903942; Mon, 9 Sep 2013 09:53:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Mon, 09 Sep 2013 09:53:23 -0000 Message-Id: <6707ab6bbba5410b9e25766091550911@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins to 8aad450 Fauxton: fix pretty print issue by escaping json Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d8f12018 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d8f12018 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d8f12018 Branch: refs/heads/1867-feature-plugins Commit: d8f12018ec0580d2d187fef317487c96c6093588 Parents: d0a35ce Author: Garren Smith Authored: Mon Aug 19 16:38:06 2013 +0200 Committer: Jan Lehnardt Committed: Mon Sep 9 11:16:42 2013 +0200 ---------------------------------------------------------------------- src/fauxton/app/templates/documents/all_docs_item.html | 2 +- src/fauxton/app/templates/documents/doc.html | 2 +- src/fauxton/app/templates/documents/index_row_docular.html | 4 ++-- src/fauxton/app/templates/documents/index_row_tabular.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/d8f12018/src/fauxton/app/templates/documents/all_docs_item.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/all_docs_item.html b/src/fauxton/app/templates/documents/all_docs_item.html index c4c0754..c0e61cf 100644 --- a/src/fauxton/app/templates/documents/all_docs_item.html +++ b/src/fauxton/app/templates/documents/all_docs_item.html @@ -15,7 +15,7 @@ the License.
-
<%= doc.prettyJSON() %>
+
<%- doc.prettyJSON() %>
<% if (doc.isEditable()) { %>
Edit <%= doc.docType() %> http://git-wip-us.apache.org/repos/asf/couchdb/blob/d8f12018/src/fauxton/app/templates/documents/doc.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/doc.html b/src/fauxton/app/templates/documents/doc.html index 92c29ff..81c74c4 100644 --- a/src/fauxton/app/templates/documents/doc.html +++ b/src/fauxton/app/templates/documents/doc.html @@ -32,7 +32,7 @@ the License.
<% } %> - +

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d8f12018/src/fauxton/app/templates/documents/index_row_docular.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/index_row_docular.html b/src/fauxton/app/templates/documents/index_row_docular.html index 26c0280..3835453 100644 --- a/src/fauxton/app/templates/documents/index_row_docular.html +++ b/src/fauxton/app/templates/documents/index_row_docular.html @@ -15,7 +15,7 @@ the License.

-
<%= doc.prettyJSON() %>
+
<%- doc.prettyJSON() %>
<% if (doc.isEditable()) { %>
Edit <%= doc.docType() %> @@ -23,4 +23,4 @@ the License.
<% } %>
- \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/couchdb/blob/d8f12018/src/fauxton/app/templates/documents/index_row_tabular.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/index_row_tabular.html b/src/fauxton/app/templates/documents/index_row_tabular.html index f52c48c..f211f9e 100644 --- a/src/fauxton/app/templates/documents/index_row_tabular.html +++ b/src/fauxton/app/templates/documents/index_row_tabular.html @@ -22,4 +22,4 @@ the License.
<%= JSON.stringify(doc.get("value")) %>
- \ No newline at end of file +