Merge "Fix gallery rearrange on resize with missing images"

diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.js b/resources/src/mediawiki.page/mediawiki.page.gallery.js
index e3ffbda..e4cd3a2 100644 (file)
--- a/resources/src/mediawiki.page/mediawiki.page.gallery.js
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.js
@@ -222,12 +222,14 @@
                                        imgHeight = $( this ).data( 'imgHeight' ),
                                        width = $( this ).data( 'width' ),
                                        captionWidth = $( this ).data( 'captionWidth' ),
+                                       $innerDiv = $( this ).children( 'div' ).first(),
+                                       $imageDiv = $innerDiv.children( 'div.thumb' ),
                                        $imageElm, imageElm;
 
                                // Restore original sizes so we can arrange the elements as on freshly loaded page
                                $( this ).width( width );
-                               $( this ).children( 'div' ).first().width( width );
-                               $( this ).children( 'div' ).first().children( 'div.thumb' ).width( imgWidth );
+                               $innerDiv.width( width );
+                               $imageDiv.width( imgWidth );
                                $( this ).find( 'div.gallerytextwrapper' ).width( captionWidth );
 
                                $imageElm = $( this ).find( 'img' ).first();
@@ -235,6 +237,8 @@
                                if ( imageElm ) {
                                        imageElm.width = imgWidth;
                                        imageElm.height = imgHeight;
+                               } else {
+                                       $imageDiv.height( imgHeight );
                                }
                        } );
                } ) );