mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups
synced 2024-11-24 07:34:11 +00:00
Move the article renderer in to the renderers property
To allow multiple renderers (for different types of content) to be defined. Change-Id: I50320646e26f36a0a2bc425c82ccc58912840f84
This commit is contained in:
parent
faa464d19d
commit
1565a1d3c9
|
@ -558,6 +558,6 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mw.popups.render.article = article;
|
mw.popups.render.renderers.article = article;
|
||||||
|
|
||||||
} ) ( jQuery, mediaWiki );
|
} ) ( jQuery, mediaWiki );
|
||||||
|
|
|
@ -54,6 +54,12 @@
|
||||||
*/
|
*/
|
||||||
mw.popups.render.currentRequest = undefined;
|
mw.popups.render.currentRequest = undefined;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Object to store all renderers
|
||||||
|
* @property {Object} renderers
|
||||||
|
*/
|
||||||
|
mw.popups.render.renderers = {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close all other popups and render the new one from the cache
|
* Close all other popups and render the new one from the cache
|
||||||
* or by finding and calling the correct renderer
|
* or by finding and calling the correct renderer
|
||||||
|
@ -104,7 +110,7 @@
|
||||||
.done( function () {
|
.done( function () {
|
||||||
// TODO: check for link type and call correct renderer
|
// TODO: check for link type and call correct renderer
|
||||||
// There is only one popup type right now so it isn't necessary
|
// There is only one popup type right now so it isn't necessary
|
||||||
var cachePopup = mw.popups.render.article.init( link );
|
var cachePopup = mw.popups.render.renderers.article.init( link );
|
||||||
|
|
||||||
mw.popups.render.openTimer = mw.popups.render.wait( mw.popups.render.POPUP_DELAY - mw.popups.render.API_DELAY );
|
mw.popups.render.openTimer = mw.popups.render.wait( mw.popups.render.POPUP_DELAY - mw.popups.render.API_DELAY );
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
( function ( $, mw ) {
|
( function ( $, mw ) {
|
||||||
|
|
||||||
QUnit.module( 'ext.popups.renderer.article', QUnit.newMwEnvironment() );
|
QUnit.module( 'ext.popups.renderer.renderers.article', QUnit.newMwEnvironment() );
|
||||||
|
|
||||||
QUnit.test( 'render.article.getProcessedElements', function ( assert ) {
|
QUnit.test( 'render.article.getProcessedElements', function ( assert ) {
|
||||||
QUnit.expect( 13 );
|
QUnit.expect( 13 );
|
||||||
|
|
||||||
function test ( extract, title, expected, msg ) {
|
function test ( extract, title, expected, msg ) {
|
||||||
var $div = $( '<div>' ).append(
|
var $div = $( '<div>' ).append(
|
||||||
mw.popups.render.article.getProcessedElements( extract, title )
|
mw.popups.render.renderers.article.getProcessedElements( extract, title )
|
||||||
);
|
);
|
||||||
assert.equal( $div.html(), expected, msg );
|
assert.equal( $div.html(), expected, msg );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue