wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-09-23 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

gateway: Don't create new object for thumbnail

Browse source 
As noted in the review of I71a8a84, creating a new object to represent
the thumbnail is confusing. It's also somewhat wasteful.

Since both the MediaWiki API and RESTBase both agree on using "source"
as the key for the thumbnail's URL, it's reasonable to use it in the
gateway and renderer.

Bug: T152004
Change-Id: Ie1346d13b6e88004b817f5968448188ed83cfda4
This commit is contained in:
Sam Smith 2017-01-27 14:22:54 +00:00
parent e3ae38f966
commit 622f2af318
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/ext.popups/gateway.js
View file

@ -96,9 +96,6 @@
if ( page.thumbnail ) {
result.thumbnail = page.thumbnail;
result.thumbnail.url = result.thumbnail.source;
delete ( result.thumbnail.source );
}
return result;

8
resources/ext.popups/renderer.js
View file

@ -350,9 +350,9 @@
( tall && thumbHeight < SIZES.portraitImage.h ) ||
// These characters in URL that could inject CSS and thus JS
(
rawThumbnail.url.indexOf( '\\' ) > -1 ||
rawThumbnail.url.indexOf( '\'' ) > -1 ||
rawThumbnail.url.indexOf( '\"' ) > -1
rawThumbnail.source.indexOf( '\\' ) > -1 ||
rawThumbnail.source.indexOf( '\'' ) > -1 ||
rawThumbnail.source.indexOf( '\"' ) > -1
)
) {
return null;
@ -379,7 +379,7 @@
return {
el: createThumbnailElement(
tall ? 'mwe-popups-is-tall' : 'mwe-popups-is-not-tall',
rawThumbnail.url,
rawThumbnail.source,
x,
y,
thumbWidth,

2
tests/qunit/ext.popups/gateway.test.js
View file

@ -122,7 +122,7 @@
url: 'https://en.wikipedia.org/wiki/Rick_Astley',
thumbnail: {
height: 300,
url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6d/Rick_Astley_-_Pepsifest_2009.jpg/200px-Rick_Astley_-_Pepsifest_2009.jpg',
source: 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6d/Rick_Astley_-_Pepsifest_2009.jpg/200px-Rick_Astley_-_Pepsifest_2009.jpg',
width: 200
},
lastModified: new Date( '2016-11-10T00:14:14Z' ),