From 3d1a055d68f1128cffb1bfef9ae433b79b295110 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Tue, 2 Jul 2013 18:30:37 -0700
Subject: [PATCH] fixes #1818

---
 app/assets/javascripts/posts.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 5034fd9b9..9f40ddfea 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -339,11 +339,13 @@
       var $link = $(e.target);
       var $image = $("#image");
       $image.attr("src", $link.attr("href"));
-      $image.width($image.data("original-width"));
-      $image.height($image.data("original-height"));
-      Danbooru.Note.Box.scale_all();
-      $("#image-resize-notice").hide();
-      $image.data("scale_factor", 1);
+      $image.on("load", function() {
+        $image.width($image.data("original-width"));
+        $image.height($image.data("original-height"));        
+        Danbooru.Note.Box.scale_all();
+        $("#image-resize-notice").hide();
+        $image.data("scale_factor", 1);
+      });
       e.preventDefault();
     });
   }