//
// Only 'text', 'parse', and 'escaped' are supported, and the
// actual escaping for 'escaped' is done by other code (generally
- // through jqueryMsg).
+ // through mediawiki.js).
//
// However, note that this default only
// applies to direct calls to jqueryMsg. The default for mediawiki.js itself
/**
* N.B. replacements are variadic arguments or an array in second parameter. In other words:
- * somefunction(a, b, c, d)
+ * somefunction( a, b, c, d )
* is equivalent to
- * somefunction(a, [b, c, d])
+ * somefunction( a, [b, c, d] )
*
* @param {string} key Message key.
* @param {Array|mixed} replacements Optional variable replacements (variadically or an array).
var failableParserFn = getFailableParserFn( options );
/**
* N.B. replacements are variadic arguments or an array in second parameter. In other words:
- * somefunction(a, b, c, d)
+ * somefunction( a, b, c, d )
* is equivalent to
- * somefunction(a, [b, c, d])
+ * somefunction( a, [b, c, d] )
*
* We append to 'this', which in a jQuery plugin context will be the selected elements.
* @param {string} key Message key.
// This may be because, to save code, memoization was removed
regularLiteral = makeRegexParser( /^[^{}\[\]$<\\]/ );
- regularLiteralWithoutBar = makeRegexParser(/^[^{}\[\]$\\|]/);
- regularLiteralWithoutSpace = makeRegexParser(/^[^{}\[\]$\s]/);
+ regularLiteralWithoutBar = makeRegexParser( /^[^{}\[\]$\\|]/ );
+ regularLiteralWithoutSpace = makeRegexParser( /^[^{}\[\]$\s]/ );
regularLiteralWithSquareBrackets = makeRegexParser( /^[^{}$\\]/ );
backslash = makeStringParser( '\\' );
// Used to define "literals" without spaces, in space-delimited situations
function literalWithoutSpace() {
var result = nOrMore( 1, escapedOrLiteralWithoutSpace )();
- return result === null ? null : result.join('');
+ return result === null ? null : result.join( '' );
}
// Used to define "literals" within template parameters. The pipe character is the parameter delimeter, so by default
// it is not a literal in the parameter
function literalWithoutBar() {
var result = nOrMore( 1, escapedOrLiteralWithoutBar )();
- return result === null ? null : result.join('');
+ return result === null ? null : result.join( '' );
}
// Used for wikilink page names. Like literalWithoutBar, but
// without allowing escapes.
function unescapedLiteralWithoutBar() {
var result = nOrMore( 1, regularLiteralWithoutBar )();
- return result === null ? null : result.join('');
+ return result === null ? null : result.join( '' );
}
function literal() {
var result = nOrMore( 1, escapedOrRegularLiteral )();
- return result === null ? null : result.join('');
+ return result === null ? null : result.join( '' );
}
function curlyBraceTransformExpressionLiteral() {
var result = nOrMore( 1, regularLiteralWithSquareBrackets )();
- return result === null ? null : result.join('');
+ return result === null ? null : result.join( '' );
}
asciiAlphabetLiteral = makeRegexParser( /[A-Za-z]+/ );
whitespace,
asciiAlphabetLiteral,
htmlAttributeEquals,
- choice( [
+ choice( [
doubleQuotedHtmlAttributeValue,
singleQuotedHtmlAttributeValue
] )
endTagName = parsedCloseTagResult[1];
wrappedAttributes = parsedOpenTagResult[2];
attributes = wrappedAttributes.slice( 1 );
- if ( isAllowedHtml( startTagName, endTagName, attributes) ) {
+ if ( isAllowedHtml( startTagName, endTagName, attributes ) ) {
result = [ 'HTMLELEMENT', startTagName, wrappedAttributes ].concat( parsedHtmlContents );
} else {
// HTML is not allowed, so contents will remain how
] );
return result === null ? null : [ result[0], result[2] ];
}
- colon = makeStringParser(':');
+ colon = makeStringParser( ':' );
templateContents = choice( [
function () {
var res = sequence( [
return [ res[0] ].concat( res[1] );
}
] );
- openTemplate = makeStringParser('{{');
- closeTemplate = makeStringParser('}}');
+ openTemplate = makeStringParser( '{{' );
+ closeTemplate = makeStringParser( '}}' );
nonWhitespaceExpression = choice( [
template,
wikilink,
var page, anchor, url;
page = nodes[0];
- url = mw.util.wikiGetlink( page );
+ url = mw.util.getUrl( page );
// [[Some Page]] or [[Namespace:Some Page]]
if ( nodes.length === 1 ) {
* Transform parsed structure into external link
* If the href is a jQuery object, treat it as "enclosing" the link text.
* ... function, treat it as the click handler
- * ... string, treat it as a URI
+ * ... string, treat it as a URI
* TODO: throw an error if nodes.length > 2 ?
* @param {Array} of two elements, {jQuery|Function|String} and {String}
* @return {jQuery}
extlinkparam: function ( nodes, replacements ) {
var replacement,
index = parseInt( nodes[0], 10 );
- if ( index < replacements.length) {
+ if ( index < replacements.length ) {
replacement = replacements[index];
} else {
replacement = '$' + ( index + 1 );
plural: function ( nodes ) {
var forms, count;
count = parseFloat( this.language.convertNumber( nodes[0], true ) );
- forms = nodes.slice(1);
+ forms = nodes.slice( 1 );
return forms.length ? this.language.convertPlural( count, forms ) : '';
},
// Caching is somewhat problematic, because we do need different message functions for different maps, so
// we'd have to cache the parser as a member of this.map, which sounds a bit ugly.
// Do not use mw.jqueryMsg unless required
- if ( this.format === 'plain' || !/\{\{|[\[<>]/.test(this.map.get( this.key ) ) ) {
+ if ( this.format === 'plain' || !/\{\{|[\[<>]/.test( this.map.get( this.key ) ) ) {
// Fall back to mw.msg's simple parser
return oldParser.apply( this );
}
dépôts / lhc / web / wiklou.git / blobdiff