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 2b11f52cec065ddb612d0a65469d8ecbc255eb7f..0d00ed2a86d7c5dbf14fed377b6f541bf8756a12 100644 (file)
--- 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 fb7ab0194993e40b6a28e9b6d335f0eef3712731..0ad09131354bca009d491b524afca464edb260ca 100644 (file)
--- 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();