diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-03 15:37:37 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-03 15:37:37 -0500 |
| commit | e7228c5c33a48853fb7e7de0be30aa468b1255b7 (patch) | |
| tree | 6d96174edcbc52e37df60dd86d46ab709cda9bcb | |
| parent | 68f3943062919ae081deb3a105dcd1513969b9ee (diff) | |
fix media help
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorToolbar.js | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index 3c75b95..277718a 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -55,16 +55,14 @@ var EditorToolbar = View.extend({ }, openMediaViewer: function(){ - this.parent.mediaViewer.show() - this.parent.mediaUpload.show() this.resetMode() this.resetControls() this.toggleMap(false) + this.parent.mediaViewer.show() + this.parent.mediaUpload.show() }, resetMode: function(){ - // this.resizeMedia(true) - // this.destroyMedia(false) $(".inuse").removeClass("inuse") $("body").removeClass("addText") this.parent.hideExtras() @@ -88,26 +86,6 @@ var EditorToolbar = View.extend({ editor.permissions.remove("destroy") }, - destroyMedia: function(e, state){ - this.resetControls() - if (! state && typeof e == "boolean") { - state = e - editor.permissions.assign("destroy", state) - } - else { - state = editor.permissions.toggle("destroy") - } - if (! state) { - this.resetPermissions() - } - else { - app.controller.hideExtras() - } - $(".inuse").removeClass("inuse") - $("[data-role='destroy-media']").toggleClass("inuse", state) - $("body").toggleClass("destroyActive", state) - }, - toggleWallpaper: function(){ var state = ! $("[data-role='toggle-wallpaper-panel']").hasClass("inuse") this.resetMode() |
