jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (480b813) ......................................................................
Update VE core submodule to master (480b813) New changes: 8a64317 Set XML encoding to utf-8 in SVGs 6bdacc7 Select highlights on touchend event 19409c6 Localisation updates from https://translatewiki.net. 2dca505 Split out ve.{dm,ce}.TextStyleAnnotation into parts, add other annotations Change-Id: I42f82440919973dd040e3cb18ae0acba7d4a0c8d --- M .docs/eg-iframe.html M VisualEditor.php M lib/ve 3 files changed, 72 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html index 8ef9012..6c172f3 100644 --- a/.docs/eg-iframe.html +++ b/.docs/eg-iframe.html @@ -180,6 +180,24 @@ <script src="lib/ve/modules/ve/dm/annotations/ve.dm.LanguageAnnotation.js"></script> <script src="lib/ve/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js"></script> <script src="lib/ve/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.AbbreviationAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.BigAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.BoldAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.CodeSampleAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.CodeAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.DatetimeAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.DefinitionAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.HighlightAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.ItalicAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.QuotationAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.SmallAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.SpanAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.StrikethroughAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.SubscriptAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.SuperscriptAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.UnderlineAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.UserInputAnnotation.js"></script> + <script src="lib/ve/modules/ve/dm/annotations/ve.dm.VariableAnnotation.js"></script> <script src="lib/ve/modules/ve/dm/metaitems/ve.dm.AlienMetaItem.js"></script> <script src="lib/ve/modules/ve/dm/metaitems/ve.dm.CommentMetaItem.js"></script> <script src="lib/ve/modules/ve/ce/ve.ce.js"></script> @@ -222,6 +240,24 @@ <script src="lib/ve/modules/ve/ce/annotations/ve.ce.LanguageAnnotation.js"></script> <script src="lib/ve/modules/ve/ce/annotations/ve.ce.LinkAnnotation.js"></script> <script src="lib/ve/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.AbbreviationAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.BigAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.BoldAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.CodeAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.CodeSampleAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.DatetimeAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.DefinitionAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.HighlightAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.ItalicAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.QuotationAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.SmallAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.SpanAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.StrikethroughAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.SubscriptAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.SuperscriptAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.UnderlineAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.UserInputAnnotation.js"></script> + <script src="lib/ve/modules/ve/ce/annotations/ve.ce.VariableAnnotation.js"></script> <script src="lib/ve/modules/ve/ui/ve.ui.js"></script> <script src="lib/ve/modules/ve/ui/ve.ui.Surface.js"></script> <script src="lib/ve/modules/ve/ui/ve.ui.Context.js"></script> diff --git a/VisualEditor.php b/VisualEditor.php index 7d52616..0bc55c0 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -355,6 +355,24 @@ 'lib/ve/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js', 'lib/ve/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.AbbreviationAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.BigAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.BoldAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.CodeSampleAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.CodeAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.DatetimeAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.DefinitionAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.HighlightAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.ItalicAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.QuotationAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.SmallAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.SpanAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.StrikethroughAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.SubscriptAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.SuperscriptAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.UnderlineAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.UserInputAnnotation.js', + 'lib/ve/modules/ve/dm/annotations/ve.dm.VariableAnnotation.js', 'lib/ve/modules/ve/dm/metaitems/ve.dm.AlienMetaItem.js', 'lib/ve/modules/ve/dm/metaitems/ve.dm.CommentMetaItem.js', @@ -401,6 +419,24 @@ 'lib/ve/modules/ve/ce/annotations/ve.ce.LinkAnnotation.js', 'lib/ve/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.AbbreviationAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.BigAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.BoldAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.CodeAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.CodeSampleAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.DatetimeAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.DefinitionAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.HighlightAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.ItalicAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.QuotationAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.SmallAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.SpanAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.StrikethroughAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.SubscriptAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.SuperscriptAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.UnderlineAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.UserInputAnnotation.js', + 'lib/ve/modules/ve/ce/annotations/ve.ce.VariableAnnotation.js', // ui 'lib/ve/modules/ve/ui/ve.ui.js', diff --git a/lib/ve b/lib/ve index 7a128e5..480b813 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 7a128e54bb187143645f4ec534df71a72ffb9be7 +Subproject commit 480b81309ed5b9d57c3eb180a32c631b308a756e -- To view, visit https://gerrit.wikimedia.org/r/143078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42f82440919973dd040e3cb18ae0acba7d4a0c8d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
