From 984ab98a403ba024e271c7e57c053a367136c884 Mon Sep 17 00:00:00 2001
From: Albert Yi <albert@carbonfive.com>
Date: Thu, 10 May 2018 11:20:15 -0700
Subject: [PATCH] potential fix for #3672

---
 app/assets/javascripts/uploads.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 0134a748e..ad511a1b6 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -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() {