diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-10 16:42:30 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-10 16:42:30 -0500 |
| commit | b9cf4175a3882415824f707a5431222e352658b2 (patch) | |
| tree | 3cdf0a1c6f1188089e8ec272b4e964f1f28fb4ba | |
| parent | 5673a05184ed0624ec33bfea27686e7e70b1d619 (diff) | |
cancel scenery for text
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 1 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/TextEditor.js | 5 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index f6cc8e4..8ca00d3 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -5,6 +5,7 @@ var Scenery = new function(){ base.list = {} base.nextMedia = null + base.nextWallpaper = null base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true }) diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js index 51077af..33b5386 100644 --- a/public/assets/javascripts/ui/editor/TextEditor.js +++ b/public/assets/javascripts/ui/editor/TextEditor.js @@ -25,6 +25,11 @@ var TextEditor = FormView.extend({ this.$fontSize = this.$("[name=font-size]") this.$textBody = this.$("[name=text-body]") this.$textAlign = this.$("[name=text-align]") + + app.on("cancel-scenery", function(){ + this.createMode(true) + $("body").toggleClass("addText", false) + }.bind(this)) }, toggle: function(state){ diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 7b08db6..23d5eb4 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -32,11 +32,13 @@ data-role='toggle-color-control' data-info="edit room colors" class="ion-ios7-sunny-outline"></span> -<!-- +[[ if (user.username == "asdf") { ]] <span data-role='toggle-text-editor' data-info="add text to wall" class="ion-ios7-compose-outline"></span> +[[ } ]] +<!-- <span data-role='toggle-map-view' data-info="toggle map view" |