summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaViewer.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaViewer.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js7
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