From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 4 Oct 2013 13:02:00 +0000 (+0200)
Subject: Improved scaling of large images within spoiler tags
X-Git-Tag: 2.0.0_Beta_11~63^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=38b3a9d743ddbe30b2e0a5d239f82cc07908b8a0;p=GitHub%2FWoltLab%2FWCF.git

Improved scaling of large images within spoiler tags
---

diff --git a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
index 2b11f52cec..0d00ed2a86 100644
--- a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
@@ -14,7 +14,13 @@
 	$(function() {
 		var $spoilerBox = $('.jsSpoilerBox').removeClass('jsSpoilerBox');
 		$spoilerBox.find('> header > .jsSpoilerToggle').click(function() {
-			$(this).toggleClass('active').parent().next().slideToggle();
+			$(this).toggleClass('active').parent().next().slideToggle({
+				complete: function() {
+					if ($(this).is(':visible')) {
+						WCF.DOMNodeInsertedHandler.execute();
+					}
+				}
+			});
 		});
 	});
 	//]]>
diff --git a/wcfsetup/install/files/js/WCF.ImageViewer.js b/wcfsetup/install/files/js/WCF.ImageViewer.js
index fb7ab01949..0ad0913135 100644
--- a/wcfsetup/install/files/js/WCF.ImageViewer.js
+++ b/wcfsetup/install/files/js/WCF.ImageViewer.js
@@ -76,6 +76,12 @@ WCF.ImageViewer = Class.extend({
 	 */
 	_checkImageSize: function(event) {
 		var $image = $(event.currentTarget);
+		if (!$image.is(':visible')) {
+			$image.off('load');
+			
+			return;
+		}
+		
 		$image.removeClass('jsResizeImage');
 		var $dimensions = $image.getDimensions();
 		var $maxWidth = $image.parents('div').innerWidth();