Commit 1172f3b5 authored by Tobias Reich's avatar Tobias Reich
Browse files

Close upload when clicking the close button

parent cf6ea753
...@@ -164,9 +164,6 @@ $(document).ready(function(){ ...@@ -164,9 +164,6 @@ $(document).ready(function(){
/* Add Dialog */ /* Add Dialog */
.on(event_name, ".button_add", function(e) { contextMenu.add(e) }) .on(event_name, ".button_add", function(e) { contextMenu.add(e) })
/* Upload */
.on("change", "#upload_files", function() { modal.close(); upload.start.local(this.files) })
/* Context Menu */ /* Context Menu */
.on("contextmenu", ".photo", function(e) { contextMenu.photo(photo.getID(), e) }) .on("contextmenu", ".photo", function(e) { contextMenu.photo(photo.getID(), e) })
.on("contextmenu", ".album", function(e) { contextMenu.album(album.getID(), e) }) .on("contextmenu", ".album", function(e) { contextMenu.album(album.getID(), e) })
...@@ -177,6 +174,8 @@ $(document).ready(function(){ ...@@ -177,6 +174,8 @@ $(document).ready(function(){
.on(event_name, "#infobox_overlay", view.infobox.hide) .on(event_name, "#infobox_overlay", view.infobox.hide)
/* Upload */ /* Upload */
.on("change", "#upload_files", function() { modal.close(); upload.start.local(this.files) })
.on(event_name, ".upload_message a.close", upload.close)
.on("dragover", function(e) { e.preventDefault(); }, false) .on("dragover", function(e) { e.preventDefault(); }, false)
.on("drop", function(e) { .on("drop", function(e) {
e.stopPropagation(); e.stopPropagation();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment