Merge "Update VE core submodule to master (ca6a97f42)"

This commit is contained in:
jenkins-bot 2021-01-22 20:08:08 +00:00 committed by Gerrit Code Review
commit b11f6997df
3 changed files with 5 additions and 2 deletions

View file

@ -2247,11 +2247,14 @@
"messages": [ "messages": [
"visualeditor-changedesc-align", "visualeditor-changedesc-align",
"visualeditor-changedesc-changed", "visualeditor-changedesc-changed",
"visualeditor-changedesc-changed-diff",
"visualeditor-changedesc-comment", "visualeditor-changedesc-comment",
"visualeditor-changedesc-comment-diff",
"visualeditor-changedesc-image-size", "visualeditor-changedesc-image-size",
"visualeditor-changedesc-language", "visualeditor-changedesc-language",
"visualeditor-changedesc-link-added", "visualeditor-changedesc-link-added",
"visualeditor-changedesc-link-href", "visualeditor-changedesc-link-href",
"visualeditor-changedesc-link-href-diff",
"visualeditor-changedesc-link-removed", "visualeditor-changedesc-link-removed",
"visualeditor-changedesc-no-key", "visualeditor-changedesc-no-key",
"visualeditor-changedesc-set", "visualeditor-changedesc-set",

2
lib/ve

@ -1 +1 @@
Subproject commit 98c07ef9519f3dd74de70cfc52a8c35410dde199 Subproject commit ca6a97f4294e6ffb0c8bdfb9429fa92e0b4b9962

View file

@ -24,7 +24,7 @@ QUnit.test( 'Diffing', function ( assert ) {
'</div>', '</div>',
expectedDescriptions: [ expectedDescriptions: [
'<div>visualeditor-changedesc-mwtransclusion</div>' + '<div>visualeditor-changedesc-mwtransclusion</div>' +
'<div><ul><li>visualeditor-changedesc-changed,1,<del>Hello, world!</del>,<ins>Hello, globe!</ins></li></ul></div>' '<div><ul><li>visualeditor-changedesc-changed-diff,1,<span>Hello, <del>world</del><ins>globe</ins>!</span></li></ul></div>'
] ]
}, },
{ {