wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use ve.safeDecodeURIComponent()"

Browse source
This commit is contained in:
jenkins-bot 2015-04-03 08:49:55 +00:00 committed by Gerrit Code Review
parent f15ba5bf45 f3b7ccdefb
commit b8f9e43187
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
View file

@ -172,7 +172,7 @@ ve.ce.MWTransclusionNode.prototype.getRenderedDomElements = function ( domElemen
var targetData = ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
this.href, transclusionNode.getModelHtmlDocument()
),
normalisedHref = decodeURIComponent( targetData.title );
normalisedHref = ve.safeDecodeURIComponent( targetData.title );
if ( mw.Title.newFromText( normalisedHref ) ) {
normalisedHref = mw.Title.newFromText( normalisedHref ).getPrefixedText();
}

4
modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
View file

@ -42,7 +42,7 @@ ve.dm.MWInternalLinkAnnotation.static.toDataElement = function ( domElements, co
type: this.name,
attributes: {
hrefPrefix: targetData.hrefPrefix,
title: decodeURIComponent( targetData.title ).replace( /_/g, ' ' ),
title: ve.safeDecodeURIComponent( targetData.title ).replace( /_/g, ' ' ),
normalizedTitle: this.normalizeTitle( targetData.title ),
lookupTitle: this.getLookupTitle( targetData.title ),
origTitle: targetData.title
@ -92,7 +92,7 @@ ve.dm.MWInternalLinkAnnotation.static.getHref = function ( dataElement ) {
var href,
title = dataElement.attributes.title,
origTitle = dataElement.attributes.origTitle;
if ( origTitle !== undefined && decodeURIComponent( origTitle ).replace( /_/g, ' ' ) === title ) {
if ( origTitle !== undefined && ve.safeDecodeURIComponent( origTitle ).replace( /_/g, ' ' ) === title ) {
// Restore href from origTitle
href = origTitle;
// Only use hrefPrefix if restoring from origTitle

8
modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
View file

@ -41,9 +41,9 @@ ve.dm.MWCategoryMetaItem.static.toDataElement = function ( domElements ) {
type: this.name,
attributes: {
hrefPrefix: matches[1],
category: decodeURIComponent( matches[2] ).replace( /_/g, ' ' ),
category: ve.safeDecodeURIComponent( matches[2] ).replace( /_/g, ' ' ),
origCategory: matches[2],
sortkey: decodeURIComponent( rawSortkey ).replace( /_/g, ' ' ),
sortkey: ve.safeDecodeURIComponent( rawSortkey ).replace( /_/g, ' ' ),
origSortkey: rawSortkey
}
};
@ -57,8 +57,8 @@ ve.dm.MWCategoryMetaItem.static.toDomElements = function ( dataElement, doc ) {
sortkey = dataElement.attributes.sortkey || '',
origCategory = dataElement.attributes.origCategory || '',
origSortkey = dataElement.attributes.origSortkey || '',
normalizedOrigCategory = decodeURIComponent( origCategory ).replace( /_/g, ' ' ),
normalizedOrigSortkey = decodeURIComponent( origSortkey ).replace( /_/g, ' ' );
normalizedOrigCategory = ve.safeDecodeURIComponent( origCategory ).replace( /_/g, ' ' ),
normalizedOrigSortkey = ve.safeDecodeURIComponent( origSortkey ).replace( /_/g, ' ' );
if ( normalizedOrigSortkey === sortkey ) {
sortkey = origSortkey;
} else {

8
modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
View file

@ -206,13 +206,7 @@ ve.dm.MWImageNode.prototype.getFilename = function () {
var resource = this.getAttribute( 'resource' ) || '',
filename = resource.replace( /^(\.+\/)*/, '' );
// Protect against decodeURIComponent() throwing exceptions
try {
filename = decodeURIComponent( filename );
} catch ( e ) {
ve.log( 'URI decoding exception', e );
}
return filename;
return ve.safeDecodeURIComponent( filename );
};
/**