diff options
| author | ryderr <r@okfoc.us> | 2014-09-30 14:59:16 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-09-30 14:59:16 -0400 |
| commit | 0d6aa7c7663f5bebeca9bc9f73a58bd5a7f5957c (patch) | |
| tree | fb01fa83ffaa491b6859e52eb553867893fb773d /public/assets/javascripts/ui/editor/EditorToolbar.js | |
| parent | 515d99f03615b11a5810879e39d34e7bddb043cb (diff) | |
| parent | cc584860a6d5378826d007b5eeeeb6f1477713fd (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorToolbar.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorToolbar.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index 9f439c8..bb4b145 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -23,8 +23,7 @@ var EditorToolbar = View.extend({ }, toggleSettings: function(){ - this.resetMode() - $(".inuse").removeClass("inuse") +// this.resetMode() this.parent.lightControl.hide() this.parent.wallpaperPicker.hide() this.parent.mediaEditor.hide() @@ -40,7 +39,8 @@ var EditorToolbar = View.extend({ resetMode: function(){ // this.resizeMedia(true) - this.destroyMedia(false) + // this.destroyMedia(false) + $(".inuse").removeClass("inuse") this.parent.hideExtras() this.resetPermissions() }, |