diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:13:29 -0400 |
| commit | 6ba3c656827c8e1fa84724c6b5dc2ba4f0991ffe (patch) | |
| tree | 3959a14e110857ac2c88a344949f24fdb3fe42ca /public/assets/javascripts/ui/editor/EditorToolbar.js | |
| parent | a8d3a30892687f58e3f18b768104ea54480cd465 (diff) | |
| parent | 4a0717d5f8aa0ff3378ff589b106cd35c0586367 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorToolbar.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorToolbar.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index c631317..e91da0f 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -23,6 +23,11 @@ var EditorToolbar = View.extend({ }, toggleSettings: function(){ + this.resetMode() + $(".inuse").removeClass("inuse") + this.parent.lightControl.hide() + this.parent.wallpaperPicker.hide() + this.parent.mediaEditor.hide() this.parent.settings.toggle() }, @@ -84,7 +89,9 @@ var EditorToolbar = View.extend({ var state = ! $("[data-role='toggle-wallpaper-panel']").hasClass("inuse") this.resetMode() $("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state) + this.parent.mediaEditor.hide() this.parent.lightControl.hide() + this.parent.settings.hide() this.parent.wallpaperPicker.toggle(state) }, @@ -92,7 +99,9 @@ var EditorToolbar = View.extend({ var state = ! $("[data-role='toggle-light-control']").hasClass("inuse") this.resetMode() $("[data-role='toggle-light-control']").toggleClass("inuse", state) + this.parent.mediaEditor.hide() this.parent.wallpaperPicker.hide() + this.parent.settings.hide() this.parent.lightControl.toggle(state) }, |