jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2680

Browse Source
This commit is contained in:
Albert Yi
2018-11-12 16:29:44 -08:00
parent bea8c2a4b8
commit a57d4a9558
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/src/javascripts/uploads.js
View File

@@ -13,7 +13,12 @@ Upload.initialize_all = function() {
if ($("#image").prop("complete")) {
this.initialize_image();
} else {
$("#image").on("load.danbooru error.danbooru", this.initialize_image);
$("#image").on("error.danbooru", (e) => {
$("#upload-image").hide();
$("#scale-link").hide();
$("#iqdb-similar").hide();
});
$("#image").on("load.danbooru", this.initialize_image);
}
this.initialize_similar();
this.initialize_submit();
@@ -106,10 +111,10 @@ Upload.initialize_image = function() {
var width = $image.width();
var height = $image.height();
if (!width || !height) {
// try again later
$.timeout(100).done(function() {Upload.initialize_image()});
// we errored out
return;
}
$("#no-image-available").hide();
$image.data("original-width", width);
$image.data("original-height", height);
Post.resize_image_to_window($image);