diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
| commit | 712387da2f75c845807ad4489b29fec34bfe9a56 (patch) | |
| tree | 2fab35671b730b7305b920ba1b63299fd8fa4922 /public/assets/javascripts/ui/editor/MediaViewer.js | |
| parent | 9151023c978bd3aed20ad00d5d3301dfe7ed2a2a (diff) | |
| parent | 1668d6e2e20c9bd53f3f6a299541c582da9742b4 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaViewer.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaViewer.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 05e666b..2535f1b 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -35,7 +35,7 @@ var MediaViewer = ModalView.extend({ hide: function(){ this.__super__.hide.call(this) - this.deleteArmed(null, false) + this.deleteArmed(false) this.parent.mediaUpload.hide() }, @@ -72,7 +72,10 @@ var MediaViewer = ModalView.extend({ deleteIsArmed: false, deleteArmed: function(e, state){ - if (typeof state != "boolean") { + if (typeof e == "boolean") { + state = e + } + else if (typeof state != "boolean") { state = ! this.deleteIsArmed } this.deleteIsArmed = state |