X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.jqueryMsg%2Fmediawiki.jqueryMsg.js;h=846deb95e1d21965043630931487e81abdb6a263;hb=1c7c9bdf1f;hp=540de23a7259eb7b220314d41c2b99d6cea5c7df;hpb=d24cb5054ca51282c82db63cc78fc99d2e23dbbf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
index 540de23a72..846deb95e1 100644
--- a/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
@@ -14,13 +14,14 @@
 	var oldParser,
 		slice = Array.prototype.slice,
 		parserDefaults = {
+			// Magic words and their expansions. Server-side data is added to this below.
 			magic: {
 				PAGENAME: mw.config.get( 'wgPageName' ),
 				PAGENAMEE: mw.util.wikiUrlencode( mw.config.get( 'wgPageName' ) )
 			},
 			// Whitelist for allowed HTML elements in wikitext.
 			// Self-closing tags are not currently supported.
-			// Can be populated via setParserDefaults().
+			// Filled in with server-side data below
 			allowedHtmlElements: [],
 			// Key tag name, value allowed attributes for that tag.
 			// See Sanitizer::setupAttributeWhitelist
@@ -56,6 +57,9 @@
 			format: 'parse'
 		};
 
+	// Add in server-side data (allowedHtmlElements and magic words)
+	$.extend( true, parserDefaults, require( './parserDefaults.json' ) );
+
 	/**
 	 * Wrapper around jQuery append that converts all non-objects to TextNode so append will not
 	 * convert what it detects as an htmlString to an element.
@@ -1281,7 +1285,7 @@
 		 * @param {Array} nodes List of nodes
 		 * @return {string} Other message
 		 */
-		'int': function ( nodes ) {
+		int: function ( nodes ) {
 			var msg = textify( nodes[ 0 ] );
 			return mw.jqueryMsg.getMessageFunction()( msg.charAt( 0 ).toLowerCase() + msg.slice( 1 ) );
 		},