Fauxton - add route and masterlayout to RouteObject initialise

4 files changed, 6 insertions, 8 deletions

diff --git a/src/fauxton/app/addons/stats/views.js b/src/fauxton/app/addons/stats/views.js
index 9fda708b4..9dd9cbcde 100644
--- a/src/fauxton/app/addons/stats/views.js
+++ b/src/fauxton/app/addons/stats/views.js
@@ -21,7 +21,6 @@ define([
 ],
 
 function(app, FauxtonAPI,Stats) {
-  console.log(arguments);
   Views = {};
 
   datatypeEventer = {};
@@ -69,8 +68,6 @@ function(app, FauxtonAPI,Stats) {
 
         series = _.filter(series, function(d){return d.y > 0;});
         series = _.sortBy(series, function(d){return -d.y;});
-        console.log('series');
-        console.log(series);
 
         nv.addGraph(function() {
             var width = 550,
diff --git a/src/fauxton/app/api.js b/src/fauxton/app/api.js
index 67c3863b9..d9f974112 100644
--- a/src/fauxton/app/api.js
+++ b/src/fauxton/app/api.js
@@ -163,7 +163,7 @@ function(app, Fauxton) {
   });
 
   FauxtonAPI.setSession = function (newSession) {
-    FauxtonAPI.session = newSession;
+    app.session = FauxtonAPI.session = newSession;
     return FauxtonAPI.session.fetchUser();
   };
 
diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js
index bb8b19383..1a755591f 100644
--- a/src/fauxton/app/modules/documents/routes.js
+++ b/src/fauxton/app/modules/documents/routes.js
@@ -28,7 +28,7 @@ function(app, FauxtonAPI, Documents, Databases) {
   var DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
     layout: "one_pane",
 
-    initialize: function(options) {
+    initialize: function(route, masterLayout, options) {
       var databaseName = options[0], docID = options[1];
 
       this.database = this.database || new Databases.Model({id: databaseName});
@@ -180,7 +180,7 @@ function(app, FauxtonAPI, Documents, Databases) {
       "database/:database/new_view": "newViewEditor"
     },
 
-    initialize: function (options) {
+    initialize: function (route, masterLayout, options) {
       var docOptions = app.getParams();
       docOptions.include_docs = true;
 
@@ -299,7 +299,7 @@ function(app, FauxtonAPI, Documents, Databases) {
       "database/:database/_changes(:params)": "changes"
     },
 
-    initialize: function (options) {
+    initialize: function (route, masterLayout, options) {
       this.databaseName = options[0];
       this.database = new Databases.Model({id: this.databaseName});
 
diff --git a/src/fauxton/app/router.js b/src/fauxton/app/router.js
index 7587df6b2..fea1b32e4 100644
--- a/src/fauxton/app/router.js
+++ b/src/fauxton/app/router.js
@@ -60,7 +60,7 @@ function(req, app, Initialize, FauxtonAPI, Fauxton, Layout, Databases, Documents
           var args = Array.prototype.slice.call(arguments);
 
           if (!that.activeRouteObject || !that.activeRouteObject.hasRoute(route)) {
-            that.activeRouteObject = new RouteObject(args);
+            that.activeRouteObject = new RouteObject(route, masterLayout, args);
           }
 
           var routeObject = that.activeRouteObject,
@@ -116,6 +116,7 @@ function(req, app, Initialize, FauxtonAPI, Fauxton, Layout, Databases, Documents
       this.navBar = app.navBar = new Fauxton.NavBar();
       this.apiBar = app.apiBar = new Fauxton.ApiBar();
       this.auth = app.auth = FauxtonAPI.auth;
+      app.session = FauxtonAPI.session;
 
       app.masterLayout = this.masterLayout = new Layout(this.navBar, this.apiBar);
       app.footer = new Fauxton.Footer({el: "#footer-content"});