Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123889
Change subject: Use new model directionality in model
......................................................................
Use new model directionality in model
Depends on I2065e17020dc89 in core.
Change-Id: I6e99db601af58a9c4200f885887de451f9f70daa
---
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/89/123889/1
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5b36a4c..e53e1de 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1308,10 +1308,10 @@
target.$element.append( target.surface.$element
);
target.setUpToolbar();
- target.$document.attr( {
- 'lang': mw.config.get( 'wgVisualEditor'
).pageLanguageCode,
- 'dir': mw.config.get( 'wgVisualEditor'
).pageLanguageDir
- } );
+ target.surface.model.documentModel.setLangDir(
+ mw.config.get( 'wgVisualEditor'
).pageLanguageCode,
+ mw.config.get( 'wgVisualEditor'
).pageLanguageDir
+ );
// Add appropriately mw-content-ltr or
mw-content-rtl class
target.surface.view.$element.addClass(
'mw-content-' + mw.config.get(
'wgVisualEditor' ).pageLanguageDir
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 89a7a18..c7a00ef 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -498,7 +498,7 @@
this.positionInput.intializeSelection();
} else {
// If checked, choose default position
- if ( this.surface.getView().getDir() === 'ltr' ) {
+ if ( this.surface.getModel().getDocument().getDir() === 'ltr' )
{
// Assume default is 'right'
this.positionInput.selectItem(
this.positionInput.getItemFromData( 'right' )
@@ -670,7 +670,7 @@
this.positionInput.setDisabled( false );
if ( this.mediaNode.getAttribute( 'align' ) === 'default' ) {
// Assume wiki default according to wiki dir
- if ( this.surface.getView().getDir() === 'ltr' ) {
+ if ( this.surface.getModel().getDocument().getDir() ===
'ltr' ) {
// Assume default is 'right'
this.positionInput.selectItem(
this.positionInput.getItemFromData(
'right' )
@@ -817,11 +817,11 @@
(
this.mediaNode.getAttribute( 'align' )
=== 'default' &&
(
- this.surface.getView().getDir()
=== 'ltr' &&
+
this.surface.getModel().getDocument().getDir() === 'ltr' &&
attr !== 'right'
) ||
(
- this.surface.getView().getDir()
=== 'rtl' &&
+
this.surface.getModel().getDocument().getDir() === 'rtl' &&
attr !== 'left'
)
) ||
--
To view, visit https://gerrit.wikimedia.org/r/123889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e99db601af58a9c4200f885887de451f9f70daa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
