diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-29 16:54:49 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-29 16:54:49 -0400 |
| commit | f378a60b4ce813216eaba03bd266559c56c4a54d (patch) | |
| tree | 252b62167b80329fe796976f3c78e2b46f5fa77b | |
| parent | f80ca0ef62785cf72176598b695a1a291dd38e91 (diff) | |
Close room settings modal when image is clicked
Activate Close button in menu when settings modal is open
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorSettings.js | 8 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorView.js | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index 2a3929a..0a3364b 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -96,8 +96,12 @@ var EditorSettings = FormView.extend({ }.bind(this)) }, - toggle: function(){ - this.$el.toggleClass("active") + toggle: function(state){ + var state = typeof state == 'boolean' ? state : ! this.$el.hasClass("active") + this.$el.toggleClass("active", state) + + $(".inuse").removeClass("inuse") + $("[data-role='toggle-project-settings']").toggleClass("inuse", state) }, enterSubmit: function (e) { diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index e11f189..22e32ca 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -46,6 +46,7 @@ var EditorView = View.extend({ hideExtras: function(){ this.mediaEditor.hide() + this.settings.toggle(false) } }) |