Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mediawiki.base: Remove mw.html.Cdata support

Browse source 
This was introduced in 2010 with e81c822c8b for use
by mw.loader to create <style> element, but has not been used
for that since 2012 with 57dda2b95e.

It has never been used elsewhere to my knowledge.
In Codesearch, mwgrep, and mwgrep--user there are zero references
to "html.Cdata".

Bug: T233676
Change-Id: Ie99b41b6ee50cbc75e9258ef60ccae85e2cccf12
This commit is contained in:
Timo Tijhof 2019-10-04 02:21:17 +01:00
parent e4272518f7
commit d0d4fd8f2d
2 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
maintenance/jsduck/categories.json
View file

@ -9,7 +9,6 @@
"mw.Message",
"mw.loader",
"mw.html",
"mw.html.Cdata",
"mw.html.Raw",
"mw.hook",
"mw.template",

50
resources/src/mediawiki.base/mediawiki.base.js
View file

@ -542,14 +542,11 @@
*
* @param {string} name The tag name.
* @param {Object} [attrs] An object with members mapping element names to values
* @param {string|mw.html.Raw|mw.html.Cdata|null} [contents=null] The contents of the element.
* @param {string|mw.html.Raw|null} [contents=null] The contents of the element.
*
* - string: Text to be escaped.
* - null: The element is treated as void with short closing form, e.g. `<br/>`.
* - this.Raw: The raw value is directly included.
* - this.Cdata: The raw value is directly included. An exception is
* thrown if it contains any illegal ETAGO delimiter.
* See <https://www.w3.org/TR/html401/appendix/notes.html#h-B.3.2>.
* @return {string} HTML
*/
element: function ( name, attrs, contents ) {
@ -575,29 +572,17 @@
}
// Regular open tag
s += '>';
switch ( typeof contents ) {
case 'string':
// Escaped
s += this.escape( contents );
break;
case 'number':
case 'boolean':
// Convert to string
s += String( contents );
break;
default:
if ( contents instanceof this.Raw ) {
// Raw HTML inclusion
s += contents.value;
} else if ( contents instanceof this.Cdata ) {
// CDATA
if ( /<\/[a-zA-z]/.test( contents.value ) ) {
throw new Error( 'Illegal end tag found in CDATA' );
}
s += contents.value;
} else {
throw new Error( 'Invalid type of contents' );
}
if ( typeof contents === 'string' ) {
// Escaped
s += this.escape( contents );
} else if ( typeof contents === 'number' || typeof contents === 'boolean' ) {
// Convert to string
s += String( contents );
} else if ( contents instanceof this.Raw ) {
// Raw HTML inclusion
s += contents.value;
} else {
throw new Error( 'Invalid content type' );
}
s += '</' + name + '>';
return s;
@ -612,17 +597,6 @@
*/
Raw: function ( value ) {
this.value = value;
},
/**
* Wrapper object for CDATA element contents passed to mw.html.element()
*
* @class mw.html.Cdata
* @constructor
* @param {string} value
*/
Cdata: function ( value ) {
this.value = value;
}
};
}() );