jenkins-bot has submitted this change and it was merged.

Change subject: Update VE core submodule to master (952a9bb)
......................................................................


Update VE core submodule to master (952a9bb)

New changes:
72b9ed6 [BREAKING CHANGE] Simplify getModelFromDom signature
5a6505c ve.ui.SpecialCharacterDialog: Specify 'transition' only for 
'border-color', not 'all'
30a2107 ve.ui.SpecialCharacterPage: Use less jQuery for better performance
e5692fd Localisation updates from https://translatewiki.net.
1ff0a0c Only auto-close windows which are not the one we are trying to open
48964b5 Localisation updates from https://translatewiki.net.
1f928ae Fix rendering of search results when scrolling
046dc5e demo: Add device switcher between desktop and mobile

Local changes:
*  Use simplified getModelFromDom API from 72b9ed6 in core.

Change-Id: Ib220c4e5c3fc520e10b950c02475783cd710d0df
---
M lib/ve
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 4 insertions(+), 7 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/ve b/lib/ve
index 8bb191b..952a9bb 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 8bb191b83731c0b969182d67350c2c07154e0c81
+Subproject commit 952a9bbdb5a3ea08f9e7cd4fd6b6e8c0c9845996
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 2261f59..e6a7577 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1279,13 +1279,10 @@
        setTimeout( function () {
                // Build model
                ve.track( 'trace.convertModelFromDom.enter' );
-               var dmDoc = ve.dm.converter.getModelFromDom(
-                       doc,
-                       false,
-                       null,
-                       mw.config.get( 'wgVisualEditor' ).pageLanguageCode,
-                       mw.config.get( 'wgVisualEditor' ).pageLanguageDir
-               );
+               var dmDoc = ve.dm.converter.getModelFromDom( doc, {
+                       lang: mw.config.get( 'wgVisualEditor' 
).pageLanguageCode,
+                       dir: mw.config.get( 'wgVisualEditor' ).pageLanguageDir
+               } );
                ve.track( 'trace.convertModelFromDom.exit' );
                // Build DM tree now (otherwise it gets lazily built when 
building the CE tree)
                ve.track( 'trace.buildModelTree.enter' );

-- 
To view, visit https://gerrit.wikimedia.org/r/204943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib220c4e5c3fc520e10b950c02475783cd710d0df
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to