jenkins-bot has submitted this change and it was merged.
Change subject: Move the article renderer in to the renderers property
......................................................................
Move the article renderer in to the renderers property
To allow multiple renderers (for different types of content)
to be defined.
Change-Id: I50320646e26f36a0a2bc425c82ccc58912840f84
---
M resources/ext.popups.renderer.article.js
M resources/ext.popups.renderer.js
M tests/qunit/ext.popups.renderer.article.test.js
3 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/ext.popups.renderer.article.js
b/resources/ext.popups.renderer.article.js
index 5be74c8..3c7fdea 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -558,6 +558,6 @@
}
};
- mw.popups.render.article = article;
+ mw.popups.render.renderers.article = article;
} ) ( jQuery, mediaWiki );
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index bfcd0c4..fdf758b 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -55,6 +55,12 @@
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
* or by finding and calling the correct renderer
*
@@ -104,7 +110,7 @@
.done( function () {
// TODO: check for link type and call
correct renderer
// 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 );
diff --git a/tests/qunit/ext.popups.renderer.article.test.js
b/tests/qunit/ext.popups.renderer.article.test.js
index 6c735f0..342ac1a 100644
--- a/tests/qunit/ext.popups.renderer.article.test.js
+++ b/tests/qunit/ext.popups.renderer.article.test.js
@@ -1,13 +1,13 @@
( 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.expect( 13 );
function test ( extract, title, expected, msg ) {
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 );
}
--
To view, visit https://gerrit.wikimedia.org/r/232235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50320646e26f36a0a2bc425c82ccc58912840f84
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
