diff options
| -rw-r--r-- | public/assets/javascripts/ui/editor/WallpaperPicker.js | 9 | ||||
| -rw-r--r-- | server/lib/views/index.js | 7 | ||||
| -rw-r--r-- | views/about/_blank.ejs | 24 | ||||
| -rw-r--r-- | views/about/index.ejs | 23 |
4 files changed, 63 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index c383489..e2aaeb7 100644 --- a/public/assets/javascripts/ui/editor/WallpaperPicker.js +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -186,10 +186,19 @@ var WallpaperPicker = UploadView.extend({ this.$scale.val( Math.log( this.wall.background.scale ) ) }, + scaleTimeout: null, updateScale: function(){ if (! this.wall) return; var scale = Math.exp( parseFloat(this.$scale.val()) ) this.wall.wallpaperPosition({ scale: scale }) + + clearTimeout(this.scaleTimeout) + this.scaleTimeout = setTimeout(function(){ + + // TODO: watch individual scenery object here + Minotaur.watch( app.router.editorView.settings ) + + }.bind(this), 500) }, enterUrl: function(){ diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 31cb1db..48b1c32 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,6 +111,13 @@ var views = module.exports = { docs: function (req, res){ var name = req.params.name || "index" + try { + res.render('about/' + name) + return + } + catch (e) { + } + if (name === "new") { res.render('docs', { doc: { name: "new" }, diff --git a/views/about/_blank.ejs b/views/about/_blank.ejs new file mode 100644 index 0000000..0e9ea7e --- /dev/null +++ b/views/about/_blank.ejs @@ -0,0 +1,24 @@ +<!doctype html> +<html> +<head> + <title>vvalls</title> + [[ include ../partials/meta ]] +</head> +<body class="loading"> + <div class="rapper page home"> + [[ include ../partials/header ]] + + + <!-- put stuff here --> + + + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + + </div> +</body> +[[ include ../partials/scripts ]] +</html> diff --git a/views/about/index.ejs b/views/about/index.ejs new file mode 100644 index 0000000..4d40a5c --- /dev/null +++ b/views/about/index.ejs @@ -0,0 +1,23 @@ +<!doctype html> +<html> +<head> + <title>vvalls</title> + [[ include ../partials/meta ]] +</head> +<body class="loading"> + <div class="rapper page home"> + [[ include ../partials/header ]] + + + <!-- put stuff here --> + <h1>INDEX</h1> + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + + </div> +</body> +[[ include ../partials/scripts ]] +</html> |