diff options
| -rw-r--r-- | src/ControlBar.js | 5 | ||||
| -rw-r--r-- | src/Loader.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ControlBar.js b/src/ControlBar.js index 3e1f0b57..bed7742f 100644 --- a/src/ControlBar.js +++ b/src/ControlBar.js @@ -1,8 +1,9 @@ // Copyright (C) 2008,2009 BRAT Tech LLC -nglr.ControlBar = function (document, serverUrl) { +nglr.ControlBar = function (document, serverUrl, database) { this.document = document; this.serverUrl = serverUrl; + this.database = database; this.window = window; this.callbacks = []; }; @@ -21,7 +22,7 @@ nglr.ControlBar.HTML = nglr.ControlBar.prototype.login = function (loginSubmitFn) { this.callbacks.push(loginSubmitFn); if (this.callbacks.length == 1) { - this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor())); + this.doTemplate("/user_session/new.mini?database="+encodeURIComponent(this.database)+"&return_url=" + encodeURIComponent(this.urlWithoutAnchor())); } }; diff --git a/src/Loader.js b/src/Loader.js index fdcfa3cc..e4dec316 100644 --- a/src/Loader.js +++ b/src/Loader.js @@ -213,7 +213,7 @@ nglr.Loader.prototype.bindHtml = function() { var widgetFactory = new nglr.WidgetFactory(this.config.server, this.config.database); var binder = new nglr.Binder(document[0], widgetFactory, watcher, this.config); widgetFactory.onChangeListener = nglr.shiftBind(binder, binder.updateModel); - var controlBar = new nglr.ControlBar(document.find('body'), this.config.server); + var controlBar = new nglr.ControlBar(document.find('body'), this.config.server, this.config.database); var onUpdate = function(){binder.updateView();}; var server = this.config.database=="$MEMORY" ? new nglr.FrameServer(this.window) : |