diff --git a/lib/ve b/lib/ve index 6bd2ea52b5..b57d224ec0 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 6bd2ea52b534cfa73b8fca9004021084a4225046 +Subproject commit b57d224ec06f582b1b73270c140a84a3450a0c27 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 2e00331a3a..485fcc51d8 100644 --- a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js +++ b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js @@ -27,7 +27,7 @@ QUnit.test( 'getRenderedContents', function ( assert ) { ['d', [ { type: 'textStyle/bold' } ]], { type: 'alienInline', - attributes: { domElements: $( 'e' ).toArray() }, + originalDomElements: $( 'e' ).toArray(), annotations: [ { type: 'textStyle/bold' } ] }, { type: '/alienInline' }, diff --git a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js index e7f7846ed8..ff9b35347f 100644 --- a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js +++ b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js @@ -11,7 +11,7 @@ QUnit.module( 've.dm.Transaction (MW)' ); QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) { var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps, doc, complexDoc = ve.dm.mwExample.createExampleDocument( 'complexInternalData' ), - comment = { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + comment = { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, withReference = [ { type: 'paragraph' }, 'B', 'a', 'r', diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js b/modules/ve-mw/tests/dm/ve.dm.mwExample.js index a011229b17..dd19ee54b9 100644 --- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js +++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js @@ -363,9 +363,7 @@ ve.dm.mwExample.withMeta = [ { type: '/paragraph' }, { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: '/mwAlienMeta' }, { type: 'paragraph' }, @@ -388,9 +386,7 @@ ve.dm.mwExample.withMeta = [ 'r', { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: '/mwAlienMeta' }, 'B', @@ -406,9 +402,7 @@ ve.dm.mwExample.withMeta = [ { type: '/paragraph' }, { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: '/mwAlienMeta' }, { @@ -438,9 +432,7 @@ ve.dm.mwExample.withMeta = [ { type: '/mwCategory' }, { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: '/mwAlienMeta' }, { type: 'internalList' }, @@ -467,15 +459,11 @@ ve.dm.mwExample.withMetaMetaData = [ [ { type: 'alienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() } ], undefined, @@ -498,27 +486,21 @@ ve.dm.mwExample.withMetaMetaData = [ [ { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() } ], undefined, [ { type: 'alienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() } ], undefined, [ { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() }, { type: 'comment', @@ -538,9 +520,7 @@ ve.dm.mwExample.withMetaMetaData = [ }, { type: 'mwAlienMeta', - attributes: { - domElements: $( '' ).toArray() - } + originalDomElements: $( '' ).toArray() } ], undefined, @@ -661,13 +641,13 @@ ve.dm.mwExample.references = [ { type: '/paragraph' }, { type: 'mwReferencesList', + // orginalDomElements: HTML, attributes: { mw: { name: 'references', attrs: { group: 'g1' } }, originalMw: '{"name":"references","attrs":{"group":"g1"}"}', - // domElements: HTML, listGroup: 'mwReference/', refGroup: '' } @@ -704,7 +684,7 @@ ve.dm.mwExample.references = [ ve.dm.mwExample.complexInternalData = [ // 0 - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, { type: 'paragraph' }, 'F', ['o', [ve.dm.example.bold]], ['o', [ve.dm.example.italic]], @@ -722,7 +702,7 @@ ve.dm.mwExample.complexInternalData = [ { type: '/mwReference' }, // 6 { type: '/paragraph' }, - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, // 7 { type: 'internalList' }, @@ -732,7 +712,7 @@ ve.dm.mwExample.complexInternalData = [ { type: 'paragraph', internal: { generated: 'wrapper' } }, 'R', ['e', [ve.dm.example.bold]], 'f', // 13 - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, 'e', ['r', [ve.dm.example.italic]], ['e', [ve.dm.example.italic]], // 16 @@ -754,22 +734,22 @@ ve.dm.mwExample.complexInternalData = [ { type: '/internalItem' }, // 23 { type: 'internalItem' }, - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, // 24 { type: 'preformatted' }, - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, // 25 { type: 'mwEntity', attributes: { character: '€' } }, // 26 { type: '/mwEntity' }, '2', '5', '0', - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, // 30 { type: '/preformatted' }, - { type: 'alienMeta', attributes: { domElements: $( '' ).get() } }, + { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, { type: '/alienMeta' }, // 31 { type: '/internalItem' },