jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336829 )

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


Update VE core submodule to master (c1884680a)

New changes:
778dd0709 Destroy unicorns properly when cursoring to another branch node
2877cbbbc dm.Document: Make tree validation stricter
342a71e05 Update OOjs UI to v0.19.1
d2df4b6d4 Explain that Escape/Ctrl+Enter can be used to cancel/confirm a dialog
d978507f0 Move platform handling from CommandHelpDialog to CommandHelpRegistry
4dbceb403 Honorably discharge ve.dm.DocumentSynchronizer
0eb0e4214 Localisation updates from https://translatewiki.net.

Bug: T157019
Change-Id: I5066b1d2c60e116bc3b80b9a8242a72db243d8cf
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M VisualEditor.hooks.php
M extension.json
M lib/ve
5 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 78ff0da..7ab877c 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -106,7 +106,6 @@
                                        "ve.dm.NodeFactory",
                                        "ve.dm.Converter",
                                        "ve.dm.DataString",
-                                       "ve.dm.DocumentSynchronizer",
                                        "ve.dm.IndexValueStore",
                                        "ve.dm.Scalable",
                                        "ve.dm.APIResultsProvider",
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 5bf3b82..77279a9 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -207,7 +207,6 @@
                <script src="lib/ve/src/dm/ve.dm.DocumentSlice.js"></script>
                <script src="lib/ve/src/dm/ve.dm.TableSlice.js"></script>
                <script src="lib/ve/src/dm/ve.dm.LinearData.js"></script>
-               <script 
src="lib/ve/src/dm/ve.dm.DocumentSynchronizer.js"></script>
                <script src="lib/ve/src/dm/ve.dm.IndexValueStore.js"></script>
                <script src="lib/ve/src/dm/ve.dm.Converter.js"></script>
                <script 
src="lib/ve/src/dm/selections/ve.dm.LinearSelection.js"></script>
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index d421409..f5e082a 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -824,7 +824,6 @@
                                
'modules/ve-mw/tests/dm/nodes/ve.dm.MWTransclusionNode.test.js',
                                'lib/ve/tests/dm/ve.dm.Document.test.js',
                                'modules/ve-mw/tests/dm/ve.dm.Document.test.js',
-                               
'lib/ve/tests/dm/ve.dm.DocumentSynchronizer.test.js',
                                'lib/ve/tests/dm/ve.dm.IndexValueStore.test.js',
                                'lib/ve/tests/dm/ve.dm.InternalList.test.js',
                                'lib/ve/tests/dm/ve.dm.Transaction.test.js',
diff --git a/extension.json b/extension.json
index 5aa0764..3ce17b4 100644
--- a/extension.json
+++ b/extension.json
@@ -596,7 +596,6 @@
                                "lib/ve/src/dm/ve.dm.DocumentSlice.js",
                                "lib/ve/src/dm/ve.dm.TableSlice.js",
                                "lib/ve/src/dm/ve.dm.LinearData.js",
-                               "lib/ve/src/dm/ve.dm.DocumentSynchronizer.js",
                                "lib/ve/src/dm/ve.dm.IndexValueStore.js",
                                "lib/ve/src/dm/ve.dm.Converter.js",
                                
"lib/ve/src/dm/selections/ve.dm.LinearSelection.js",
@@ -943,6 +942,8 @@
                                "visualeditor-clipboard-cut",
                                "visualeditor-clipboard-paste",
                                "visualeditor-clipboard-paste-special",
+                               "visualeditor-command-dialog-cancel",
+                               "visualeditor-command-dialog-confirm",
                                "visualeditor-commentinspector-edit",
                                "visualeditor-commentinspector-title",
                                "visualeditor-commentinspector-tooltip",
@@ -1011,6 +1012,7 @@
                                
"visualeditor-mediasizewidget-sizeoptions-default",
                                
"visualeditor-mediasizewidget-sizeoptions-scale",
                                "visualeditor-shortcuts-clipboard",
+                               "visualeditor-shortcuts-dialog",
                                "visualeditor-shortcuts-formatting",
                                "visualeditor-shortcuts-history",
                                "visualeditor-shortcuts-other",
diff --git a/lib/ve b/lib/ve
index 121100d..c188468 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 121100d74fdb5d16cff6b36369c7de4a5d6ba976
+Subproject commit c1884680ab4586d7db97628ac22772e330f54e7a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5066b1d2c60e116bc3b80b9a8242a72db243d8cf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to