couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [6/6] fauxton commit: updated refs/heads/sidebar-fixes to 1ba9f1a
Date Mon, 18 Aug 2014 09:48:36 GMT
Fixes from review


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

Branch: refs/heads/sidebar-fixes
Commit: 1ba9f1a817a147ce53ee73d3cdfcff860322c4e1
Parents: 8f4a997
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Aug 18 11:48:20 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Aug 18 11:48:20 2014 +0200

----------------------------------------------------------------------
 app/addons/documents/routes.js              | 1 +
 app/addons/documents/templates/sidebar.html | 2 +-
 app/addons/documents/tests/routeSpec.js     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1ba9f1a8/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 8eca7f6..a0f1a2c 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -256,6 +256,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases,
Resou
       }
 
       this.data.database.buildAllDocs(docParams);
+      console.log('aa docs', docParams);
 
       if (docParams.startkey && docParams.startkey.indexOf('_design') > -1) {
         this.sidebar.setSelectedTab('design-docs');

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1ba9f1a8/app/addons/documents/templates/sidebar.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/sidebar.html b/app/addons/documents/templates/sidebar.html
index 3965b14..23d113f 100644
--- a/app/addons/documents/templates/sidebar.html
+++ b/app/addons/documents/templates/sidebar.html
@@ -23,7 +23,7 @@ the License.
       <div id="new-all-docs-button" class="add-dropdown"> </div>
    </li>
   <li>
-      <a id="design-docs" href='#<%= database.url("index") %>?startkey="_design/"&endkey="_design0"'
 class="toggle-view"> All Design Docs</a>
+      <a id="design-docs" href='#<%= database.url("index") %>?startkey="_design"&endkey="_design0"'
 class="toggle-view"> All Design Docs</a>
       <div id="new-design-docs-button" class="add-dropdown"> </div>
     </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1ba9f1a8/app/addons/documents/tests/routeSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/routeSpec.js b/app/addons/documents/tests/routeSpec.js
index 0526240..d7ecebd 100644
--- a/app/addons/documents/tests/routeSpec.js
+++ b/app/addons/documents/tests/routeSpec.js
@@ -25,7 +25,7 @@ define([
         docRoute.changes();
 
         console.log('docRoute.apiUrl()', docRoute.apiUrl());
-        assert.ok(!!docRoute.apiUrl()[0].match(/\/database\/fakeDB\/_changes\?descending=true&limit=100&include_docs=true/));
+        assert.ok(/\/database\/fakeDB\/_changes\?descending=true&limit=100&include_docs=true/.test(docRoute.apiUrl()[0]));
       });
 
     });


Mime
View raw message