Fauxton fixes

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

4 files changed, 14 insertions, 12 deletions

diff --git a/src/fauxton/app/addons/documents/routes.js b/src/fauxton/app/addons/documents/routes.js
index 64254f18c..3bf8f7ebe 100644
--- a/src/fauxton/app/addons/documents/routes.js
+++ b/src/fauxton/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"];
     },
diff --git a/src/fauxton/app/addons/stats/assets/less/stats.less b/src/fauxton/app/addons/stats/assets/less/stats.less
index 43ddb3b69..95020b54a 100644
--- a/src/fauxton/app/addons/stats/assets/less/stats.less
+++ b/src/fauxton/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;
+  }
+}
diff --git a/src/fauxton/app/addons/stats/views.js b/src/fauxton/app/addons/stats/views.js
index c8374adb3..4bd24d88e 100644
--- a/src/fauxton/app/addons/stats/views.js
+++ b/src/fauxton/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 = {};
diff --git a/src/fauxton/assets/js/libs/nv.d3.js b/src/fauxton/assets/js/libs/nv.d3.js
index 409dc65e7..983b901fc 100755
--- a/src/fauxton/assets/js/libs/nv.d3.js
+++ b/src/fauxton/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;
 });