jenkins-bot has submitted this change and it was merged.
Change subject: Use pageLanguage rather than pageViewLanguage for the surface's
lang&dir
......................................................................
Use pageLanguage rather than pageViewLanguage for the surface's lang&dir
Bug: 33175
Change-Id: Ica006404227dcd286c387de4f637036341b17eae
---
M VisualEditor.hooks.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index fe331da..6ecbcd0 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -58,6 +58,8 @@
public static function onMakeGlobalVariablesScript( array &$vars,
OutputPage $out ) {
$vars['wgVisualEditor'] = array(
'isPageWatched' => $out->getUser()->isWatched(
$out->getTitle() ),
+ 'pageLanguageCode' =>
$out->getTitle()->getPageLanguage()->getHtmlCode(),
+ 'pageLanguageDir' =>
$out->getTitle()->getPageLanguage()->getDir()
);
return true;
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 0b34656..d642c08 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -706,8 +706,6 @@
* @param {HTMLDocument} doc HTML DOM to edit
*/
ve.init.mw.ViewPageTarget.prototype.setUpSurface = function ( doc ) {
- var $contentText = $( '#mw-content-text' );
-
// Initialize surface
this.surface = new ve.Surface( this, doc, this.surfaceOptions );
this.surface.getContext().hide();
@@ -722,8 +720,8 @@
this.hideSpinner();
this.active = true;
this.$document.attr( {
- 'lang': $contentText.attr( 'lang' ),
- 'dir': $contentText.attr( 'dir' )
+ 'lang': mw.config.get( 'wgVisualEditor' ).pageLanguageCode,
+ 'dir': mw.config.get( 'wgVisualEditor' ).pageLanguageDir
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/63148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica006404227dcd286c387de4f637036341b17eae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
