jenkins-bot has submitted this change and it was merged.

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


Update VE core submodule to master (bf202b6)

New changes:
159ed9b Add 'width' and 'height' to the list of attributes corrupted by IE
a41b51a ve#track: refactor callback calling convention
4280219 Generate CommentNodes more leniently
bf202b6 Fix old metadata tests to use actual metadata

Change-Id: Ia8515d12f5d443e4e07b2c8291bf127341312e1e
---
M lib/ve
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
2 files changed, 18 insertions(+), 4 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index c65f3bd..bf202b6 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit c65f3bda73c310f27f7caeecb9e5595630ae1c43
+Subproject commit bf202b657cdb96c2bb74935995ab6085302ab450
diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js 
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index 349760b..45c6bd6 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -302,12 +302,19 @@
 
 ve.dm.mwExample.withMeta = [
        {
-               type: 'commentMeta',
+               type: 'paragraph',
+               internal: {
+                       generated: 'wrapper'
+               }
+       },
+       {
+               type: 'comment',
                attributes: {
                        text: ' No content conversion '
                }
        },
-       { type: '/commentMeta' },
+       { type: '/comment' },
+       { type: '/paragraph' },
        {
                type: 'mwAlienMeta',
                attributes: {
@@ -359,12 +366,19 @@
        },
        { type: '/mwAlienMeta' },
        {
-               type: 'commentMeta',
+               type: 'paragraph',
+               internal: {
+                       generated: 'wrapper'
+               }
+       },
+       {
+               type: 'comment',
                attributes: {
                        text: 'barbaz'
                }
        },
-       { type: '/commentMeta' },
+       { type: '/comment' },
+       { type: '/paragraph' },
        {
                type: 'mwCategory',
                attributes: {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8515d12f5d443e4e07b2c8291bf127341312e1e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz DziewoƄski <[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

Reply via email to