diff options
| author | ryderr <r@okfoc.us> | 2014-11-17 18:33:40 -0500 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-11-17 18:33:40 -0500 |
| commit | da2e850031bbeee16993191c98631d1ec1512cd8 (patch) | |
| tree | 58a73321b149bcf4808f580ad9ba61b423d00a1c | |
| parent | dfddccde5447a00887a6546a8b8e7b909f1ea8db (diff) | |
| parent | d5d1f00ff8b3ef4b2465d16abdb8adb6f4613afb (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderView.js | 1 | ||||
| -rw-r--r-- | server/lib/views/index.js | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index d1b0b89..7308344 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -184,7 +184,7 @@ Map.UI.Editor = function(map){ app.tube("builder-pick-room", room) // TODO: watch individual scenery object here - Minotaur.watch( app.router.editorView.settings ) + Minotaur.watch( app.controller.settings ) } } if (base.resizing || base.dragging) { diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js index 9b7e1a2..b975499 100644 --- a/public/assets/javascripts/ui/builder/BuilderView.js +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -12,6 +12,7 @@ var BuilderView = View.extend({ this.toolbar = new BuilderToolbar ({ parent: this }) this.settings = new BuilderSettings ({ parent: this }) this.colorControl = new ColorControl ({ parent: this }) + this.cursor = new HelpCursor({ parent: this }) }, load: function(name){ diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 48b1c32..6f1305a 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -89,10 +89,12 @@ var views = module.exports = { home: function (req, res) { // while in development, blank homepage if not logged in +/* if (! req.user) { res.send("<html></html>") return } +*/ views_middleware.fetchProjects({ featured: true }, null, null, function(err, projects){ res.render('home', { projects: projects || [] |