You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/12/17 17:17:40 UTC
[1/2] git commit: updated refs/heads/master to fe888d2
Updated Branches:
refs/heads/master d734db08e -> fe888d2f9
Fauxton: Fix bug not removing old reduce function
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/277b730e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/277b730e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/277b730e
Branch: refs/heads/master
Commit: 277b730ea4e0588af7b0082521515415a757a0ee
Parents: d734db0
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Dec 17 09:42:00 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Dec 17 09:42:00 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/modules/documents/resources.js | 8 +++-----
src/fauxton/app/modules/documents/views.js | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/277b730e/src/fauxton/app/modules/documents/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/resources.js b/src/fauxton/app/modules/documents/resources.js
index 75df7d1..8633605 100644
--- a/src/fauxton/app/modules/documents/resources.js
+++ b/src/fauxton/app/modules/documents/resources.js
@@ -99,11 +99,9 @@ function(app, FauxtonAPI) {
reduce: reduce
};
} else {
- if (!views[view]) {
- views[view] = {};
- }
-
- views[view].map = map;
+ views[view] = {
+ map: map
+ };
}
this.set({views: views});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/277b730e/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 cac4f48..faf3539 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -1545,7 +1545,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
database: this.database,
viewName: this.viewName,
ddocName: this.model.id,
- hasReduce: this.hasReduce
+ hasReduce: this.hasReduce()
}));
},
[2/2] git commit: updated refs/heads/master to fe888d2
Posted by ga...@apache.org.
Fauxton: Prevent propogation on pagination
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fe888d2f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fe888d2f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fe888d2f
Branch: refs/heads/master
Commit: fe888d2f92d159ad891fdbf64f97b9588d7c4d81
Parents: 277b730
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Dec 17 14:59:43 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Dec 17 14:59:43 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/modules/fauxton/components.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fe888d2f/src/fauxton/app/modules/fauxton/components.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/components.js b/src/fauxton/app/modules/fauxton/components.js
index 5255626..6afe046 100644
--- a/src/fauxton/app/modules/fauxton/components.js
+++ b/src/fauxton/app/modules/fauxton/components.js
@@ -78,6 +78,7 @@ function(app, FauxtonAPI, ace) {
previousClicked: function (event) {
event.preventDefault();
+ event.stopPropagation();
if (!this.canShowPreviousfn()) { return; }
FauxtonAPI.navigate(this.previousUrlfn(), {trigger: false});
FauxtonAPI.triggerRouteEvent('paginate', 'previous');
@@ -85,6 +86,7 @@ function(app, FauxtonAPI, ace) {
nextClicked: function (event) {
event.preventDefault();
+ event.stopPropagation();
if (!this.canShowNextfn()) { return; }
var doc = this.collection.first();