couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [10/19] fauxton commit: updated refs/heads/import-master to 4ab2cde
Date Thu, 17 Apr 2014 08:37:10 GMT
Fauxton fixes

* Fix stats css was leaking over to other pages
* Fix new view creation failing for a new design doc


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

Branch: refs/heads/import-master
Commit: c978156c7480c103898f6b8aa61247a5db6c7e85
Parents: 777d5b1
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Apr 14 11:56:53 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Apr 14 11:56:53 2014 +0200

----------------------------------------------------------------------
 app/addons/documents/routes.js          |  5 +++--
 app/addons/stats/assets/less/stats.less | 10 +++++-----
 app/addons/stats/views.js               |  3 ++-
 assets/js/libs/nv.d3.js                 |  8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c978156c/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 64254f1..3bf8f7e 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -351,8 +351,8 @@ function(app, FauxtonAPI, Documents, Databases) {
           pageSize,
           collection;
 
-      docParams.limit = pageSize = this.getDocPerPageLimit(urlParams, this.documentsView.perPage());
-      this.documentsView.forceRender();
+      var defaultPageSize = _.isUndefined(this.documentsView) ? 20 : this.documentsView.perPage();
+      docParams.limit = pageSize = this.getDocPerPageLimit(urlParams, defaultPageSize);
 
       if (event.allDocs) {
         this.eventAllDocs = true; // this is horrible. But I cannot get the trigger not to
fire the route!
@@ -386,6 +386,7 @@ function(app, FauxtonAPI, Documents, Databases) {
 
       this.documentsView.setCollection(collection);
       this.documentsView.setParams(docParams, urlParams);
+      this.documentsView.forceRender();
 
       this.apiUrl = [collection.urlRef("apiurl", urlParams), "docs"];
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c978156c/app/addons/stats/assets/less/stats.less
----------------------------------------------------------------------
diff --git a/app/addons/stats/assets/less/stats.less b/app/addons/stats/assets/less/stats.less
index 43ddb3b..95020b5 100644
--- a/app/addons/stats/assets/less/stats.less
+++ b/app/addons/stats/assets/less/stats.less
@@ -12,9 +12,9 @@
 
 .datatypes {
   padding: 0 15px;
-}
 
-.span5 {
-	height:450px;
-	min-width: 450px;
-}
\ No newline at end of file
+  .span5 svg {
+    height:450px;
+    min-width: 450px;
+  }
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c978156c/app/addons/stats/views.js
----------------------------------------------------------------------
diff --git a/app/addons/stats/views.js b/app/addons/stats/views.js
index c8374ad..4bd24d8 100644
--- a/app/addons/stats/views.js
+++ b/app/addons/stats/views.js
@@ -20,7 +20,8 @@ define([
 
 ],
 
-function(app, FauxtonAPI,Stats) {
+function(app, FauxtonAPI,Stats, d3, nv) {
+  console.log(nv);
   Views = {};
 
   datatypeEventer = {};

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c978156c/assets/js/libs/nv.d3.js
----------------------------------------------------------------------
diff --git a/assets/js/libs/nv.d3.js b/assets/js/libs/nv.d3.js
index 409dc65..983b901 100755
--- a/assets/js/libs/nv.d3.js
+++ b/assets/js/libs/nv.d3.js
@@ -1,8 +1,9 @@
 //this is a hacky fix because nv.d3 doesn't support requirejs
-define("nvd3", ["d3"], function (d3) {
+define("nv.d3", ["d3"], function (d3) {
+  var nv;
 (function(){
 
-var nv = window.nv || {};
+  nv = window.nv || {};
 
 
 nv.version = '1.1.15b';
@@ -14369,6 +14370,5 @@ nv.models.stackedAreaChart = function() {
   return chart;
 }
 })();
-
-return window.nv;
+return nv;
 });


Mime
View raw message