Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336899 )

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

Update VE core submodule to master (0dfc50a88)

New changes:
d2681c923 SourceMode: Fix sanitization loop in plain text paste
eb4e54bdc Store metadata as block nodes in the main data list
f67a7cb06 Listen to mouseup events on documentNode for focus changes
f3e857a3e ve.ui.Surface: fix issues with scrolling while selection

Bug: T56299
Bug: T157291
Bug: T157491
Bug: T157499
Change-Id: I14422ff046734858270879a4ba24654a05c3000c
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M VisualEditor.hooks.php
M extension.json
M lib/ve
5 files changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/99/336899/1

diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 7ab877c..0f193fc 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -102,7 +102,6 @@
                                        "ve.dm.ModelRegistry",
                                        "ve.dm.ModelFactory",
                                        "ve.dm.AnnotationFactory",
-                                       "ve.dm.MetaItemFactory",
                                        "ve.dm.NodeFactory",
                                        "ve.dm.Converter",
                                        "ve.dm.DataString",
@@ -151,6 +150,7 @@
                                        "ve.ce.TextState",
                                        "ve.ce.TextStateChunk",
                                        "ve.ce.*Annotation",
+                                       "ve.ce.MetaItem",
                                        "ve.ce.*Factory",
                                        "ve.ce.*KeyDownHandler",
                                        "ve.ce.Document",
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 77279a9..bd50a99 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -177,7 +177,6 @@
                <script src="lib/ve/src/dm/ve.dm.NodeFactory.js"></script>
                <script src="lib/ve/src/dm/ve.dm.AnnotationFactory.js"></script>
                <script src="lib/ve/src/dm/ve.dm.AnnotationSet.js"></script>
-               <script src="lib/ve/src/dm/ve.dm.MetaItemFactory.js"></script>
                <script 
src="lib/ve/src/dm/ve.dm.ClassAttributeNode.js"></script>
                <script src="lib/ve/src/dm/ve.dm.AlignableNode.js"></script>
                <script src="lib/ve/src/dm/ve.dm.FocusableNode.js"></script>
@@ -214,7 +213,6 @@
                <script 
src="lib/ve/src/dm/selections/ve.dm.TableSelection.js"></script>
                <script 
src="lib/ve/src/dm/lineardata/ve.dm.FlatLinearData.js"></script>
                <script 
src="lib/ve/src/dm/lineardata/ve.dm.ElementLinearData.js"></script>
-               <script 
src="lib/ve/src/dm/lineardata/ve.dm.MetaLinearData.js"></script>
                <script 
src="lib/ve/src/dm/nodes/ve.dm.GeneratedContentNode.js"></script>
                <script src="lib/ve/src/dm/nodes/ve.dm.AlienNode.js"></script>
                <script src="lib/ve/src/dm/nodes/ve.dm.ArticleNode.js"></script>
@@ -285,6 +283,7 @@
                <script src="lib/ve/src/ce/ve.ce.BranchNode.js"></script>
                <script src="lib/ve/src/ce/ve.ce.ContentBranchNode.js"></script>
                <script src="lib/ve/src/ce/ve.ce.LeafNode.js"></script>
+               <script src="lib/ve/src/ce/ve.ce.MetaItem.js"></script>
                <script 
src="lib/ve/src/ce/ve.ce.ClassAttributeNode.js"></script>
                <script src="lib/ve/src/ce/ve.ce.AlignableNode.js"></script>
                <script src="lib/ve/src/ce/ve.ce.FocusableNode.js"></script>
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index f5e082a..fe296a2 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -833,10 +833,8 @@
                                'lib/ve/tests/dm/ve.dm.SurfaceFragment.test.js',
                                
'modules/ve-mw/tests/dm/ve.dm.SurfaceFragment.test.js',
                                'lib/ve/tests/dm/ve.dm.ModelRegistry.test.js',
-                               'lib/ve/tests/dm/ve.dm.MetaList.test.js',
                                
'lib/ve/tests/dm/lineardata/ve.dm.FlatLinearData.test.js',
                                
'lib/ve/tests/dm/lineardata/ve.dm.ElementLinearData.test.js',
-                               
'lib/ve/tests/dm/lineardata/ve.dm.MetaLinearData.test.js',
                                'modules/ve-mw/tests/dm/ve.dm.mwExample.js',
                                
'modules/ve-mw/tests/dm/ve.dm.Converter.test.js',
                                
'modules/ve-mw/tests/dm/ve.dm.MWImageModel.test.js',
diff --git a/extension.json b/extension.json
index f3791fc..890b650 100644
--- a/extension.json
+++ b/extension.json
@@ -566,7 +566,6 @@
                                "lib/ve/src/dm/ve.dm.NodeFactory.js",
                                "lib/ve/src/dm/ve.dm.AnnotationFactory.js",
                                "lib/ve/src/dm/ve.dm.AnnotationSet.js",
-                               "lib/ve/src/dm/ve.dm.MetaItemFactory.js",
                                "lib/ve/src/dm/ve.dm.Node.js",
                                "lib/ve/src/dm/ve.dm.ClassAttributeNode.js",
                                "lib/ve/src/dm/ve.dm.AlignableNode.js",
@@ -603,7 +602,6 @@
                                
"lib/ve/src/dm/selections/ve.dm.TableSelection.js",
                                
"lib/ve/src/dm/lineardata/ve.dm.FlatLinearData.js",
                                
"lib/ve/src/dm/lineardata/ve.dm.ElementLinearData.js",
-                               
"lib/ve/src/dm/lineardata/ve.dm.MetaLinearData.js",
                                
"lib/ve/src/dm/nodes/ve.dm.GeneratedContentNode.js",
                                "lib/ve/src/dm/nodes/ve.dm.AlienNode.js",
                                "lib/ve/src/dm/nodes/ve.dm.ArticleNode.js",
@@ -669,6 +667,7 @@
                                "lib/ve/src/ce/ve.ce.Document.js",
                                "lib/ve/src/ce/ve.ce.View.js",
                                "lib/ve/src/ce/ve.ce.Annotation.js",
+                               "lib/ve/src/ce/ve.ce.MetaItem.js",
                                "lib/ve/src/ce/ve.ce.Node.js",
                                "lib/ve/src/ce/ve.ce.BranchNode.js",
                                "lib/ve/src/ce/ve.ce.ContentBranchNode.js",
diff --git a/lib/ve b/lib/ve
index c188468..0dfc50a 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit c1884680ab4586d7db97628ac22772e330f54e7a
+Subproject commit 0dfc50a88ababd529ed3e444a9471e09d9c9fc86

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14422ff046734858270879a4ba24654a05c3000c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to