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

Merge "API query improvements"

Browse source
This commit is contained in:
jenkins-bot 2015-06-30 06:02:45 +00:00 committed by Gerrit Code Review
parent 0ccedb678c 6c53f13845
commit c58e93ad28
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/ext.popups.renderer.article.js
View file

@ -49,7 +49,8 @@
mw.popups.render.currentRequest = mw.popups.api.get( { mw.popups.render.currentRequest = mw.popups.api.get( {
action: 'query', action: 'query',
prop: 'extracts|pageimages|revisions|info', prop: 'extracts|pageimages|revisions',
formatversion: 2,
redirects: true, redirects: true,
exintro: true, exintro: true,
exsentences: 2, exsentences: 2,
@ -59,8 +60,6 @@
piprop: 'thumbnail', piprop: 'thumbnail',
pithumbsize: 300, pithumbsize: 300,
rvprop: 'timestamp', rvprop: 'timestamp',
inprop: 'watched',
indexpageids: true,
titles: title titles: title
} ); } );
@ -71,15 +70,15 @@
if ( if (
!re.query || !re.query ||
!re.query.pages || !re.query.pages ||
!re.query.pages[ re.query.pageids[ 0 ] ].extract || !re.query.pages[0].extract ||
re.query.pages[ re.query.pageids[ 0 ] ].extract === '' re.query.pages[0].extract === ''
) { ) {
deferred.reject(); deferred.reject();
return; return;
} }
mw.popups.render.cache[ href ] = {}; mw.popups.render.cache[ href ] = {};
mw.popups.render.cache[ href ].popup = article.createPopup( re, href ); mw.popups.render.cache[ href ].popup = article.createPopup( re.query.pages[0], href );
mw.popups.render.cache[ href ].getOffset = article.getOffset; mw.popups.render.cache[ href ].getOffset = article.getOffset;
mw.popups.render.cache[ href ].getClasses = article.getClasses; mw.popups.render.cache[ href ].getClasses = article.getClasses;
mw.popups.render.cache[ href ].process = article.processPopup; mw.popups.render.cache[ href ].process = article.processPopup;
@ -96,13 +95,12 @@
* is fits inside a rectangle of a particular size. * is fits inside a rectangle of a particular size.
* *
* @method createPopup * @method createPopup
* @param {Object} re * @param {Object} page Information about the linked page
* @param {String} href * @param {String} href
* @return {jQuery} * @return {jQuery}
*/ */
article.createPopup = function ( re, href ) { article.createPopup = function ( page, href ) {
var $div, var $div,
page = re.query.pages[ re.query.pageids[ 0 ] ],
$contentbox = $( '<a>' ) $contentbox = $( '<a>' )
.attr( 'href', href ) .attr( 'href', href )
.addClass( 'mwe-popups-extract' ) .addClass( 'mwe-popups-extract' )
@ -112,7 +110,7 @@
thumbnail = page.thumbnail, thumbnail = page.thumbnail,
tall = thumbnail && thumbnail.height > thumbnail.width, tall = thumbnail && thumbnail.height > thumbnail.width,
$thumbnail = article.createThumbnail( thumbnail, tall ), $thumbnail = article.createThumbnail( thumbnail, tall ),
timestamp = new Date( page.revisions[ 0 ].timestamp ), timestamp = new Date( page.revisions[0].timestamp ),
timediff = new Date() - timestamp, timediff = new Date() - timestamp,
oneDay = 1000 * 60 * 60 * 24, oneDay = 1000 * 60 * 60 * 24,
timestampclass = ( timediff < oneDay ) ? timestampclass = ( timediff < oneDay ) ?