From 1989b66734bac2b9db38512a0a32b8af98d6f69f Mon Sep 17 00:00:00 2001
From: Phil Hughes <theephil@gmail.com>
Date: Thu, 26 Mar 2015 21:08:17 +0000
Subject: [PATCH] Fixed JS issue with diff image loading
---
app/assets/javascripts/commit/image-file.js.coffee | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/commit/image-file.js.coffee b/app/assets/javascripts/commit/image-file.js.coffee
index 9e5f49b1f69..9c723f51e54 100644
--- a/app/assets/javascripts/commit/image-file.js.coffee
+++ b/app/assets/javascripts/commit/image-file.js.coffee
@@ -119,8 +119,9 @@ class @ImageFile
requestImageInfo: (img, callback) ->
domImg = img.get(0)
- if domImg.complete
- callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
- else
- img.on 'load', =>
+ if domImg
+ if domImg.complete
callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
+ else
+ img.on 'load', =>
+ callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
--
GitLab