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

Merge "Use mw.Title to localise file: prefix on new images"

Browse source
This commit is contained in:
jenkins-bot 2015-08-25 16:23:12 +00:00 committed by Gerrit Code Review
parent fcddd07a03 6e44d8a7c0
commit e7a9af30d8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -359,7 +359,7 @@ ve.ui.MWMediaDialog.prototype.buildMediaInfoPanel = function ( imageinfo ) {
var i, newDimensions, field, isPortrait, $info, $section, windowWidth,
contentDirection = this.getFragment().getDocument().getDir(),
imageTitle = new OO.ui.LabelWidget( {
label: new mw.Title( imageinfo.title ).getNameText()
label: mw.Title.newFromText( imageinfo.title ).getNameText()
} ),
metadata = imageinfo.extmetadata,
// Field configuration (in order)
@ -724,18 +724,21 @@ ve.ui.MWMediaDialog.prototype.onSearchResultsChoose = function ( item ) {
* @param {ve.ui.MWMediaResultWidget|null} item Selected item
*/
ve.ui.MWMediaDialog.prototype.confirmSelectedImage = function () {
var obj = {},
var title,
obj = {},
info = this.selectedImageInfo;
if ( info ) {
// Run title through mw.Title so the File: prefix is localised
title = mw.Title.newFromText( info.title ).getPrefixedText();
if ( !this.imageModel ) {
// Create a new image model based on default attributes
this.imageModel = ve.dm.MWImageModel.static.newFromImageAttributes(
{
// Per https://www.mediawiki.org/w/?diff=931265&oldid=prev
href: './' + info.title,
href: './' + title,
src: info.url,
resource: './' + info.title,
resource: './' + title,
width: info.thumbwidth,
height: info.thumbheight,
mediaType: info.mediatype,
@ -753,9 +756,9 @@ ve.ui.MWMediaDialog.prototype.confirmSelectedImage = function () {
this.imageModel.changeImageSource(
{
mediaType: info.mediatype,
href: './' + info.title,
href: './' + title,
src: info.url,
resource: './' + info.title
resource: './' + title
},
info
);