diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-12-01 19:05:47 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-12-01 19:05:47 -0500 |
| commit | 3894b197a61f7370597218cda6a2a5eccde9375b (patch) | |
| tree | 134c72dd76b2873994c428a0dd9e4c6a7c3ebfe7 /public/assets/javascripts/ui/editor/EditorToolbar.js | |
| parent | 598b7d86716d83f3f5c571c98dbf41ae1706cb40 (diff) | |
| parent | c423e246d4e18ce65861e384bee6c147aff79ddb (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorToolbar.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorToolbar.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index 277718a..a5ad2dd 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -59,7 +59,6 @@ var EditorToolbar = View.extend({ this.resetControls() this.toggleMap(false) this.parent.mediaViewer.show() - this.parent.mediaUpload.show() }, resetMode: function(){ |