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 cc94a0d
Date Thu, 17 Oct 2013 17:05:31 GMT
Updated Branches:
  refs/heads/master 4ecb639f5 -> cc94a0d21


View Delete was broken


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

Branch: refs/heads/master
Commit: cc94a0d21092ecfcbf3347004873b3a65b417a0f
Parents: 4ecb639
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Thu Oct 17 13:05:24 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Thu Oct 17 13:05:24 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js           | 4 +++-
 src/fauxton/app/templates/documents/view_editor.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cc94a0d2/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 9f665e5..2f3b694 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -1106,7 +1106,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror,
JSHint, re
 
     events: {
       "click button.save": "saveView",
-      "click button.delete": "deleteView",
+      "click button.cancel-button": "deleteView",
       "change select#reduce-function-selector": "updateReduce",
       "change select#ddoc": "updateDesignDoc",
       "click #db-views-tabs-nav": 'toggleIndexNav'
@@ -1575,6 +1575,8 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror,
JSHint, re
         this.ddocID = options.ddocInfo.id;
         this.currView = options.ddocInfo.currView;
       }
+      // this.listenTo(this.collection, "add", this.render);
+      // this.listenTo(this.collection, "remove", this.render);
     },
 
     deleteDatabase: function (event) {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cc94a0d2/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 64f0f98..f75edc5 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -91,7 +91,7 @@ the License.
           <div class="control-group">
             <button class="button green save fonticon-circle-check">Save</button>
             <% if (!this.newView) { %>
-            <button class="button cancel-button outlineGray fonticon-circle-x">Delete</button>
+            <button class="button delete outlineGray fonticon-circle-x">Delete</button>
             <% } %>
           </div>
           <div class="clearfix"></div>


Mime
View raw message