jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (062cb26) ......................................................................
Update VE core submodule to master (062cb26) New changes: 6cae77b ElementLinearData: Add another case to hasContent d2e15f2 SurfaceFragment: Improve handling of delete all 16db2a3 Return 'null' instead of null in ve.Filibuster observers 24de6b2 Introduce key down handlers to separate logic from ce surface f77fe99 Localisation updates from https://translatewiki.net. 062cb26 Localisation updates from https://translatewiki.net. Change-Id: I61c94983c7898af219266af3022761638c7578b7 --- M .jsduck/categories.json M .jsduck/eg-iframe.html M extension.json M lib/ve M modules/ve-mw/tests/dm/ve.dm.Transaction.test.js 5 files changed, 30 insertions(+), 5 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/categories.json b/.jsduck/categories.json index 580e477..87a42c5 100644 --- a/.jsduck/categories.json +++ b/.jsduck/categories.json @@ -112,6 +112,8 @@ "ve.ce.SurfaceObserver", "ve.ce.RangeState", "ve.ce.*Annotation", + "ve.ce.*Factory", + "ve.ce.*KeyDownHandler", "ve.ce.Document", "ve.ce.*Node" ] @@ -127,11 +129,11 @@ "ve.ui.TargetToolbar", "ve.ui.DebugBar", "ve.ui.Trigger", - "ve.ui.*TransferHandler", - "ve.ui.DataTransferItem", "ve.ui.*Action", "ve.ui.*Command", "ve.ui.*ContextItem", + "ve.ui.*TransferHandler", + "ve.ui.DataTransferItem", "ve.ui.*Element", "ve.ui.*Factory", "ve.ui.*Page", diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index d0d5572..48c83ab 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -263,6 +263,15 @@ <script src="lib/ve/src/ce/ve.ce.TableCellableNode.js"></script> <script src="lib/ve/src/ce/ve.ce.Surface.js"></script> <script src="lib/ve/src/ce/ve.ce.SurfaceObserver.js"></script> + <script src="lib/ve/src/ce/ve.ce.KeyDownHandlerFactory.js"></script> + <script src="lib/ve/src/ce/ve.ce.KeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.TableArrowKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.TableDeleteKeyDownHandler.js"></script> + <script src="lib/ve/src/ce/keydownhandlers/ve.ce.TableEnterKeyDownHandler.js"></script> <script src="lib/ve/src/ce/nodes/ve.ce.GeneratedContentNode.js"></script> <script src="lib/ve/src/ce/nodes/ve.ce.AlienNode.js"></script> <script src="lib/ve/src/ce/nodes/ve.ce.BlockquoteNode.js"></script> diff --git a/extension.json b/extension.json index 511a71b..7333bfa 100644 --- a/extension.json +++ b/extension.json @@ -600,6 +600,15 @@ "lib/ve/src/ce/ve.ce.TableCellableNode.js", "lib/ve/src/ce/ve.ce.Surface.js", "lib/ve/src/ce/ve.ce.SurfaceObserver.js", + "lib/ve/src/ce/ve.ce.KeyDownHandlerFactory.js", + "lib/ve/src/ce/ve.ce.KeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.TableArrowKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.TableDeleteKeyDownHandler.js", + "lib/ve/src/ce/keydownhandlers/ve.ce.TableEnterKeyDownHandler.js", "lib/ve/src/ce/nodes/ve.ce.GeneratedContentNode.js", "lib/ve/src/ce/nodes/ve.ce.AlienNode.js", "lib/ve/src/ce/nodes/ve.ce.BlockquoteNode.js", diff --git a/lib/ve b/lib/ve index be148ae..062cb26 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit be148aeee342fa32f77852f290ecc98899a75d31 +Subproject commit 062cb2689a681861fd425bff6111c06bfed7141c diff --git a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js index d40f0cc..60be9bd 100644 --- a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js +++ b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js @@ -51,9 +51,14 @@ { type: 'replace', remove: complexDoc.getData( new ve.Range( 0, 7 ) ), - insert: [], + insert: [ + { type: 'paragraph' }, + { type: '/paragraph' } + ], removeMetadata: complexDoc.getMetadata( new ve.Range( 0, 7 ) ), - insertMetadata: [] + insertMetadata: [ undefined, undefined ], + insertedDataLength: 2, + insertedDataOffset: 0 }, { type: 'retain', length: 26 } ], @@ -74,7 +79,7 @@ .concat( [ [ comment ] ] ) .concat( complexDoc.getMetadata( new ve.Range( 5, 7 ) ) ) }, - { type: 'retain', length: 1 }, + { type: 'retain', length: 3 }, { type: 'replace', remove: complexDoc.getData( new ve.Range( 8, 32 ) ), -- To view, visit https://gerrit.wikimedia.org/r/250285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61c94983c7898af219266af3022761638c7578b7 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: DLynch <[email protected]> Gerrit-Reviewer: Esanders <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
