jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (6bd2ea5) ......................................................................
Update VE core submodule to master (6bd2ea5) New changes: 44ca3b6 Use store indices in annotate operations 3ebbcce Make range optional in getUsedStoreValuesFromRange 9d03a5e Set originalDomElements whenever a data element is created 4cfffde Simplify annotation hashes 4eeb8bb Add handlers for font annotations 4a6d6f0 Localisation updates from https://translatewiki.net. 05de45e ve.ui.ToolbarDialogTool: Fix documentation 6797d6d Use type from toDataElements when creating annotations b3a3839 Store reference to DM document in transactions c073a24 Load special characters in Platform instead of SpecialCharacterDialog Local changes: * Add new files to VisualEditor.php * Re-sort i18n strings in VisualEditor.php * Re-run extenson.json creation * Update documentation HTML file * Update tests for adjacent annotations fix Change-Id: I7a5e79e68ab8a7aae0e9af42d011943019f7f85f --- M .jsduck/eg-iframe.html M VisualEditor.php M extension.json M lib/ve M modules/ve-mw/tests/dm/ve.dm.mwExample.js 5 files changed, 13 insertions(+), 4 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 1bd7590..8adf82b 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -214,6 +214,7 @@ <script src="lib/ve/src/dm/annotations/ve.dm.CodeAnnotation.js"></script> <script src="lib/ve/src/dm/annotations/ve.dm.DatetimeAnnotation.js"></script> <script src="lib/ve/src/dm/annotations/ve.dm.DefinitionAnnotation.js"></script> + <script src="lib/ve/src/dm/annotations/ve.dm.FontAnnotation.js"></script> <script src="lib/ve/src/dm/annotations/ve.dm.HighlightAnnotation.js"></script> <script src="lib/ve/src/dm/annotations/ve.dm.ItalicAnnotation.js"></script> <script src="lib/ve/src/dm/annotations/ve.dm.QuotationAnnotation.js"></script> @@ -282,6 +283,7 @@ <script src="lib/ve/src/ce/annotations/ve.ce.CodeSampleAnnotation.js"></script> <script src="lib/ve/src/ce/annotations/ve.ce.DatetimeAnnotation.js"></script> <script src="lib/ve/src/ce/annotations/ve.ce.DefinitionAnnotation.js"></script> + <script src="lib/ve/src/ce/annotations/ve.ce.FontAnnotation.js"></script> <script src="lib/ve/src/ce/annotations/ve.ce.HighlightAnnotation.js"></script> <script src="lib/ve/src/ce/annotations/ve.ce.ItalicAnnotation.js"></script> <script src="lib/ve/src/ce/annotations/ve.ce.QuotationAnnotation.js"></script> diff --git a/VisualEditor.php b/VisualEditor.php index 3e9ffa9..e9ab0b1 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -454,6 +454,7 @@ 'lib/ve/src/dm/annotations/ve.dm.CodeAnnotation.js', 'lib/ve/src/dm/annotations/ve.dm.DatetimeAnnotation.js', 'lib/ve/src/dm/annotations/ve.dm.DefinitionAnnotation.js', + 'lib/ve/src/dm/annotations/ve.dm.FontAnnotation.js', 'lib/ve/src/dm/annotations/ve.dm.HighlightAnnotation.js', 'lib/ve/src/dm/annotations/ve.dm.ItalicAnnotation.js', 'lib/ve/src/dm/annotations/ve.dm.QuotationAnnotation.js', @@ -525,6 +526,7 @@ 'lib/ve/src/ce/annotations/ve.ce.CodeSampleAnnotation.js', 'lib/ve/src/ce/annotations/ve.ce.DatetimeAnnotation.js', 'lib/ve/src/ce/annotations/ve.ce.DefinitionAnnotation.js', + 'lib/ve/src/ce/annotations/ve.ce.FontAnnotation.js', 'lib/ve/src/ce/annotations/ve.ce.HighlightAnnotation.js', 'lib/ve/src/ce/annotations/ve.ce.ItalicAnnotation.js', 'lib/ve/src/ce/annotations/ve.ce.QuotationAnnotation.js', @@ -1329,14 +1331,14 @@ 'visualeditor-dialog-reference-options-name-label', 'visualeditor-dialog-reference-options-section', 'visualeditor-dialog-reference-title', - 'visualeditor-dialog-reference-useexisting-label', 'visualeditor-dialog-reference-useexisting-full-label', + 'visualeditor-dialog-reference-useexisting-label', 'visualeditor-dialog-reference-useexisting-tool', 'visualeditor-dialog-referenceslist-contextitem-description-general', 'visualeditor-dialog-referenceslist-contextitem-description-named', 'visualeditor-dialog-referenceslist-title', - 'visualeditor-dialogbutton-reference-tooltip', 'visualeditor-dialogbutton-reference-full-label', + 'visualeditor-dialogbutton-reference-tooltip', 'visualeditor-dialogbutton-referenceslist-tooltip', 'visualeditor-reference-input-placeholder', ), diff --git a/extension.json b/extension.json index d7186fd..fadb543 100644 --- a/extension.json +++ b/extension.json @@ -528,6 +528,7 @@ "lib/ve/src/dm/annotations/ve.dm.CodeAnnotation.js", "lib/ve/src/dm/annotations/ve.dm.DatetimeAnnotation.js", "lib/ve/src/dm/annotations/ve.dm.DefinitionAnnotation.js", + "lib/ve/src/dm/annotations/ve.dm.FontAnnotation.js", "lib/ve/src/dm/annotations/ve.dm.HighlightAnnotation.js", "lib/ve/src/dm/annotations/ve.dm.ItalicAnnotation.js", "lib/ve/src/dm/annotations/ve.dm.QuotationAnnotation.js", @@ -594,6 +595,7 @@ "lib/ve/src/ce/annotations/ve.ce.CodeSampleAnnotation.js", "lib/ve/src/ce/annotations/ve.ce.DatetimeAnnotation.js", "lib/ve/src/ce/annotations/ve.ce.DefinitionAnnotation.js", + "lib/ve/src/ce/annotations/ve.ce.FontAnnotation.js", "lib/ve/src/ce/annotations/ve.ce.HighlightAnnotation.js", "lib/ve/src/ce/annotations/ve.ce.ItalicAnnotation.js", "lib/ve/src/ce/annotations/ve.ce.QuotationAnnotation.js", @@ -1348,14 +1350,14 @@ "visualeditor-dialog-reference-options-name-label", "visualeditor-dialog-reference-options-section", "visualeditor-dialog-reference-title", - "visualeditor-dialog-reference-useexisting-full-label", "visualeditor-dialog-reference-useexisting-label", + "visualeditor-dialog-reference-useexisting-full-label", "visualeditor-dialog-reference-useexisting-tool", "visualeditor-dialog-referenceslist-contextitem-description-general", "visualeditor-dialog-referenceslist-contextitem-description-named", "visualeditor-dialog-referenceslist-title", - "visualeditor-dialogbutton-reference-full-label", "visualeditor-dialogbutton-reference-tooltip", + "visualeditor-dialogbutton-reference-full-label", "visualeditor-dialogbutton-referenceslist-tooltip", "visualeditor-reference-input-placeholder" ], diff --git a/lib/ve b/lib/ve index 95d161f..6bd2ea5 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 95d161f9f6fa03ddfaf9082e09b62092627b0b75 +Subproject commit 6bd2ea52b534cfa73b8fca9004021084a4225046 diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js b/modules/ve-mw/tests/dm/ve.dm.mwExample.js index 6e550bf..a011229 100644 --- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js +++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js @@ -838,6 +838,9 @@ { type: 'internalList' }, { type: '/internalList' } ], + normalizedBody: '<b>a</b><b data-parsoid="1">b</b><b>c</b><b data-parsoid="2">d</b> ' + + '<b>ab</b> ' + + '<b data-parsoid="3">ab</b><b data-parsoid="4">c</b>', fromDataBody: '<b>abcd</b> <b>ab</b> <b>abc</b>' }, mwImage: { -- To view, visit https://gerrit.wikimedia.org/r/197701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a5e79e68ab8a7aae0e9af42d011943019f7f85f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
