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

potential fix for #3672

Browse Source
This commit is contained in:
Albert Yi
2018-05-10 11:20:15 -07:00
parent 72f319ccf3
commit 984ab98a40
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/assets/javascripts/uploads.js
View File

@@ -8,7 +8,11 @@
}
if ($("#c-uploads").length) {
$("#image").on("load", this.initialize_image);
if ($("#image").prop("complete")) {
this.initialize_image();
} else {
$("#image").on("load error", this.initialize_image);
}
this.initialize_info_bookmarklet();
this.initialize_similar();
this.initialize_shortcuts();
@@ -165,16 +169,22 @@
Danbooru.Upload.initialize_image = function() {
var $image = $("#image");
if ($image.length) {
var width = $image.width();
var height = $image.height();
$image.data("original-width", width);
$image.data("original-height", height);
Danbooru.Post.resize_image_to_window($image);
Danbooru.Post.initialize_post_image_resize_to_window_link();
Danbooru.Upload.update_scale();
$("#image-resize-to-window-link").click(Danbooru.Upload.update_scale);
if (!$image.length) {
return;
}
var width = $image.width();
var height = $image.height();
if (!width || !height) {
// try again later
$.timeout(100).done(function() {Danbooru.Upload.initialize_image()});
return;
}
$image.data("original-width", width);
$image.data("original-height", height);
Danbooru.Post.resize_image_to_window($image);
Danbooru.Post.initialize_post_image_resize_to_window_link();
Danbooru.Upload.update_scale();
$("#image-resize-to-window-link").click(Danbooru.Upload.update_scale);
}
Danbooru.Upload.toggle_commentary = function() {