couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject git commit: updated refs/heads/master to 4ecb639
Date Thu, 17 Oct 2013 16:38:57 GMT
Updated Branches:
  refs/heads/master 6b158a2f2 -> 4ecb639f5


Add Cancel button to the edit form


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4ecb639f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4ecb639f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4ecb639f

Branch: refs/heads/master
Commit: 4ecb639f593e9f55f934ad69fa2186d55bfa6c9e
Parents: 6b158a2
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Thu Oct 17 12:38:47 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Thu Oct 17 12:38:47 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js   | 6 +++++-
 src/fauxton/app/templates/documents/doc.html | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4ecb639f/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 6c39044..9f665e5 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -684,12 +684,16 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror,
JSHint, re
       "click button.save-doc": "saveDoc",
       "click button.delete": "destroy",
       "click button.duplicate": "duplicate",
-      "click button.upload": "upload"
+      "click button.upload": "upload",
+      "click button.cancel-button": "goback"
     },
     disableLoader: true,
     initialize: function (options) {
       this.database = options.database;
     },
+    goback: function(){
+      window.history.back();
+    },
     destroy: function(event) {
       if (this.model.isNewDoc()) {
         FauxtonAPI.addNotification({

http://git-wip-us.apache.org/repos/asf/couchdb/blob/4ecb639f/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 6d4c8e5..8c8fc7b 100644
--- a/src/fauxton/app/templates/documents/doc.html
+++ b/src/fauxton/app/templates/documents/doc.html
@@ -44,7 +44,8 @@ the License.
   <textarea class="doc-code"><%- JSON.stringify(doc.attributes, null, "  ") %></textarea>
   <br />
   <p>
-    <button class="save-doc btn btn-success btn-large save" type="button">Save</button>
+       <button class="save-doc button green btn-success btn-large save fonticon-circle-check"
type="button">Save</button>
+       <button class="button gray btn-large cancel-button outlineGray fonticon-circle-x"
type="button">Cancel</button>
   </p>
 
 </div>


Mime
View raw message