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/01 22:07:02 UTC
[1/2] fauxton commit: updated refs/heads/import-master to 8fd075d
Repository: couchdb-fauxton
Updated Branches:
refs/heads/import-master 14dac8d82 -> 8fd075d5f
remove duplicated code
use the central viewhelper which even renders bytes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a7608c10
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a7608c10
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a7608c10
Branch: refs/heads/import-master
Commit: a7608c104d42f9af2ff2649a0d9807d704cb16d4
Parents: 14dac8d
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Wed Apr 30 13:38:40 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Apr 30 13:42:51 2014 +0200
----------------------------------------------------------------------
app/addons/databases/resources.js | 18 ------------------
app/addons/databases/templates/item.html | 2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a7608c10/app/addons/databases/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/resources.js b/app/addons/databases/resources.js
index f8aab96..e9e68a4 100644
--- a/app/addons/databases/resources.js
+++ b/app/addons/databases/resources.js
@@ -142,24 +142,6 @@ function(app, FauxtonAPI, Documents) {
}
},
- humanSize: function() {
- // cribbed from http://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable
- var i = -1;
- var byteUnits = [' kB', ' MB', ' GB', ' TB', 'PB', 'EB', 'ZB', 'YB'];
- var fileSizeInBytes = this.dataSize();
-
- if (!fileSizeInBytes) {
- return 0;
- }
-
- do {
- fileSizeInBytes = fileSizeInBytes / 1024;
- i++;
- } while (fileSizeInBytes > 1024);
-
- return Math.max(fileSizeInBytes, 0.1).toFixed(1) + byteUnits[i];
- },
-
dataSize: function () {
if (this.get("other")){
return this.get("other").data_size;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a7608c10/app/addons/databases/templates/item.html
----------------------------------------------------------------------
diff --git a/app/addons/databases/templates/item.html b/app/addons/databases/templates/item.html
index 304ab78..62cfb77 100644
--- a/app/addons/databases/templates/item.html
+++ b/app/addons/databases/templates/item.html
@@ -15,7 +15,7 @@ the License.
<td>
<a href="#/database/<%=encoded%>/_all_docs"><%= database.get("name") %></a>
</td>
-<td><%= database.status.humanSize() %></td>
+<td><%= formatSize(database.status.dataSize()) %></td>
<td>
<%= database.status.numDocs() %>
<% if (database.status.isGraveYard()) { %>
[2/2] fauxton commit: updated refs/heads/import-master to 8fd075d
Posted by kx...@apache.org.
Use <%- when interpolating XSS targets
- I tried to not be super heavy handed, only using <%- for values that
could be set with XSS payloads or otherwise come from a user/data.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8fd075d5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8fd075d5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8fd075d5
Branch: refs/heads/import-master
Commit: 8fd075d5f2b755b290c924da2664ede267955131
Parents: a7608c1
Author: Kyle Snavely <ks...@cloudant.com>
Authored: Thu May 1 11:57:42 2014 -0400
Committer: Kyle Snavely <ks...@cloudant.com>
Committed: Thu May 1 14:08:47 2014 -0400
----------------------------------------------------------------------
app/addons/auth/templates/nav_dropdown.html | 2 +-
app/addons/auth/templates/nav_link_title.html | 2 +-
app/addons/config/templates/item.html | 6 +++---
app/addons/documents/templates/changes.html | 2 +-
app/addons/documents/templates/ddoc_info.html | 2 +-
app/addons/documents/templates/delete_database_modal.html | 2 +-
app/addons/documents/templates/design_doc_selector.html | 6 +++---
app/addons/documents/templates/doc.html | 4 ++--
app/addons/permissions/templates/section.html | 2 +-
app/addons/replication/templates/form.html | 2 +-
app/addons/replication/templates/progress.html | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/auth/templates/nav_dropdown.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/nav_dropdown.html b/app/addons/auth/templates/nav_dropdown.html
index d61c24a..983b5f7 100644
--- a/app/addons/auth/templates/nav_dropdown.html
+++ b/app/addons/auth/templates/nav_dropdown.html
@@ -14,7 +14,7 @@ the License.
<div id="sidenav">
<header class="row-fluid">
- <h3> <%= user.name %> </h3>
+ <h3> <%- user.name %> </h3>
</header>
<nav>
<ul class="nav nav-list">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/auth/templates/nav_link_title.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/nav_link_title.html b/app/addons/auth/templates/nav_link_title.html
index 1ec9bf4..db3587d 100644
--- a/app/addons/auth/templates/nav_link_title.html
+++ b/app/addons/auth/templates/nav_link_title.html
@@ -20,7 +20,7 @@ the License.
<% } else if (user) { %>
<a href="#changePassword" >
<span class="fonticon-user fonticon"></span>
- <%= user.name %>
+ <%- user.name %>
</a>
<% } else { %>
<a href="#login" >
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/config/templates/item.html
----------------------------------------------------------------------
diff --git a/app/addons/config/templates/item.html b/app/addons/config/templates/item.html
index 8af9a50..f5fd73e 100644
--- a/app/addons/config/templates/item.html
+++ b/app/addons/config/templates/item.html
@@ -13,13 +13,13 @@ the License.
-->
<% if (option.index === 0) {%>
-<th> <%= option.section %> </th>
+<th> <%- option.section %> </th>
<% } else { %>
<td></td>
<% } %>
<td class="js-edit-value">
<div class="js-show-value">
- <%= option.name %>
+ <%- option.name %>
</div>
<div class="js-edit-value-form js-hidden">
<input class="js-value-input" type="text" name="name" value="<%- option.name %>" />
@@ -29,7 +29,7 @@ the License.
</td>
<td class="js-edit-value">
<div class="js-show-value">
- <%= option.value %>
+ <%- option.value %>
</div>
<div class="js-edit-value-form js-hidden">
<input class="js-value-input" type="text" name="value" value="<%- option.value %>" />
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/documents/templates/changes.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/changes.html b/app/addons/documents/templates/changes.html
index 5978e83..d038361 100644
--- a/app/addons/documents/templates/changes.html
+++ b/app/addons/documents/templates/changes.html
@@ -36,7 +36,7 @@ the License.
<% if (change.deleted) { %>
<%= change.id %>
<% } else { %>
- <a href="#<%= database.url('app') %>/<%= safeURL(change.id) %>"><%= change.id %></a>
+ <a href="#<%- database.url('app') %>/<%- safeURL(change.id) %>"><%= change.id %></a>
<% } %> </div>
<div class="span2 text-right">
<a class="js-copy" data-clipboard-text="<%= change.id %>" data-bypass="true" href="#">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/documents/templates/ddoc_info.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/ddoc_info.html b/app/addons/documents/templates/ddoc_info.html
index ed0aed6..b33e49b 100644
--- a/app/addons/documents/templates/ddoc_info.html
+++ b/app/addons/documents/templates/ddoc_info.html
@@ -18,7 +18,7 @@ the License.
<% if(i%2==0){%>
<div class="row-fluid">
<% }; %>
- <div class="span6 well-item"><strong> <%= key %></strong> : <%= val %> </div>
+ <div class="span6 well-item"><strong> <%- key %></strong> : <%- val %> </div>
<% if(i%2==1){%>
</div>
<% }; %>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/documents/templates/delete_database_modal.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/delete_database_modal.html b/app/addons/documents/templates/delete_database_modal.html
index 7ea3bc4..2b5448c 100644
--- a/app/addons/documents/templates/delete_database_modal.html
+++ b/app/addons/documents/templates/delete_database_modal.html
@@ -20,7 +20,7 @@ the License.
<div class="modal-body">
<form id="delete-db-check" class="form" method="post">
<p>
- You've asked to <b>permanently delete</b> <code><%= database.id %></code>.
+ You've asked to <b>permanently delete</b> <code><%- database.id %></code>.
Please enter the database name below to confirm the deletion of the
database and all documents and attachments within.
</p>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/documents/templates/design_doc_selector.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/design_doc_selector.html b/app/addons/documents/templates/design_doc_selector.html
index 7bbe310..b8f8b3f 100644
--- a/app/addons/documents/templates/design_doc_selector.html
+++ b/app/addons/documents/templates/design_doc_selector.html
@@ -12,15 +12,15 @@ License for the specific language governing permissions and limitations under
the License.
-->
<div class="span3">
- <label for="ddoc">Save to Design Document <a href="<%=getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="ddoc">Save to Design Document <a href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="ddoc">
<optgroup label="Select a document">
<option value="new-doc">New document</option>
<% ddocs.each(function(ddoc) { %>
<% if (ddoc.id === ddocName) { %>
- <option selected="selected" value="<%= ddoc.id %>"><%= ddoc.id %></option>
+ <option selected="selected" value="<%- ddoc.id %>"><%- ddoc.id %></option>
<% } else { %>
- <option value="<%= ddoc.id %>"><%= ddoc.id %></option>
+ <option value="<%- ddoc.id %>"><%- ddoc.id %></option>
<% } %>
<% }); %>
</optgroup>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/documents/templates/doc.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/doc.html b/app/addons/documents/templates/doc.html
index 9433868..e9a46cf 100644
--- a/app/addons/documents/templates/doc.html
+++ b/app/addons/documents/templates/doc.html
@@ -31,8 +31,8 @@ the License.
<ul class="dropdown-menu">
<%_.each(attachments, function (att) { %>
<li>
- <a href="<%= att.url %>" target="_blank"> <strong> <%= att.fileName %> </strong> -
- <span> <%= att.contentType %>, <%= formatSize(att.size)%> </span>
+ <a href="<%- att.url %>" target="_blank"> <strong> <%- att.fileName %> </strong> -
+ <span> <%- att.contentType %>, <%- formatSize(att.size)%> </span>
</a>
</li>
<% }) %>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/permissions/templates/section.html
----------------------------------------------------------------------
diff --git a/app/addons/permissions/templates/section.html b/app/addons/permissions/templates/section.html
index 0459562..fe228f5 100644
--- a/app/addons/permissions/templates/section.html
+++ b/app/addons/permissions/templates/section.html
@@ -13,7 +13,7 @@ the License.
-->
<header class="page-header">
<h3> <%= (section) %> </h3>
-<p class="help"> <%= help %> <a href="<%=getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
+<p class="help"> <%= help %> <a href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
</header>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/replication/templates/form.html
----------------------------------------------------------------------
diff --git a/app/addons/replication/templates/form.html b/app/addons/replication/templates/form.html
index 32a87dc..342a4fd 100644
--- a/app/addons/replication/templates/form.html
+++ b/app/addons/replication/templates/form.html
@@ -63,7 +63,7 @@ the License.
<label for="createTarget">
<input type="checkbox" name="create_target" value="true" id="createTarget">
- Create Target <a href="<%=getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
+ Create Target <a href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
</label>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8fd075d5/app/addons/replication/templates/progress.html
----------------------------------------------------------------------
diff --git a/app/addons/replication/templates/progress.html b/app/addons/replication/templates/progress.html
index 1e6ef90..ea9d6c3 100644
--- a/app/addons/replication/templates/progress.html
+++ b/app/addons/replication/templates/progress.html
@@ -11,12 +11,12 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
-->
-<p class="span6 break">Replicating <strong><%=source%></strong> to <strong><%=target%></strong></p>
+<p class="span6 break">Replicating <strong><%-source%></strong> to <strong><%-target%></strong></p>
<div class="span4 progress progress-striped active">
<div class="bar" style="width: <%=progress || 0%>%;"><%=progress || "0"%>%</div>
</div>
<span class="span1">
- <button class="cancel btn btn-danger btn-large delete" data-source="<%=source%>" data-rep-id="<%=repid%>" data-continuous="<%=continuous%>" data-target="<%=target%>">Cancel</a>
+ <button class="cancel btn btn-danger btn-large delete" data-source="<%-source%>" data-rep-id="<%-repid%>" data-continuous="<%-continuous%>" data-target="<%-target%>">Cancel</a>
</span>