From 5eca3ca414e7cb1b440d6c723518e5d8ee25b163 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 12 Jul 2018 22:22:31 -0700
Subject: [PATCH] mediawiki.page.gallery: Various clean up and minor
 optimisations

* Moved some variables to a lower scope more appropiate,
  to make it easier to understand what they are used for,
  and to reduce chances of mistakes in the future.

* Use push() instead of .length assignment.

* Use the same property for checks as for access ([0] vs length),
  also potentially faster, but nothing worth mentioning.

* Avoid duplicate $this.outerWidth(), expensive computation.

Bug: T88654
Change-Id: Ib03d05a5c6422afdec11c56360bd568bdb2633fb
---
 resources/src/mediawiki.page.gallery.js | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/resources/src/mediawiki.page.gallery.js b/resources/src/mediawiki.page.gallery.js
index 892f04416d..ff27c58280 100644
--- a/resources/src/mediawiki.page.gallery.js
+++ b/resources/src/mediawiki.page.gallery.js
@@ -22,20 +22,17 @@
 	 */
 	function justify() {
 		var lastTop,
-			$img,
-			imgWidth,
-			imgHeight,
-			captionWidth,
 			rows = [],
 			$gallery = $( this );
 
 		$gallery.children( 'li.gallerybox' ).each( function () {
-			// Math.floor to be paranoid if things are off by 0.00000000001
-			var top = Math.floor( $( this ).position().top ),
+			var $img, imgWidth, imgHeight, outerWidth, captionWidth,
+				// Math.floor, to be paranoid if things are off by 0.00000000001
+				top = Math.floor( $( this ).position().top ),
 				$this = $( this );
 
 			if ( top !== lastTop ) {
-				rows[ rows.length ] = [];
+				rows.push( [] );
 				lastTop = top;
 			}
 
@@ -59,20 +56,21 @@
 			}
 
 			captionWidth = $this.children().children( 'div.gallerytextwrapper' ).width();
-			rows[ rows.length - 1 ][ rows[ rows.length - 1 ].length ] = {
+			outerWidth = $this.outerWidth();
+			rows[ rows.length - 1 ].push( {
 				$elm: $this,
-				width: $this.outerWidth(),
+				width: outerWidth,
 				imgWidth: imgWidth,
-				// XXX: can divide by 0 ever happen?
+				// FIXME: Deal with devision by 0.
 				aspect: imgWidth / imgHeight,
 				captionWidth: captionWidth,
 				height: imgHeight
-			};
+			} );
 
 			// Save all boundaries so we can restore them on window resize
 			$this.data( 'imgWidth', imgWidth );
 			$this.data( 'imgHeight', imgHeight );
-			$this.data( 'width', $this.outerWidth() );
+			$this.data( 'width', outerWidth );
 			$this.data( 'captionWidth', captionWidth );
 		} );
 
@@ -173,7 +171,6 @@
 					$innerDiv = $outerDiv.children( 'div' ).first();
 					$imageDiv = $innerDiv.children( 'div.thumb' );
 					$imageElm = $imageDiv.find( 'img' ).first();
-					imageElm = $imageElm.length ? $imageElm[ 0 ] : null;
 					$caption = $outerDiv.find( 'div.gallerytextwrapper' );
 
 					// Since we are going to re-adjust the height, the vertical
@@ -195,8 +192,9 @@
 						$caption.width( curRow[ j ].captionWidth + ( newWidth - curRow[ j ].imgWidth ) );
 					}
 
-					if ( imageElm ) {
-						// We don't always have an img, e.g. in the case of an invalid file.
+					// We don't always have an img, e.g. in the case of an invalid file.
+					if ( $imageElm[ 0 ] ) {
+						imageElm = $imageElm[ 0 ];
 						imageElm.width = newWidth;
 						imageElm.height = preferredHeight;
 					} else {
@@ -235,8 +233,8 @@
 			$( this ).find( 'div.gallerytextwrapper' ).width( captionWidth );
 
 			$imageElm = $( this ).find( 'img' ).first();
-			imageElm = $imageElm.length ? $imageElm[ 0 ] : null;
-			if ( imageElm ) {
+			if ( $imageElm[ 0 ] ) {
+				imageElm = $imageElm[ 0 ];
 				imageElm.width = imgWidth;
 				imageElm.height = imgHeight;
 			} else {
-- 
2.20.1