You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/05/02 18:12:01 UTC
couchdb commit: updated refs/heads/master to 64144cc
Repository: couchdb
Updated Branches:
refs/heads/master 7d29ade0b -> 64144cc8b
COUCHDB-2233 - Correct HTML interpolation instances in documents.
Further updating instances of <%= and to <%- within documents to correctly handle HTML interpolation.
Tested for regression in
- 34.0.1847.131
- Safari 7.0.2
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/64144cc8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/64144cc8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/64144cc8
Branch: refs/heads/master
Commit: 64144cc8bdbc64002bde64394dc8850d3987718c
Parents: 7d29ade
Author: Christian Hogan <gi...@infliction.org>
Authored: Fri May 2 11:59:16 2014 -0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri May 2 20:11:35 2014 +0400
----------------------------------------------------------------------
.../app/addons/fauxton/templates/api_bar.html | 6 ++---
.../addons/fauxton/templates/breadcrumbs.html | 4 +--
.../app/addons/fauxton/templates/footer.html | 2 +-
.../app/addons/fauxton/templates/nav_bar.html | 26 ++++++++++----------
.../addons/fauxton/templates/notification.html | 4 +--
.../addons/fauxton/templates/pagination.html | 10 ++++----
6 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/api_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/api_bar.html b/src/fauxton/app/addons/fauxton/templates/api_bar.html
index 4fb5971..8b61423 100644
--- a/src/fauxton/app/addons/fauxton/templates/api_bar.html
+++ b/src/fauxton/app/addons/fauxton/templates/api_bar.html
@@ -20,11 +20,11 @@ the License.
<div class="input-prepend input-append">
<span class="add-on">
API reference
- <a href="<%=getDocUrl(documentation)%>" target="_blank">
+ <a href="<%-getDocUrl(documentation)%>" target="_blank">
<i class="icon-question-sign"></i>
</a>
</span>
- <input type="text" class="input-xxlarge" value="<%= endpoint %>">
- <a href="<%= endpoint %>" target="_blank" class="btn">Show me</a>
+ <input type="text" class="input-xxlarge" value="<%- endpoint %>">
+ <a href="<%- endpoint %>" target="_blank" class="btn">Show me</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html b/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html
index 026db89..18961b7 100644
--- a/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html
+++ b/src/fauxton/app/addons/fauxton/templates/breadcrumbs.html
@@ -15,10 +15,10 @@ the License.
<ul class="breadcrumb">
<% _.each(_.initial(crumbs), function(crumb) { %>
<li>
- <a href="#<%= crumb.link %>"><%= crumb.name %></a>
+ <a href="#<%- crumb.link %>"><%- crumb.name %></a>
<span class="divider fonticon fonticon-carrot"> </span>
</li>
<% }); %>
<% var last = _.last(crumbs) || {name: ''} %>
- <li class="active"><%= last.name %></li>
+ <li class="active"><%- last.name %></li>
</ul>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/footer.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/footer.html b/src/fauxton/app/addons/fauxton/templates/footer.html
index 781ffce..9b83f7f 100644
--- a/src/fauxton/app/addons/fauxton/templates/footer.html
+++ b/src/fauxton/app/addons/fauxton/templates/footer.html
@@ -12,4 +12,4 @@ License for the specific language governing permissions and limitations under
the License.
-->
-Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a><br> v. <%=version%>
+Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a><br> v. <%-version%>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/nav_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/nav_bar.html b/src/fauxton/app/addons/fauxton/templates/nav_bar.html
index 255ebd4..3de8a80 100644
--- a/src/fauxton/app/addons/fauxton/templates/nav_bar.html
+++ b/src/fauxton/app/addons/fauxton/templates/nav_bar.html
@@ -22,10 +22,10 @@ the License.
<ul id="nav-links" class="nav pull-right">
<% _.each(navLinks, function(link) { %>
<% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>" >
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
+ <li data-nav-name= "<%- link.title %>" >
+ <a href="<%- link.href %>">
+ <i class="<%- link.icon %> fonticon"></i>
+ <%- link.title %>
</a>
</li>
<% }); %>
@@ -34,7 +34,7 @@ the License.
<div id="bottom-nav">
<ul id="bottom-nav-links" class="nav">
<li data-nav-name= "Documentation">
- <a href="<%=getDocUrl('docs')%>" target="_blank">
+ <a href="<%-getDocUrl('docs')%>" target="_blank">
<i class="fonticon-bookmark fonticon"></i>
Documentation
</a>
@@ -42,10 +42,10 @@ the License.
<% _.each(bottomNavLinks, function(link) { %>
<% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>">
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
+ <li data-nav-name= "<%- link.title %>">
+ <a href="<%- link.href %>">
+ <i class="<%- link.icon %> fonticon"></i>
+ <%- link.title %>
</a>
</li>
<% }); %>
@@ -61,10 +61,10 @@ the License.
<ul id="footer-nav-links" class="nav">
<% _.each(footerNavLinks, function(link) { %>
<% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>">
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
+ <li data-nav-name= "<%- link.title %>">
+ <a href="<%- link.href %>">
+ <i class="<%- link.icon %> fonticon"></i>
+ <%- link.title %>
</a>
</li>
<% }); %>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/notification.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/notification.html b/src/fauxton/app/addons/fauxton/templates/notification.html
index ca8a903..1cf121b 100644
--- a/src/fauxton/app/addons/fauxton/templates/notification.html
+++ b/src/fauxton/app/addons/fauxton/templates/notification.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<div class="alert alert-<%= type %>">
+<div class="alert alert-<%- type %>">
<button type="button" class="close" data-dismiss="alert">×</button>
- <%= msg %>
+ <%- msg %>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/64144cc8/src/fauxton/app/addons/fauxton/templates/pagination.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/templates/pagination.html b/src/fauxton/app/addons/fauxton/templates/pagination.html
index 19dfc8c..0674c22 100644
--- a/src/fauxton/app/addons/fauxton/templates/pagination.html
+++ b/src/fauxton/app/addons/fauxton/templates/pagination.html
@@ -15,17 +15,17 @@ the License.
<div class="pagination pagination-centered">
<ul>
<% if (page > 1) { %>
- <li> <a href="<%= urlFun(page-1) %>">«</a></li>
+ <li> <a href="<%- urlFun(page-1) %>">«</a></li>
<% } else { %>
- <li class="disabled"> <a href="<%= urlFun(page) %>">«</a></li>
+ <li class="disabled"> <a href="<%- urlFun(page) %>">«</a></li>
<% } %>
<% _.each(_.range(1, totalPages+1), function(i) { %>
- <li <% if (page == i) { %>class="active"<% } %>> <a href="<%= urlFun(i) %>"><%= i %></a></li>
+ <li <% if (page == i) { %>class="active"<% } %>> <a href="<%- urlFun(i) %>"><%- i %></a></li>
<% }) %>
<% if (page < totalPages) { %>
- <li><a href="<%= urlFun(page+1) %>">»</a></li>
+ <li><a href="<%- urlFun(page+1) %>">»</a></li>
<% } else { %>
- <li class="disabled"> <a href="<%= urlFun(page) %>">»</a></li>
+ <li class="disabled"> <a href="<%- urlFun(page) %>">»</a></li>
<% } %>
</ul>
</div>