Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80232
Change subject: [wip] Make last row of new gallery not be huge.
......................................................................
[wip] Make last row of new gallery not be huge.
(WIP because I'm waiting for comment from end user).
Change-Id: I0caf8d1800808f14c9f53073f3b901eedec32bb7
---
M resources/mediawiki.page/mediawiki.page.gallery.js
1 file changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/80232/1
diff --git a/resources/mediawiki.page/mediawiki.page.gallery.js
b/resources/mediawiki.page/mediawiki.page.gallery.js
index fd2af40..5305796 100644
--- a/resources/mediawiki.page/mediawiki.page.gallery.js
+++ b/resources/mediawiki.page/mediawiki.page.gallery.js
@@ -94,7 +94,8 @@
$caption,
hookInfo,
i,
- j;
+ j,
+ highestZoom = 1;
for ( i = 0; i < rows.length; i++ ) {
maxWidth = $gallery.width();
@@ -135,7 +136,13 @@
// code, would prevent
accidentally expanding to
// be 10 billion pixels wide.
mw.log( 'mw.page.gallery:
Cannot fit row, aspect is ' + preferredHeight/curRowHeight );
- preferredHeight = 1.5 *
curRowHeight;
+ if ( i === rows.length - 1 ) {
+ // If its the last row,
and we can't fit it,
+ // don't make the
entire row huge.
+ preferredHeight =
highestZoom * curRowHeight;
+ } else {
+ preferredHeight = 1.5 *
curRowHeight;
+ }
}
if ( !isFinite( preferredHeight ) ) {
// This *definitely* should not
happen.
@@ -150,6 +157,11 @@
// Skip this row.
continue;
}
+
+ if ( preferredHeight / curRowHeight >
highestZoom ) {
+ highestZoom = preferredHeight /
curRowHeight;
+ }
+
for ( j = 0; j < curRow.length; j++ ) {
newWidth = preferredHeight *
curRow[j].aspect;
padding = curRow[j].width -
curRow[j].imgWidth;
--
To view, visit https://gerrit.wikimedia.org/r/80232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0caf8d1800808f14c9f53073f3b901eedec32bb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
