couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [1/2] fauxton commit: updated refs/heads/master to 2c37da5
Date Tue, 23 Jun 2015 06:42:24 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 52753f1f8 -> 2c37da5cb


Change '<' behaviour

When in a view always return to _all_docs. When viewing a doc use the
history.


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

Branch: refs/heads/master
Commit: 2c37da5cbc934c627e3b6ed8ac2040da2e8e3f36
Parents: 32917ab
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Jun 22 10:29:11 2015 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Jun 23 08:41:49 2015 +0200

----------------------------------------------------------------------
 app/addons/documents/helpers.js           | 5 ++++-
 app/addons/documents/routes-doc-editor.js | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c37da5c/app/addons/documents/helpers.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/helpers.js b/app/addons/documents/helpers.js
index 1d156b2..4a999f7 100644
--- a/app/addons/documents/helpers.js
+++ b/app/addons/documents/helpers.js
@@ -16,7 +16,7 @@ define([
 
   var Helpers = {};
 
-  Helpers.getPreviousPage = function (database, wasCloned) {
+  Helpers.getPreviousPageForDoc = function (database, wasCloned) {
     var previousPage = database.url('index'), // default to the current database's all_docs
page
         lastPages = FauxtonAPI.router.lastPages;
 
@@ -33,6 +33,9 @@ define([
     return previousPage;
   };
 
+  Helpers.getPreviousPage = function (database) {
+    return database.url('index');
+  };
 
   // sequence info is an array in couchdb2 with two indexes. On couch 1.x, it's just a string
/ number
   Helpers.getSeqNum = function (val) {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c37da5c/app/addons/documents/routes-doc-editor.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-doc-editor.js b/app/addons/documents/routes-doc-editor.js
index 400de43..bf5d28c 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -49,7 +49,7 @@ function (app, FauxtonAPI, Helpers, Documents, DocEditor, Databases) {
     },
 
     crumbs: function () {
-      var previousPage = Helpers.getPreviousPage(this.database, this.wasCloned);
+      var previousPage = Helpers.getPreviousPageForDoc(this.database, this.wasCloned);
 
       return [
         { type: 'back', link: previousPage },
@@ -72,7 +72,7 @@ function (app, FauxtonAPI, Helpers, Documents, DocEditor, Databases) {
       this.docView = this.setView('#dashboard-content', new DocEditor.CodeEditor({
         model: this.doc,
         database: this.database,
-        previousPage: Helpers.getPreviousPage(this.database)
+        previousPage: Helpers.getPreviousPageForDoc(this.database)
       }));
     },
 
@@ -126,7 +126,7 @@ function (app, FauxtonAPI, Helpers, Documents, DocEditor, Databases) {
     },
 
     crumbs: function () {
-      var previousPage = Helpers.getPreviousPage(this.database);
+      var previousPage = Helpers.getPreviousPageForDoc(this.database);
       return [
         { type: 'back', link: previousPage },
         { name: 'New Document', link: '#' }


Mime
View raw message