wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Language Inspector Default Fix"

Browse source
This commit is contained in:
jenkins-bot 2013-08-27 20:36:42 +00:00 committed by Gerrit Code Review
parent 8b773cf9a4 47f9c66798
commit 0ef918b6f0
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
modules/ve/ui/inspectors/ve.ui.LanguageInspector.js
View file

@ -96,8 +96,8 @@ ve.ui.LanguageInspector.prototype.onSetup = function () {
// This will be called only if the annotation doesn't already exist, setting
// the default value as the current language/dir of the selected text.
if ( fragDOM ) {
this.initLang = fragDOM.$.closest('[lang]').attr('lang') || 'en';
this.initDir = fragDOM.$.closest('[dir]').css('direction') || 'ltr';
this.initLang = fragDOM.$.closest('[lang]').attr('lang');
this.initDir = fragDOM.$.closest('[dir]').css('direction');
}
// Parent method
@ -146,43 +146,47 @@ ve.ui.LanguageInspector.prototype.getAnnotation = function () {
* @chainable
*/
ve.ui.LanguageInspector.prototype.setAnnotation = function ( annotation ) {
var langCode = '',
langDir = '';
var langCode, langDir, annData;
// Validate the given annotation:
// Give precedence to dir value if it already exists
// in the annotation:
if ( annotation.getAttribute( 'dir' ) ) {
langDir = annotation.getAttribute( 'dir' );
}
langDir = annotation.getAttribute( 'dir' );
// Set language according to the one in the given annotation
// or leave blank if element has no language set
if ( annotation.getAttribute( 'lang' ) ) {
langCode = annotation.getAttribute( 'lang' );
}
langCode = annotation.getAttribute( 'lang' );
// If language exists, but dir is undefined/null,
// fix the dir in terms of language:
if ( langCode && !langDir ) {
langDir = $.uls.data.getDir( this.lang );
langDir = $.uls.data.getDir( langCode );
}
// Set the annotation data:
annData = {
'type': 'language',
'attributes': {}
};
if ( langCode ) {
annData.attributes.lang = langCode;
}
if ( langDir ) {
annData.attributes.dir = langDir;
}
// Update the widget:
this.targetInput.setAttributes( langCode, langDir );
// Update inspector properties:
this.lang = langCode;
this.dir = langDir;
// Update the widget:
this.targetInput.setAttributes( this.lang, this.dir );
// Set the annotation:
this.annotation = new ve.dm.LanguageAnnotation( {
'type': 'language',
'attributes': {
'lang': this.lang,
'dir': this.dir
}
} );
// Set up the annotation:
this.annotation = new ve.dm.LanguageAnnotation( annData );
return this;
};