jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (cb06317) ......................................................................
Update VE core submodule to master (cb06317) New changes: 5197b2d Rangestate optimization 80a07cf Unmix GeneratedContentNode from AlienNodes f510e9c Make (Node/Annotation/MetaItem)Factory inherit from ModelFactory b625ff0 Localisation updates from https://translatewiki.net. 5c4653c ve.qunit: Use 'jscs:disable' comment rather than hacks 90e9480 Remove registration of abstract AlienNode classes d325674 i18n/en.json: Convert from spaces to tabs, like all other files f40fc15 Add 'classes' config option to focusable nodes to simplify AlienNode f7c8999 Document config options as @cfg ad3aa0b ve.ce.Surface.test: Groundwork for testing non-linear selections cd1a992 Localisation updates from https://translatewiki.net. c92471e Move drop marker to highlights layer and position absolutely Change-Id: I437663d93a346a06c6a5137cce5149c7a6fcbb7f --- M .jsduck/categories.json M .jsduck/eg-iframe.html M VisualEditor.php M extension.json M lib/ve M modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js M modules/ve-mw/tests/ce/ve.ce.Surface.test.js 7 files changed, 17 insertions(+), 7 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/categories.json b/.jsduck/categories.json index 9f28c13..8a6ab84 100644 --- a/.jsduck/categories.json +++ b/.jsduck/categories.json @@ -66,9 +66,11 @@ "classes": [ "ve.dm", "ve.dm.Model", + "ve.dm.ModelRegistry", + "ve.dm.ModelFactory", "ve.dm.AnnotationFactory", "ve.dm.MetaItemFactory", - "ve.dm.ModelRegistry", + "ve.dm.NodeFactory", "ve.dm.Converter", "ve.dm.DataString", "ve.dm.DocumentSynchronizer", @@ -76,7 +78,6 @@ "ve.dm.Scalable", "ve.dm.APIResultsProvider", "ve.dm.APIResultsQueue", - "ve.dm.NodeFactory", "ve.dm.Surface", "ve.dm.SurfaceFragment", "ve.dm.*Selection", diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 21a2cc6..6787e42 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -141,6 +141,7 @@ <script src="lib/ve/src/ve.EventSequencer.js"></script> <script src="lib/ve/src/dm/ve.dm.js"></script> <script src="lib/ve/src/dm/ve.dm.Model.js"></script> + <script src="lib/ve/src/dm/ve.dm.ModelFactory.js"></script> <script src="lib/ve/src/dm/ve.dm.ModelRegistry.js"></script> <script src="lib/ve/src/dm/ve.dm.NodeFactory.js"></script> <script src="lib/ve/src/dm/ve.dm.AnnotationFactory.js"></script> diff --git a/VisualEditor.php b/VisualEditor.php index f23170d..39c77b1 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -378,6 +378,7 @@ 'lib/ve/src/dm/ve.dm.js', 'lib/ve/src/dm/ve.dm.Model.js', 'lib/ve/src/dm/ve.dm.ModelRegistry.js', + 'lib/ve/src/dm/ve.dm.ModelFactory.js', 'lib/ve/src/dm/ve.dm.NodeFactory.js', 'lib/ve/src/dm/ve.dm.AnnotationFactory.js', 'lib/ve/src/dm/ve.dm.AnnotationSet.js', diff --git a/extension.json b/extension.json index 68af33f..79ab02f 100644 --- a/extension.json +++ b/extension.json @@ -456,6 +456,7 @@ "lib/ve/src/dm/ve.dm.js", "lib/ve/src/dm/ve.dm.Model.js", "lib/ve/src/dm/ve.dm.ModelRegistry.js", + "lib/ve/src/dm/ve.dm.ModelFactory.js", "lib/ve/src/dm/ve.dm.NodeFactory.js", "lib/ve/src/dm/ve.dm.AnnotationFactory.js", "lib/ve/src/dm/ve.dm.AnnotationSet.js", diff --git a/lib/ve b/lib/ve index 715750b..cb06317 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 715750bd8c23984f6ae458025a39b179cd8593fa +Subproject commit cb06317a7be0c6b1b3d624abbc5e5b737e9fbccf diff --git a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js index 485fcc5..483387d 100644 --- a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js +++ b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js @@ -27,14 +27,17 @@ ['d', [ { type: 'textStyle/bold' } ]], { type: 'alienInline', - originalDomElements: $( '<tt>e</tt>' ).toArray(), + originalDomElements: $( '<span rel="ve:Alien">e</span>' ).toArray(), annotations: [ { type: 'textStyle/bold' } ] }, { type: '/alienInline' }, { type: '/paragraph' } ], - html: 'a<b>b<span class="ve-ce-leafNode ' + - 've-ce-mwEntityNode" contenteditable="false">c</span>d<tt>e</tt></b>' + html: + 'a<b>b' + + '<span class="ve-ce-leafNode ve-ce-mwEntityNode" contenteditable="false">c</span>' + + 'd<span rel="ve:Alien" class="ve-ce-focusableNode" contenteditable="false">e</span>' + + '</b>' } ]; QUnit.expect( cases.length ); for ( i = 0, len = cases.length; i < len; i++ ) { diff --git a/modules/ve-mw/tests/ce/ve.ce.Surface.test.js b/modules/ve-mw/tests/ce/ve.ce.Surface.test.js index 41a454d..468787d 100644 --- a/modules/ve-mw/tests/ce/ve.ce.Surface.test.js +++ b/modules/ve-mw/tests/ce/ve.ce.Surface.test.js @@ -22,7 +22,10 @@ operations: ['backspace'], // TODO: This action should probably unwrap the list item as expectedData: function () {}, - expectedRange: new ve.Range( 12 ), + expectedSelection: { + type: 'linear', + range: new ve.Range( 12 ) + }, msg: 'Backspace in a list next to a block image doesn\'t merge into the caption' } ]; @@ -32,7 +35,7 @@ for ( i = 0; i < cases.length; i++ ) { ve.test.utils.runSurfaceHandleSpecialKeyTest( assert, cases[i].html, cases[i].range, cases[i].operations, - cases[i].expectedData, cases[i].expectedRange, cases[i].msg + cases[i].expectedData, cases[i].expectedSelection, cases[i].msg ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/199618 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I437663d93a346a06c6a5137cce5149c7a6fcbb7f Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
