wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-30 00:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
mediawiki-extensions-Visual.../modules/ve-mw/test/dm/ve.dm.mwExample.js

1986 lines
55 KiB
JavaScript
Raw Normal View History

Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
/*!
* VisualEditor DataModel MediaWiki example data sets.
*
Bump copyright like it's 2014 Change-Id: Ic469ebda2c061dc7da0b4c1625f43a7be55da4fa
2014-01-05 12:05:05 +00:00
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
* @license The MIT License (MIT); see LICENSE.txt
*/
Support external links in MWInternalLinkAnnotation As URLs from the clipboard are always absolute, we need to detect if these are from the same wiki as the current document, and if so convert back to relative for Parsoid. Bug: 58136 Change-Id: Id251afe65193fc6356628f1deb5ed757f8a6d347
2014-01-06 13:56:55 +00:00
/*global mw */
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
/**
* @class
* @singleton
* @ignore
*/
ve.dm.mwExample = {};
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
ve.dm.mwExample.createExampleDocument = function ( name, store ) {
return ve.dm.example.createExampleDocumentFromObject( name, store, ve.dm.mwExample );
};
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
ve.dm.mwExample.MWTransclusion = {
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
'blockOpen':
'<div about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;target&quot;:{&quot;wt&quot;:&quot;Test&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;Hello, world!&quot;}},&quot;id&quot;:&quot;mwt1&quot;}"' +
' data-parsoid="{&quot;tsr&quot;:[18,40],&quot;src&quot;:&quot;{{Test|Hello, world!}}&quot;,&quot;dsr&quot;:[18,40,null,null]}"' +
'>' +
'</div>',
'blockOpenModified':
'<div about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;id&quot;:&quot;mwt1&quot;,&quot;target&quot;:{&quot;wt&quot;:&quot;Test&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;Hello, globe!&quot;}}}"' +
Fix issues with copy-pasting MWTransclusionNodes ve.dm.MWTransclusionNode * Implement getClonedElement to remove originalDomElements and originalMw. We don't want to put these in the clipboard as there is no guarantee they are the rendering of the current set of parameters (a refresh may be in progress) and they may confuse the converter on the way back in. Remove about attribute to prevent about grouping of duplicated nodes. * Set an extra attribute to flag that the outputted DOM doesn't have any generated content attached to it that can be stored on load. * Check for said attribute in toDataElement and skip the storeGeneratedContents step. This will trigger an async update of the generated contents on paste. ve.ce.Surface * Call cloneElements before writing to pasteTarget so data in external clipboard is stripped of generated contents. ve.dm.Node * Only strip data-parsoid as other attributes may be meaningful. ve.dm.mwExample, ve.dm.Node.test * Update tests Bug: 58241 Change-Id: I3e15cc97e94747647078204a0b398e6ac3ec6382
2013-12-11 10:33:15 +00:00
' data-ve-no-generated-contents="true"' +
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
' data-parsoid="{&quot;tsr&quot;:[18,40],&quot;src&quot;:&quot;{{Test|Hello, world!}}&quot;,&quot;dsr&quot;:[18,40,null,null]}"' +
'>' +
'</div>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'blockContent': '<p about="#mwt1" data-parsoid="{}">Hello, world!</p>',
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
'inlineOpen':
'<span about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;id&quot;:&quot;mwt1&quot;,&quot;target&quot;:{&quot;wt&quot;:&quot;Inline&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;1,234&quot;}}}"' +
' data-parsoid="{&quot;tsr&quot;:[18,34],&quot;src&quot;:&quot;{{Inline|1,234}}&quot;,&quot;dsr&quot;:[18,34,null,null]}"' +
'>',
'inlineOpenModified':
'<span about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;id&quot;:&quot;mwt1&quot;,&quot;target&quot;:{&quot;wt&quot;:&quot;Inline&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;5,678&quot;}}}"' +
Fix issues with copy-pasting MWTransclusionNodes ve.dm.MWTransclusionNode * Implement getClonedElement to remove originalDomElements and originalMw. We don't want to put these in the clipboard as there is no guarantee they are the rendering of the current set of parameters (a refresh may be in progress) and they may confuse the converter on the way back in. Remove about attribute to prevent about grouping of duplicated nodes. * Set an extra attribute to flag that the outputted DOM doesn't have any generated content attached to it that can be stored on load. * Check for said attribute in toDataElement and skip the storeGeneratedContents step. This will trigger an async update of the generated contents on paste. ve.ce.Surface * Call cloneElements before writing to pasteTarget so data in external clipboard is stripped of generated contents. ve.dm.Node * Only strip data-parsoid as other attributes may be meaningful. ve.dm.mwExample, ve.dm.Node.test * Update tests Bug: 58241 Change-Id: I3e15cc97e94747647078204a0b398e6ac3ec6382
2013-12-11 10:33:15 +00:00
' data-ve-no-generated-contents="true"' +
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
' data-parsoid="{&quot;tsr&quot;:[18,34],&quot;src&quot;:&quot;{{Inline|1,234}}&quot;,&quot;dsr&quot;:[18,34,null,null]}"' +
'>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'inlineContent': '$1,234.00',
'inlineClose': '</span>',
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
'mixed':
'<link about="#mwt1" rel="mw:PageProp/Category" typeof="mw:Transclusion"' +
' data-mw="{&quot;id&quot;:&quot;mwt1&quot;,&quot;target&quot;:{&quot;wt&quot;:&quot;Inline&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;5,678&quot;}}}"' +
'>' +
'<span about="#mwt1">Foo</span>',
'pairOne':
'<p about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;foo&quot;}}}" data-parsoid="1"' +
'>foo</p>',
'pairTwo':
'<p about="#mwt2" typeof="mw:Transclusion"' +
' data-mw="{&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;foo&quot;}}}" data-parsoid="2"' +
'>foo</p>',
Handle meta-only transclusions as meta items To achieve this we need to evaluate the DOM contents of transclusion nodes to see if it consists solely of meta items and whitespace. To check for meta items we do a model registry match, but with an additional parameter to exclude mwTransclusion types as a possible result (as the first item may be a meta tag, but with a mw:Transclusion typeof attribute). Bug: 51322 Change-Id: I89a220350fb7e10e15f3682d21438539196a5846
2013-07-23 13:35:26 +00:00
'meta':
Format MW example HTML For readability Change-Id: I7e58fd71a0a34e2e11bf93b1f088e4c87795b748
2013-12-11 10:23:29 +00:00
'<link rel="mw:PageProp/Category" href="./Category:Page" about="#mwt1" typeof="mw:Transclusion"' +
' data-mw="{&quot;target&quot;:{&quot;wt&quot;:&quot;Template:Echo&quot;,&quot;href&quot;:&quot;./Template:Echo&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;[[Category:Page]]\\n[[Category:Book]]&quot;}},&quot;i&quot;:0}">' +
Handle meta-only transclusions as meta items To achieve this we need to evaluate the DOM contents of transclusion nodes to see if it consists solely of meta items and whitespace. To check for meta items we do a model registry match, but with an additional parameter to exclude mwTransclusion types as a possible result (as the first item may be a meta tag, but with a mw:Transclusion typeof attribute). Bug: 51322 Change-Id: I89a220350fb7e10e15f3682d21438539196a5846
2013-07-23 13:35:26 +00:00
'<span about="#mwt1" data-parsoid="{}">\n</span>' +
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'<link rel="mw:PageProp/Category" href="./Category:Book" about="#mwt1">'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
};
ve.dm.mwExample.MWTransclusion.blockData = {
'type': 'mwTransclusionBlock',
'attributes': {
'mw': {
'id': 'mwt1',
Set up node-jscs, pass it, and configure in local Gruntfile Let's experiment with this via our local Gruntfile. If it works fine we can install it in Jenkins (similar to node-csslint). Verify through $ npm install && npm test; Fixed all outstanding violations. Also: * Added syntaxhighight to ignore. * Added imetests (which contain unformatted JSON) to ignore. * In ve.dm.ModelRegistry#matchTypeRegExps, removed redundant !! cast from the [+!!withFunc] statement which was hitting a bug in node-jscs. All callers to this local private function pass a literal boolean true/false so no need to cast it. * Removed "/* key .. , value */" from ve.setProp, though this wasn't caught by node-jscs, found it when searching for " , ". * Made npm.devDependencies fixed instead of using tilde-ranges. This too often leads to strange bugs or sudden changes. Fixed them at the version they were currently ranging to. Bug: 54218 Change-Id: Ib2630806f3946874c8b01e58cf171df83a28da29
2013-12-06 02:34:44 +00:00
'target': { 'wt': 'Test' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'params': {
'1': { 'wt': 'Hello, world!' }
}
},
Don't change edited transclusion nodes to <span>s This is harmful because we don't know whether <span> is acceptable in context. They're not allowed in <tbody> for instance, and so if we replace a <tr> with a <span> that breaks things. Instead, use the nodeName of the first original DOM element. Change-Id: I95ea9f13985767123f692706c6cc71fefd74d517
2013-07-11 02:05:28 +00:00
'originalDomElements': $( ve.dm.mwExample.MWTransclusion.blockOpen + ve.dm.mwExample.MWTransclusion.blockContent ).toArray(),
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'originalMw': '{\"target\":{\"wt\":\"Test\"},\"params\":{\"1\":{\"wt\":\"Hello, world!\"}},\"id\":\"mwt1\"}',
'originalIndex': 0
},
'htmlAttributes': [
{ 'values': {
'about': '#mwt1',
'data-mw': '{\"target\":{\"wt\":\"Test\"},\"params\":{\"1\":{\"wt\":\"Hello, world!\"}},\"id\":\"mwt1\"}',
'data-parsoid': '{\"tsr\":[18,40],\"src\":\"{{Test|Hello, world!}}\",\"dsr\":[18,40,null,null]}',
'typeof': 'mw:Transclusion'
} },
{ 'values': {
'about': '#mwt1',
'data-parsoid': '{}'
} }
]
};
ve.dm.mwExample.MWTransclusion.inlineData = {
'type': 'mwTransclusionInline',
'attributes': {
'mw': {
'id': 'mwt1',
Set up node-jscs, pass it, and configure in local Gruntfile Let's experiment with this via our local Gruntfile. If it works fine we can install it in Jenkins (similar to node-csslint). Verify through $ npm install && npm test; Fixed all outstanding violations. Also: * Added syntaxhighight to ignore. * Added imetests (which contain unformatted JSON) to ignore. * In ve.dm.ModelRegistry#matchTypeRegExps, removed redundant !! cast from the [+!!withFunc] statement which was hitting a bug in node-jscs. All callers to this local private function pass a literal boolean true/false so no need to cast it. * Removed "/* key .. , value */" from ve.setProp, though this wasn't caught by node-jscs, found it when searching for " , ". * Made npm.devDependencies fixed instead of using tilde-ranges. This too often leads to strange bugs or sudden changes. Fixed them at the version they were currently ranging to. Bug: 54218 Change-Id: Ib2630806f3946874c8b01e58cf171df83a28da29
2013-12-06 02:34:44 +00:00
'target': { 'wt': 'Inline' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'params': {
'1': { 'wt': '1,234' }
}
},
'originalDomElements': $( ve.dm.mwExample.MWTransclusion.inlineOpen + ve.dm.mwExample.MWTransclusion.inlineContent + ve.dm.mwExample.MWTransclusion.inlineClose ).toArray(),
'originalMw': '{\"id\":\"mwt1\",\"target\":{\"wt\":\"Inline\"},\"params\":{\"1\":{\"wt\":\"1,234\"}}}',
'originalIndex': 0
},
'htmlAttributes': [ { 'values': {
'about': '#mwt1',
'data-mw': '{\"id\":\"mwt1\",\"target\":{\"wt\":\"Inline\"},\"params\":{\"1\":{\"wt\":\"1,234\"}}}',
'data-parsoid': '{\"tsr\":[18,34],\"src\":\"{{Inline|1,234}}\",\"dsr\":[18,34,null,null]}',
'typeof': 'mw:Transclusion'
} } ]
};
ve.dm.mwExample.MWTransclusion.mixedDataOpen = {
'type': 'mwTransclusionInline',
'attributes': {
'mw': {
'id': 'mwt1',
'target': { 'wt': 'Inline' },
'params': {
'1': { 'wt': '5,678' }
}
},
'originalDomElements': $( ve.dm.mwExample.MWTransclusion.mixed ).toArray(),
'originalMw': '{\"id\":\"mwt1\",\"target\":{\"wt\":\"Inline\"},\"params\":{\"1\":{\"wt\":\"5,678\"}}}',
'originalIndex': 0
},
'htmlAttributes': [
{ 'values': {
'about': '#mwt1',
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'rel': 'mw:PageProp/Category',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'typeof': 'mw:Transclusion',
'data-mw': '{\"id\":\"mwt1\",\"target\":{\"wt\":\"Inline\"},\"params\":{\"1\":{\"wt\":\"5,678\"}}}'
} },
{ 'values': { 'about': '#mwt1' } }
]
};
ve.dm.mwExample.MWTransclusion.mixedDataClose = { 'type': '/mwTransclusionInline' };
Remove ve.getHash and use getHash from oojs instead Change-Id: Ib688a3ba0ab07e0d0dc328a3878440756d1103fe
2013-10-15 19:59:14 +00:00
ve.dm.mwExample.MWTransclusion.blockParamsHash = OO.getHash( [ ve.dm.MWTransclusionNode.static.getHashObject( ve.dm.mwExample.MWTransclusion.blockData ), undefined ] );
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
ve.dm.mwExample.MWTransclusion.blockStoreItems = {
'hash': ve.dm.mwExample.MWTransclusion.blockParamsHash,
Don't change edited transclusion nodes to <span>s This is harmful because we don't know whether <span> is acceptable in context. They're not allowed in <tbody> for instance, and so if we replace a <tr> with a <span> that breaks things. Instead, use the nodeName of the first original DOM element. Change-Id: I95ea9f13985767123f692706c6cc71fefd74d517
2013-07-11 02:05:28 +00:00
'value': $( ve.dm.mwExample.MWTransclusion.blockOpen + ve.dm.mwExample.MWTransclusion.blockContent ).toArray()
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
};
Remove ve.getHash and use getHash from oojs instead Change-Id: Ib688a3ba0ab07e0d0dc328a3878440756d1103fe
2013-10-15 19:59:14 +00:00
ve.dm.mwExample.MWTransclusion.inlineParamsHash = OO.getHash( [ ve.dm.MWTransclusionNode.static.getHashObject( ve.dm.mwExample.MWTransclusion.inlineData ), undefined ] );
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
ve.dm.mwExample.MWTransclusion.inlineStoreItems = {
'hash': ve.dm.mwExample.MWTransclusion.inlineParamsHash,
'value': $( ve.dm.mwExample.MWTransclusion.inlineOpen + ve.dm.mwExample.MWTransclusion.inlineContent + ve.dm.mwExample.MWTransclusion.inlineClose ).toArray()
};
Remove ve.getHash and use getHash from oojs instead Change-Id: Ib688a3ba0ab07e0d0dc328a3878440756d1103fe
2013-10-15 19:59:14 +00:00
ve.dm.mwExample.MWTransclusion.mixedParamsHash = OO.getHash( [ ve.dm.MWTransclusionNode.static.getHashObject( ve.dm.mwExample.MWTransclusion.mixedDataOpen ), undefined ] );
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
ve.dm.mwExample.MWTransclusion.mixedStoreItems = {
'hash': ve.dm.mwExample.MWTransclusion.mixedParamsHash,
'value': $( ve.dm.mwExample.MWTransclusion.mixed ).toArray()
};
Support external links in MWInternalLinkAnnotation As URLs from the clipboard are always absolute, we need to detect if these are from the same wiki as the current document, and if so convert back to relative for Parsoid. Bug: 58136 Change-Id: Id251afe65193fc6356628f1deb5ed757f8a6d347
2014-01-06 13:56:55 +00:00
ve.dm.mwExample.MWInternalLink = {
'absoluteHref': new mw.Uri( '/wiki/Foo/Bar' ).toString()
};
ve.dm.mwExample.MWInternalLink.absoluteOpen = '<a rel="mw:WikiLink" href="' + ve.dm.mwExample.MWInternalLink.absoluteHref + '">';
ve.dm.mwExample.MWInternalLink.absoluteData = {
'type': 'link/mwInternal',
'attributes': {
'title': 'Foo/Bar',
'origTitle': 'Foo/Bar',
'normalizedTitle': 'Foo/Bar',
'hrefPrefix': ''
},
'htmlAttributes': [
{
'values': {
'href': ve.dm.mwExample.MWInternalLink.absoluteHref,
'rel': 'mw:WikiLink'
},
'computed': {
'href': ve.dm.mwExample.MWInternalLink.absoluteHref
}
}
]
};
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
ve.dm.mwExample.MWBlockImage = {
'html':
'<figure typeof="mw:Image/Thumb" class="mw-halign-right foobar">' +
'<a href="Foo"><img src="Bar" width="1" height="2" resource="FooBar"></a>' +
'<figcaption>abc</figcaption>' +
'</figure>',
'data': [
{
'type': 'mwBlockImage',
'attributes': {
'type': 'thumb',
'align': 'right',
'href': 'Foo',
'src': 'Bar',
Convert MWBlockImage dimensions to numbers and update tests MWInlineImage already does this but it wasn't copied over to MWBlockImage. Change-Id: I9f34182b30ae72beb7b5c3d5fde2f08185cba663
2013-10-15 16:50:01 +00:00
'width': 1,
'height': 2,
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
'resource': 'FooBar',
'originalClasses': 'mw-halign-right foobar',
'unrecognizedClasses': ['foobar']
}
},
{ 'type': 'mwImageCaption' },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'a', 'b', 'c',
{ 'type': '/paragraph' },
{ 'type': '/mwImageCaption' },
{ 'type': '/mwBlockImage' }
Re-render images after resize Using the MW APIs get a resized version of the image and use GeneratedContentNode to cache the url. Bug: 55697 Change-Id: I418f7e1464663f447d46de7ffc29aa5f52d23b12
2013-10-15 12:18:11 +00:00
],
'storeItems': [
{
'hash': '[{"height":2,"resource":"FooBar","type":"mwBlockImage","width":1},null]',
'value': 'Bar'
}
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
]
};
Convert MWBlockImage dimensions to numbers and update tests MWInlineImage already does this but it wasn't copied over to MWBlockImage. Change-Id: I9f34182b30ae72beb7b5c3d5fde2f08185cba663
2013-10-15 16:50:01 +00:00
ve.dm.mwExample.MWInlineImage = {
'html':
'<span typeof="mw:Image" class="foo mw-valign-text-top">' +
'<a href="./File:Wiki.png">' +
'<img resource="./File:Wiki.png" src="http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png" height="155" width="135">' +
'</a>' +
'</span>',
'data': {
'type': 'mwInlineImage',
'attributes': {
'src': 'http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png',
'href': './File:Wiki.png',
'width': 135,
'height': 155,
'isLinked': true,
'valign': 'text-top',
'resource': './File:Wiki.png',
'type': 'inline',
'originalClasses': 'foo mw-valign-text-top',
'unrecognizedClasses': ['foo']
},
Re-render images after resize Using the MW APIs get a resized version of the image and use GeneratedContentNode to cache the url. Bug: 55697 Change-Id: I418f7e1464663f447d46de7ffc29aa5f52d23b12
2013-10-15 12:18:11 +00:00
},
'storeItems': [
{
'hash': '[{"height":155,"resource":"./File:Wiki.png","type":"mwInlineImage","width":135},null]',
'value': 'http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png'
}
]
Convert MWBlockImage dimensions to numbers and update tests MWInlineImage already does this but it wasn't copied over to MWBlockImage. Change-Id: I9f34182b30ae72beb7b5c3d5fde2f08185cba663
2013-10-15 16:50:01 +00:00
};
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
ve.dm.mwExample.MWReference = {
'referenceList':
'<ol class="references" typeof="mw:Extension/references" about="#mwt7" data-parsoid="{}"' +
'data-mw="{&quot;name&quot;:&quot;references&quot;,&quot;body&quot;:{' +
'&quot;extsrc&quot;:&quot;<ref name=\\&quot;foo\\&quot;>Ref in refs</ref>' +
'&quot;,&quot;html&quot;:&quot;<span about=\\&quot;#mwt8\\&quot; class=\\&quot;reference\\&quot; ' +
'data-mw=\\&quot;{&amp;quot;name&amp;quot;:&amp;quot;ref&amp;quot;,&amp;quot;body&amp;quot;:{&amp;quot;html&amp;quot;:&amp;quot;Ref in refs&amp;quot;},' +
'&amp;quot;attrs&amp;quot;:{&amp;quot;name&amp;quot;:&amp;quot;foo&amp;quot;}}\\&quot; ' +
'rel=\\&quot;dc:references\\&quot; typeof=\\&quot;mw:Extension/ref\\&quot;>' +
'<a href=\\&quot;#cite_note-foo-3\\&quot;>[3]</a></span>&quot;},&quot;attrs&quot;:{}}"></ol>'
};
Add a node class for mw:Nowiki These represent <nowiki> tags. If the user doesn't edit the text inside the nowiki, we round-trip the <span typeof="mw:Nowiki"> wrapper cleanly, but if they do edit it, we unwrap it. This then triggers re-escaping in Parsoid, and prevents cases where the user edits the text to no longer need escaping but Parsoid still wraps it in <nowiki> because of the <span typeof="mw:Nowiki"> wrapper. In order to detect whether the contents have changed, the nowiki annotation stores a copy of its contents. To avoid infinite recursion, we have to exclude this attribute for hash generation. Bug: 47678 Change-Id: I2edc46b6d87d2f91e952efcb09c0edae5166958f
2013-07-17 01:22:22 +00:00
ve.dm.mwExample.mwNowikiAnnotation = {
'type': 'mwNowiki',
'attributes': {
'originalDomElements': $( '<span typeof="mw:Nowiki">[[Bar]]</span>' ).toArray()
},
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Nowiki' } } ]
};
ve.dm.mwExample.mwNowiki = [
{ 'type': 'paragraph' },
'F', 'o', 'o',
[ '[', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ '[', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ 'B', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ 'a', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ 'r', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ ']', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
[ ']', [ ve.dm.mwExample.mwNowikiAnnotation ] ],
'B', 'a', 'z',
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
];
ve.dm.mwExample.mwNowikiHtml = '<body><p>Foo<span typeof="mw:Nowiki">[[Bar]]</span>Baz</p></body>';
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
ve.dm.mwExample.withMeta = [
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- No content conversion -->' ).toArray()
}
},
{ 'type': '/alienMeta' },
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:PageProp/nocc" />' ).toArray()
}
},
{ 'type': '/mwAlienMeta' },
{ 'type': 'paragraph' },
'F',
'o',
'o',
{
'type': 'mwCategory',
'attributes': {
'hrefPrefix': './',
'category': 'Category:Bar',
'origCategory': 'Category:Bar',
'sortkey': '',
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'origSortkey': ''
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'rel': 'mw:PageProp/Category',
'href': './Category:Bar'
},
'computed': {
'href': 'http://example.com/Category:Bar'
}
}
]
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
},
{ 'type': '/mwCategory' },
'B',
'a',
'r',
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:foo" content="bar" />' ).toArray()
}
},
{ 'type': '/mwAlienMeta' },
'B',
'a',
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- inline -->' ).toArray()
}
},
{ 'type': '/alienMeta' },
'z',
{ 'type': '/paragraph' },
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:bar" content="baz" />' ).toArray()
}
},
{ 'type': '/mwAlienMeta' },
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!--barbaz-->' ).toArray()
}
},
{ 'type': '/alienMeta' },
{
'type': 'mwCategory',
'attributes': {
'hrefPrefix': './',
'category': 'Category:Foo foo',
'origCategory': 'Category:Foo_foo',
'sortkey': 'Bar baz#quux',
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'origSortkey': 'Bar baz%23quux'
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'rel': 'mw:PageProp/Category',
'href': './Category:Foo_foo#Bar baz%23quux'
},
'computed': {
'href': 'http://example.com/Category:Foo_foo#Bar baz%23quux'
}
}
]
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
},
{ 'type': '/mwCategory' },
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta typeof="mw:Placeholder" data-parsoid="foobar" />' ).toArray()
}
},
{ 'type': '/mwAlienMeta' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
];
ve.dm.mwExample.withMetaPlainData = [
{ 'type': 'paragraph' },
'F',
'o',
'o',
'B',
'a',
'r',
'B',
'a',
'z',
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
];
ve.dm.mwExample.withMetaMetaData = [
[
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- No content conversion -->' ).toArray()
}
},
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:PageProp/nocc" />' ).toArray()
}
}
],
undefined,
undefined,
undefined,
[
{
'type': 'mwCategory',
'attributes': {
'hrefPrefix': './',
'category': 'Category:Bar',
'origCategory': 'Category:Bar',
'sortkey': '',
'origSortkey': ''
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'rel': 'mw:PageProp/Category',
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'href': './Category:Bar'
},
'computed': {
'href': 'http://example.com/Category:Bar'
}
}
]
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
}
],
undefined,
undefined,
[
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:foo" content="bar" />' ).toArray()
}
}
],
undefined,
[
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- inline -->' ).toArray()
}
}
],
undefined,
[
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta property="mw:bar" content="baz" />' ).toArray()
}
},
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!--barbaz-->' ).toArray()
}
},
{
'type': 'mwCategory',
'attributes': {
'hrefPrefix': './',
'category': 'Category:Foo foo',
'origCategory': 'Category:Foo_foo',
'sortkey': 'Bar baz#quux',
'origSortkey': 'Bar baz%23quux'
},
'htmlAttributes': [ { 'values': {
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'rel': 'mw:PageProp/Category',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'href': './Category:Foo_foo#Bar baz%23quux'
} } ]
},
{
'type': 'mwAlienMeta',
'attributes': {
'domElements': $( '<meta typeof="mw:Placeholder" data-parsoid="foobar" />' ).toArray()
}
}
],
undefined,
undefined
];
ve.dm.mwExample.references = [
{ 'type': 'paragraph' },
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 0,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'auto/0',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
'attrs': {},
'body': { 'html': 'No name 1' },
'name': 'ref'
},
'originalMw': '{"name":"ref","body":{"html":"No name 1"},"attrs":{}}',
'refGroup': ''
},
'htmlAttributes': [ { 'values': {
'about': '#mwt2',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"No name 1"},"attrs":{}}',
'data-parsoid': '{"src":"<ref>No name 1</ref>","dsr":[0,20,5,6]}',
'id': 'cite_ref-1-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
{ 'type': '/paragraph' },
{ 'type': 'paragraph', 'htmlAttributes': [ { 'values': { 'data-parsoid': '{"dsr":[22,108,0,0]}' } } ] },
'F', 'o', 'o',
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 1,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/bar',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
'attrs': { 'name': 'bar' },
'body': { 'html': 'Bar' },
'name': 'ref'
},
'originalMw': '{"body":{"html":""},"attrs":{"name":"bar"}}',
'refGroup': ''
},
'htmlAttributes': [ { 'values': {
'about': '#mwt6',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"Bar"},"attrs":{"name":"bar"}}',
'data-parsoid': '{"src":"<ref name=\\"bar\\">Bar</ref>","dsr":[25,50,16,6]}',
'id': 'cite_ref-bar-2-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
' ', 'B', 'a', 'z',
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 2,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/:3',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'attrs': { 'name': ':3' },
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'body': { 'html': 'Quux' },
'name': 'ref'
},
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'originalMw': '{"name":"ref","body":{"html":"Quux"},"attrs":{"name":":3"}}',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'refGroup': ''
},
'htmlAttributes': [ { 'values': {
'about': '#mwt7',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"Quux"},"attrs":{"name":"quux"}}',
'data-parsoid': '{"src":"<ref name=\\"quux\\">Quux</ref>","dsr":[54,81,17,6]}',
'id': 'cite_ref-quux-3-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
' ', 'W', 'h', 'e', 'e',
{
'type': 'mwReference',
'attributes': {
'contentsUsed': false,
'listGroup': 'mwReference/',
'listIndex': 1,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/bar',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
'attrs': { 'name': 'bar' },
'name': 'ref'
},
'originalMw': '{"body":{"html":""},"attrs":{"name":"bar"}}',
'refGroup': ''
},
'htmlAttributes': [ { 'values': {
'about': '#mwt8',
'class': 'reference',
'data-mw': '{"name":"ref","attrs":{"name":"bar"}}',
'data-parsoid': '{"src":"<ref name=\\"bar\\" />","dsr":[86,104,18,0]}',
'id': 'cite_ref-bar-2-1',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
' ', 'Y', 'a', 'y',
{ 'type': '/paragraph' },
{ 'type': 'paragraph' },
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 3,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'auto/1',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
'attrs': {},
'body': { 'html': 'No name 2' },
'name': 'ref'
},
'originalMw': '{"name":"ref","body":{"html":"No name 2"},"attrs":{}}',
'refGroup': ''
},
'htmlAttributes': [ { 'values': {
'about': '#mwt11',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"No name 2"},"attrs":{}}',
'data-parsoid': '{"src":"<ref>No name 2</ref>","dsr":[110,130,5,6]}',
'id': 'cite_ref-4-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listGroup': 'mwReference/foo',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'listIndex': 4,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'auto/2',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'mw': {
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'attrs': { 'group': 'foo' },
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'body': { 'html': 'No name 3' },
'name': 'ref'
},
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'originalMw': '{"name":"ref","body":{"html":"No name 3"},"attrs":{"group":"foo"}}',
'refGroup': 'foo'
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
},
'htmlAttributes': [ { 'values': {
'about': '#mwt12',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"No name 3"},"attrs":{}}',
'data-parsoid': '{"src":"<ref>No name 3</ref>"',
'id': 'cite_ref-5-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
} } ]
},
{ 'type': '/mwReference' },
{ 'type': '/paragraph' },
{
'type': 'mwReferenceList',
'attributes': {
'mw': {
'name': 'references',
'attrs': {}
},
'originalMw': '{"name":"references","attrs":{}"}',
//'domElements': HTML,
'listGroup': 'mwReference/',
'refGroup': ''
}
},
{ 'type': '/mwReferenceList' },
{ 'type': 'internalList' },
{ 'type': 'internalItem' },
{ 'type': 'paragraph' },
'N', 'o', ' ', 'n', 'a', 'm', 'e', ' ', '1',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
{ 'type': 'paragraph' },
'B', 'a', 'r',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
Set up node-jscs, pass it, and configure in local Gruntfile Let's experiment with this via our local Gruntfile. If it works fine we can install it in Jenkins (similar to node-csslint). Verify through $ npm install && npm test; Fixed all outstanding violations. Also: * Added syntaxhighight to ignore. * Added imetests (which contain unformatted JSON) to ignore. * In ve.dm.ModelRegistry#matchTypeRegExps, removed redundant !! cast from the [+!!withFunc] statement which was hitting a bug in node-jscs. All callers to this local private function pass a literal boolean true/false so no need to cast it. * Removed "/* key .. , value */" from ve.setProp, though this wasn't caught by node-jscs, found it when searching for " , ". * Made npm.devDependencies fixed instead of using tilde-ranges. This too often leads to strange bugs or sudden changes. Fixed them at the version they were currently ranging to. Bug: 54218 Change-Id: Ib2630806f3946874c8b01e58cf171df83a28da29
2013-12-06 02:34:44 +00:00
{ 'type': 'paragraph' },
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'Q', 'u', 'u', 'x',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
Set up node-jscs, pass it, and configure in local Gruntfile Let's experiment with this via our local Gruntfile. If it works fine we can install it in Jenkins (similar to node-csslint). Verify through $ npm install && npm test; Fixed all outstanding violations. Also: * Added syntaxhighight to ignore. * Added imetests (which contain unformatted JSON) to ignore. * In ve.dm.ModelRegistry#matchTypeRegExps, removed redundant !! cast from the [+!!withFunc] statement which was hitting a bug in node-jscs. All callers to this local private function pass a literal boolean true/false so no need to cast it. * Removed "/* key .. , value */" from ve.setProp, though this wasn't caught by node-jscs, found it when searching for " , ". * Made npm.devDependencies fixed instead of using tilde-ranges. This too often leads to strange bugs or sudden changes. Fixed them at the version they were currently ranging to. Bug: 54218 Change-Id: Ib2630806f3946874c8b01e58cf171df83a28da29
2013-12-06 02:34:44 +00:00
{ 'type': 'paragraph' },
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'N', 'o', ' ', 'n', 'a', 'm', 'e', ' ', '2',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
Set up node-jscs, pass it, and configure in local Gruntfile Let's experiment with this via our local Gruntfile. If it works fine we can install it in Jenkins (similar to node-csslint). Verify through $ npm install && npm test; Fixed all outstanding violations. Also: * Added syntaxhighight to ignore. * Added imetests (which contain unformatted JSON) to ignore. * In ve.dm.ModelRegistry#matchTypeRegExps, removed redundant !! cast from the [+!!withFunc] statement which was hitting a bug in node-jscs. All callers to this local private function pass a literal boolean true/false so no need to cast it. * Removed "/* key .. , value */" from ve.setProp, though this wasn't caught by node-jscs, found it when searching for " , ". * Made npm.devDependencies fixed instead of using tilde-ranges. This too often leads to strange bugs or sudden changes. Fixed them at the version they were currently ranging to. Bug: 54218 Change-Id: Ib2630806f3946874c8b01e58cf171df83a28da29
2013-12-06 02:34:44 +00:00
{ 'type': 'paragraph' },
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'N', 'o', ' ', 'n', 'a', 'm', 'e', ' ', '3',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': '/internalList' }
];
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
ve.dm.mwExample.complexInternalData = [
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// Metadata is indented
// 0
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- before -->' ).get() } },
{ 'type': '/alienMeta' },
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'paragraph' },
'F', ['o', [ve.dm.example.bold]], ['o', [ve.dm.example.italic]],
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 4
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'mwReference', 'attributes': {
'mw': {},
'about': '#mwt1',
'listIndex': 0,
'listGroup': 'mwReference/',
Fix metadata issues in newFromDocumentReplace * Our metadata insertions now need to be the same length as the data insertion, not one more, so: ** Remove the +1 in the listMetadata splice ** Shorten the metadata variable by dropping the merging of the metadata right before and right after the internal list; it was also including the metadata right after the internal list twice *** We still need to deal with this in some way though, left a TODO ** Fix the metadata insertion test for these changes * Fix null reference keys in the test data; we made all references keyed a while ago, but this test data was never updated for that ** The remapping of reference data doesn't remap auto/N keys yet, left a FIXME for that Change-Id: I8ef4e6ee7c1808574d81d0b83294848afd400cd7
2013-10-31 00:18:07 +00:00
'listKey': 'auto/0',
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
'refGroup': '',
'contentsUsed': true
} },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 5
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/mwReference' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 6
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/paragraph' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- after -->' ).get() } },
{ 'type': '/alienMeta' },
// 7
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'internalList' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 8
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'internalItem' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 9
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'R', ['e', [ve.dm.example.bold]], 'f',
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 13
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- reference -->' ).get() } },
{ 'type': '/alienMeta' },
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
'e', ['r', [ve.dm.example.italic]], ['e', [ve.dm.example.italic]],
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 16
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'mwReference', 'attributes': {
'mw': {},
'about': '#mwt2',
'listIndex': 1,
'listGroup': 'mwReference/',
'listKey': 'foo',
'refGroup': '',
'contentsUsed': true
} },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 17
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/mwReference' },
'n', 'c', 'e',
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 21
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/paragraph' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 22
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/internalItem' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 23
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'internalItem' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- beginning -->' ).get() } },
{ 'type': '/alienMeta' },
// 24
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'preformatted' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- inside -->' ).get() } },
{ 'type': '/alienMeta' },
// 25
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': 'mwEntity', 'attributes': { 'character': '€' } },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 26
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/mwEntity' },
'2', '5', '0',
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- inside2 -->' ).get() } },
{ 'type': '/alienMeta' },
// 30
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/preformatted' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
{ 'type': 'alienMeta', 'attributes': { 'domElements': $( '<!-- end -->' ).get() } },
{ 'type': '/alienMeta' },
// 31
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/internalItem' },
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 32
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
{ 'type': '/internalList' }
Add fixUpInsertion to newFromDocumentReplace In order to do this we have to separate out the removal operation from NDFR, so it becomes newFromDocumentInsertion (again, although actually, for the first time). As NFDI is an insertion we can just run fixUpInsertion on the data part of it. In order for the removal operation to be a proper removal we have to allow metadata removal (the default is to merge it). Change-Id: I16d575b61b9796e7e889f2c27cfe02b4a40b7639
2013-09-30 13:25:28 +00:00
// 33
Introduce newFromDocumentReplace() transaction builder Replaces newFromNodeReplacement(). newFromNodeReplacement was very simplistic and didn't support metadata or internal list items, so if you had comments or references inside of the data you were editing (reference contents or an image caption), they'd get mangled. With this, you can do: newDoc = doc.getDocumentSlice( node ); // Edit newDoc tx = ve.dm.Transaction.newFromDocumentReplace( doc, node, newDoc ); surface.change( newDoc ); and that takes care of metadata, internal list items, and things like references that reference internal list items. ve.dm.Document.js: * In getDocumentSlice(), store a reference to the original document and the number of items in its InternalList at the time of slicing in the created slice. This is used for reconciliation when the modified slice is injected back into the parent document with newFromDocumentReplace(). ve.dm.InternalList.js: * Add a method for merging in another InternalList. This provides a mapping from old to new InternalList indexes so the linear model data being injected by newFromDocumentReplace() can have its InternalList indexes remapped. ve.dm.Transaction.js: * Replace newFromNodeReplacement() with newFromDocumentReplace() ve.ui.MWMediaEditDialog.js, ve.ui.MWReferenceDialog.js: * Use getDocumentSlice/newFromDocumentReplace for editing captions/refs * Change insertion code path to insert an empty internalItem/caption, then newFromDocumentReplace into that * Add empty internalList to new mini-documents ve/test/dm/ve.dm.Transaction.test.js: * Replace newFromNodeReplacement tests with newFromDocumentReplace tests ve-mw/test/dm/ve.dm.Transaction.test.js (new): * Add tests for newFromDocumentReplace with mwReference nodes ve.dm.mwExample.js: * Add data for newFromDocumentReplace with mwReference tests VisualEditor.hooks.php: * Add new test file Bug: 52102 Change-Id: I4aa980780114b391924f04df588e81c990c32983
2013-09-05 01:05:07 +00:00
];
ve.dm.mwExample.complexInternalData.internalItems = [
{ 'group': 'mwReference', 'key': null, 'body': 'First reference' },
{ 'group': 'mwReference', 'key': 'foo', 'body': 'Table in ref: <table><tr><td>because I can</td></tr></table>' }
];
Recompute auto-numbered reference listKeys when merging internalLists This fixes some of the problems with pasting references. It's a bit overzealous in that references get renumbered even when replacing, which is unnecessary but doesn't actually have any noticeable effect. Unfortunately, the internal list state depends so much on the converter having run that we now need to add yet another hack, to set the counter to the appropriate value. Change-Id: I3c6514ce600af4f4c037f419554d34b5a5c86a63
2013-11-12 23:34:50 +00:00
ve.dm.mwExample.complexInternalData.internalListNextUniqueNumber = 1;
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
ve.dm.mwExample.domToDataCases = {
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'adjacent annotations': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body':
'<b>a</b><b data-parsoid="1">b</b><b>c</b><b data-parsoid="2">d</b> ' +
'<b>a</b><b>b</b> ' +
'<b data-parsoid="3">ab</b><b data-parsoid="4">c</b>',
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
[ 'a', [ ve.dm.example.bold ] ],
[
'b',
[ {
'type': 'textStyle/bold',
Generic support for multiple tags in TextStyleAnnotation Bug: 52477 Change-Id: If8e2f541adb045f9b84a913829a5b7430ca83299
2013-08-08 06:05:20 +00:00
'attributes': { 'nodeName': 'b' },
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'htmlAttributes': [ { 'values': {
'data-parsoid': '1'
} } ]
} ]
],
[ 'c', [ ve.dm.example.bold ] ],
[
'd',
[ {
'type': 'textStyle/bold',
Generic support for multiple tags in TextStyleAnnotation Bug: 52477 Change-Id: If8e2f541adb045f9b84a913829a5b7430ca83299
2013-08-08 06:05:20 +00:00
'attributes': { 'nodeName': 'b' },
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'htmlAttributes': [ { 'values': {
'data-parsoid': '2'
} } ]
} ]
],
' ',
[ 'a', [ ve.dm.example.bold ] ],
[ 'b', [ ve.dm.example.bold ] ],
' ',
[
'a',
[ {
'type': 'textStyle/bold',
Generic support for multiple tags in TextStyleAnnotation Bug: 52477 Change-Id: If8e2f541adb045f9b84a913829a5b7430ca83299
2013-08-08 06:05:20 +00:00
'attributes': { 'nodeName': 'b' },
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'htmlAttributes': [ { 'values': {
'data-parsoid': '3'
} } ]
} ]
],
[
'b',
[ {
'type': 'textStyle/bold',
Generic support for multiple tags in TextStyleAnnotation Bug: 52477 Change-Id: If8e2f541adb045f9b84a913829a5b7430ca83299
2013-08-08 06:05:20 +00:00
'attributes': { 'nodeName': 'b' },
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'htmlAttributes': [ { 'values': {
'data-parsoid': '3'
} } ]
} ]
],
[
'c',
[ {
'type': 'textStyle/bold',
Generic support for multiple tags in TextStyleAnnotation Bug: 52477 Change-Id: If8e2f541adb045f9b84a913829a5b7430ca83299
2013-08-08 06:05:20 +00:00
'attributes': { 'nodeName': 'b' },
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
'htmlAttributes': [ { 'values': {
'data-parsoid': '4'
} } ]
} ]
],
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': '<b>abcd</b> <b>ab</b> <b data-parsoid="3">ab</b><b data-parsoid="4">c</b>',
HACK: Don't merge adjacent annotations from Parsoid Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5
2013-07-12 21:21:20 +00:00
},
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'mw:Image': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p>' + ve.dm.mwExample.MWInlineImage.html + '</p>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
Convert MWBlockImage dimensions to numbers and update tests MWInlineImage already does this but it wasn't copied over to MWBlockImage. Change-Id: I9f34182b30ae72beb7b5c3d5fde2f08185cba663
2013-10-15 16:50:01 +00:00
ve.dm.mwExample.MWInlineImage.data,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': '/mwInlineImage' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'mw:Transclusion (block level)': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.blockOpen + ve.dm.mwExample.MWTransclusion.blockContent,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
ve.dm.mwExample.MWTransclusion.blockData,
{ 'type': '/mwTransclusionBlock' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
ve.dm.mwExample.MWTransclusion.blockStoreItems
],
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': ve.dm.mwExample.MWTransclusion.blockOpen + ve.dm.mwExample.MWTransclusion.blockContent
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'mw:Transclusion (block level - modified)': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.blockOpen + ve.dm.mwExample.MWTransclusion.blockContent,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
ve.dm.mwExample.MWTransclusion.blockData,
{ 'type': '/mwTransclusionBlock' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
ve.dm.mwExample.MWTransclusion.blockStoreItems
],
'modify': function ( data ) {
data[0].attributes.mw.params['1'].wt = 'Hello, globe!';
},
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': ve.dm.mwExample.MWTransclusion.blockOpenModified
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'mw:Transclusion (inline)': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.inlineOpen + ve.dm.mwExample.MWTransclusion.inlineContent + ve.dm.mwExample.MWTransclusion.inlineClose,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
ve.dm.mwExample.MWTransclusion.inlineData,
{ 'type': '/mwTransclusionInline' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
ve.dm.mwExample.MWTransclusion.inlineStoreItems
],
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': ve.dm.mwExample.MWTransclusion.inlineOpen + ve.dm.mwExample.MWTransclusion.inlineContent + ve.dm.mwExample.MWTransclusion.inlineClose
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'mw:Transclusion (inline - modified)': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.inlineOpen + ve.dm.mwExample.MWTransclusion.inlineContent + ve.dm.mwExample.MWTransclusion.inlineClose,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
ve.dm.mwExample.MWTransclusion.inlineData,
{ 'type': '/mwTransclusionInline' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
ve.dm.mwExample.MWTransclusion.inlineStoreItems
],
'modify': function ( data ) {
data[1].attributes.mw.params['1'].wt = '5,678';
},
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': ve.dm.mwExample.MWTransclusion.inlineOpenModified + ve.dm.mwExample.MWTransclusion.inlineClose
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'two mw:Transclusion nodes with identical params but different htmlAttributes': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.pairOne + ve.dm.mwExample.MWTransclusion.pairTwo,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{
'type': 'mwTransclusionBlock',
'attributes': {
'mw': {
'params': { '1': { 'wt': 'foo' } }
},
'originalMw': '{"params":{"1":{"wt":"foo"}}}',
'originalDomElements': $( ve.dm.mwExample.MWTransclusion.pairOne ).toArray(),
'originalIndex': 0
},
'htmlAttributes': [
{
'values': {
'about': '#mwt1',
'data-mw': '{"params":{"1":{"wt":"foo"}}}',
'data-parsoid': '1',
'typeof': 'mw:Transclusion'
}
}
]
},
{ 'type': '/mwTransclusionBlock' },
{
'type': 'mwTransclusionBlock',
'attributes': {
'mw': {
'params': { '1': { 'wt': 'foo' } }
},
'originalMw': '{"params":{"1":{"wt":"foo"}}}',
'originalDomElements': $( ve.dm.mwExample.MWTransclusion.pairTwo ).toArray(),
'originalIndex': 0
},
'htmlAttributes': [
{
'values': {
'about': '#mwt2',
'data-mw': '{"params":{"1":{"wt":"foo"}}}',
'data-parsoid': '2',
'typeof': 'mw:Transclusion'
}
}
]
},
{ 'type': '/mwTransclusionBlock' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
{
Support previews and concurrent updates in ce.GeneratedContentNode GeneratedContentNode didn't track concurrent updates at all, so a race condition was possible: if the node was updated a second time before the first update had been rendered, the second update might render first and then be overwritten by the other one. To prevent this, we track the promise associated with the current render. If a new update is launched while a previous one is still pending we attempt to abort the old one by calling .abort() on it, and ignore any future resolution or rejection from it. Also allow rerenders based on non-model data by calling .update( { config object } ); Change-Id: I8feefd9e8fb6c41d06b8b20131e3be5e37954e83
2013-08-03 23:05:51 +00:00
'hash': '[{"mw":{"params":{"1":{"wt":"foo"}}},"type":"mwTransclusionBlock"},null]',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'value': $( '<p about="#mwt1" typeof="mw:Transclusion" data-mw="{&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;foo&quot;}}}" data-parsoid="1">foo</p>' ).toArray()
}
]
},
Handle meta-only transclusions as meta items To achieve this we need to evaluate the DOM contents of transclusion nodes to see if it consists solely of meta items and whitespace. To check for meta items we do a model registry match, but with an additional parameter to exclude mwTransclusion types as a possible result (as the first item may be a meta tag, but with a mw:Transclusion typeof attribute). Bug: 51322 Change-Id: I89a220350fb7e10e15f3682d21438539196a5846
2013-07-23 13:35:26 +00:00
'mw:Transclusion containing only meta data': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.meta,
Handle meta-only transclusions as meta items To achieve this we need to evaluate the DOM contents of transclusion nodes to see if it consists solely of meta items and whitespace. To check for meta items we do a model registry match, but with an additional parameter to exclude mwTransclusion types as a possible result (as the first item may be a meta tag, but with a mw:Transclusion typeof attribute). Bug: 51322 Change-Id: I89a220350fb7e10e15f3682d21438539196a5846
2013-07-23 13:35:26 +00:00
'data': [
{
'type': 'mwTransclusionMeta',
'attributes': {
'domElements': $( ve.dm.mwExample.MWTransclusion.meta ).toArray()
}
},
{ 'type': '/mwTransclusionMeta' },
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'mw:Reference': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
// Wikitext:
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
// Foo<ref name="bar" /> Baz<ref group="g1" name=":0">Quux</ref> Whee<ref name="bar">[[Bar]]</ref> Yay<ref group="g1">No name</ref> Quux<ref name="bar">Different content</ref> Foo<ref group="g1">No name</ref> Bar<ref name="foo" />
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
// <references><ref name="foo">Ref in refs</ref></references>
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body':
'<p>Foo' +
'<span about="#mwt1" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" id="cite_ref-bar-1-0" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'<a href="#cite_note-bar-1">[1]</a>' +
'</span>' +
' Baz' +
'<span about="#mwt2" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Quux&quot;},&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;,&quot;name&quot;:&quot;:0&quot;}}" id="cite_ref-quux-2-0" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'</span>' +
' Whee' +
'<span about="#mwt3" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;' +
'<a rel=\\&quot;mw:WikiLink\\&quot; href=\\&quot;./Bar\\&quot;>Bar' +
'</a>&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" id="cite_ref-bar-1-1" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'</span>' +
' Yay' +
'<span about="#mwt4" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;No name&quot;},&quot;attrs&quot;:{&quot;group&quot;:&quot;g1&quot;}}" id="cite_ref-1-0" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'</span>' +
' Quux' +
'<span about="#mwt5" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Different content&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;bar&quot;}}" id="cite_ref-bar-1-2" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'</span>' +
' Foo' +
'<span about="#mwt6" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;attrs&quot;:{&quot;name&quot;:&quot;foo&quot;}}" ' +
'id="cite_ref-foo-3-0" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'</span>' +
'</p>' +
ve.dm.mwExample.MWReference.referenceList,
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'head': '<base href="http://example.com" />',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
'F', 'o', 'o',
{
'type': 'mwReference',
'attributes': {
'listIndex': 0,
'listGroup': 'mwReference/',
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'refGroup': '',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'mw': { 'name': 'ref', 'attrs': { 'name': 'bar' } },
'originalMw': '{"name":"ref","attrs":{"name":"bar"}}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'childDomElements': $( '<a href="#cite_note-bar-1">[1]</a>' ).toArray(),
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'contentsUsed': false
},
'htmlAttributes': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'about': '#mwt1',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'class': 'reference',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'data-mw': '{"name":"ref","attrs":{"name":"bar"}}',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data-parsoid': '{}',
'id': 'cite_ref-bar-1-0',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'rel': 'dc:references',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'typeof': 'mw:Extension/ref'
},
'children': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'href': '#cite_note-bar-1'
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
},
'computed': {
'href': 'http://example.com/#cite_note-bar-1'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
}
]
}
]
},
{ 'type': '/mwReference' },
' ', 'B', 'a', 'z',
{
'type': 'mwReference',
'attributes': {
'listIndex': 1,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listGroup': 'mwReference/g1',
'listKey': 'literal/:0',
'refGroup': 'g1',
'mw': { 'name': 'ref', 'body': { 'html': 'Quux' }, 'attrs': { 'group': 'g1', 'name': ':0' } },
'originalMw': '{"name":"ref","body":{"html":"Quux"},"attrs":{"group":"g1","name":":0"}}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'childDomElements': [],
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'contentsUsed': true
},
'htmlAttributes': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'about': '#mwt2',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'class': 'reference',
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'data-mw': '{"name":"ref","body":{"html":"Quux"},"attrs":{"group":"g1","name":":0"}}',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data-parsoid': '{}',
'id': 'cite_ref-quux-2-0',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'rel': 'dc:references',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'typeof': 'mw:Extension/ref'
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
}
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
]
},
{ 'type': '/mwReference' },
' ', 'W', 'h', 'e', 'e',
{
'type': 'mwReference',
'attributes': {
'listIndex': 0,
'listGroup': 'mwReference/',
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'refGroup': '',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'mw': { 'name': 'ref', 'body': { 'html': '<a rel="mw:WikiLink" href="./Bar">Bar</a>' }, 'attrs': { 'name': 'bar' } },
'originalMw': '{"name":"ref","body":{"html":"<a rel=\\"mw:WikiLink\\" href=\\"./Bar\\">Bar</a>"},"attrs":{"name":"bar"}}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'childDomElements': [],
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'contentsUsed': true
},
'htmlAttributes': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'about': '#mwt3',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'class': 'reference',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'data-mw': '{"name":"ref","body":{"html":"<a rel=\\"mw:WikiLink\\" href=\\"./Bar\\">Bar</a>"},"attrs":{"name":"bar"}}',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data-parsoid': '{}',
'id': 'cite_ref-bar-1-1',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'rel': 'dc:references',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'typeof': 'mw:Extension/ref'
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
}
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
]
},
{ 'type': '/mwReference' },
' ', 'Y', 'a', 'y',
{
'type': 'mwReference',
'attributes': {
'listIndex': 2,
'listGroup': 'mwReference/g1',
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'auto/0',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'refGroup': 'g1',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'mw': { 'name': 'ref', 'body': { 'html': 'No name' }, 'attrs': { 'group': 'g1' } },
'originalMw': '{"name":"ref","body":{"html":"No name"},"attrs":{"group":"g1"}}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'childDomElements': [],
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'contentsUsed': true
},
'htmlAttributes': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'about': '#mwt4',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'class': 'reference',
Reference insertion, new and existing Objectives: * Split reference dialog (at least for now) an edit and an insert dialog * Add reference search widget for selecting an existing source, or choosing to add a new one * Abstract reference names, don't allow editing them and generate them when needed * When editing groups, move the internal item and update all references to it * Resolve name conflicts when moving a reference to a new group by generating a new list key Bonus: * Add getNodeGroups method to internal list * Add getUniqueListKey method to internal list * Add destroy functionality to ce.node to release events and references Bug: 49733 Change-Id: Ib244ff6ad9b4cee1decfd9b9e1d3d4e9cdcfb78c
2013-06-27 23:17:59 +00:00
'data-mw': '{"name":"ref","body":{"html":"No name"},"attrs":{"group":"g1"}}',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data-parsoid': '{}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'id': 'cite_ref-1-0',
'rel': 'dc:references',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'typeof': 'mw:Extension/ref'
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
}
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
]
},
{ 'type': '/mwReference' },
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
' ', 'Q', 'u', 'u', 'x',
{
'type': 'mwReference',
'attributes': {
'listIndex': 0,
'listGroup': 'mwReference/',
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/bar',
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
'refGroup': '',
'mw': { 'name': 'ref', 'body': { 'html': 'Different content' }, 'attrs': { 'name': 'bar' } },
'originalMw': '{"name":"ref","body":{"html":"Different content"},"attrs":{"name":"bar"}}',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'childDomElements': [],
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
'contentsUsed': false
},
'htmlAttributes': [
{
'values': {
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'about': '#mwt5',
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"Different content"},"attrs":{"name":"bar"}}',
'data-parsoid': '{}',
'id': 'cite_ref-bar-1-2',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'rel': 'dc:references',
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
'typeof': 'mw:Extension/ref'
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
}
}
]
},
{ 'type': '/mwReference' },
' ', 'F', 'o', 'o',
{
'type': 'mwReference',
'attributes': {
'listGroup': 'mwReference/',
'listIndex': 3,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/foo',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'refGroup': '',
'mw': { 'name': 'ref', 'attrs': { 'name': 'foo' } },
'originalMw': '{"name":"ref","attrs":{"name":"foo"}}',
'childDomElements': [],
'contentsUsed': false
},
'htmlAttributes': [
{
'values': {
'about': '#mwt6',
'class': 'reference',
'data-mw': '{"name":"ref","attrs":{"name":"foo"}}',
'data-parsoid': '{}',
'id': 'cite_ref-foo-3-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
}
Preserve the contents of secondary reference definitions We currently change <ref name="foo">Foo</ref> ... <ref name="foo">Foo</ref> to <ref name="foo">Foo</ref> ... <ref name="foo" /> , because know that the second ref tag isn't canonical and so we blank it. Instead, we now preserve the contents of all ref tags that come after the canonical one. Change-Id: I45a51a879271890fe46c4184f1029f12d27af678
2013-06-30 08:43:56 +00:00
}
]
},
{ 'type': '/mwReference' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': '/paragraph' },
{
'type': 'mwReferenceList',
'attributes': {
'mw': {
'name': 'references',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'attrs': {},
'body': {
'extsrc': '<ref name="foo">Ref in refs</ref>',
'html': '<span about="#mwt8" class="reference" data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Ref in refs&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;foo&quot;}}" rel="dc:references" typeof="mw:Extension/ref"><a href="#cite_note-foo-3">[3]</a></span>'
}
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'originalMw': '{"name":"references","body":{"extsrc":"<ref name=\\"foo\\">Ref in refs</ref>","html":"<span about=\\"#mwt8\\" class=\\"reference\\" data-mw=\\"{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;html&quot;:&quot;Ref in refs&quot;},&quot;attrs&quot;:{&quot;name&quot;:&quot;foo&quot;}}\\" rel=\\"dc:references\\" typeof=\\"mw:Extension/ref\\"><a href=\\"#cite_note-foo-3\\">[3]</a></span>"},"attrs":{}}',
'domElements': $( ve.dm.mwExample.MWReference.referenceList ).toArray(),
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'listGroup': 'mwReference/',
'refGroup': ''
}
},
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
{
'type': 'mwReference',
'attributes': {
'childDomElements': $( '<a href="#cite_note-foo-3">[3]</a>' ).toArray(),
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 3,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'literal/foo',
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'mw': { 'name': 'ref', 'attrs': { 'name': 'foo' }, 'body': { 'html': 'Ref in refs' } },
'originalMw': '{"name":"ref","body":{"html":"Ref in refs"},"attrs":{"name":"foo"}}',
'refGroup': ''
},
'htmlAttributes': [ {
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'children': [
{
'values': {
'href': '#cite_note-foo-3'
},
'computed': {
'href': 'http://example.com/#cite_note-foo-3'
}
}
],
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
'values': {
'about': '#mwt8',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"Ref in refs"},"attrs":{"name":"foo"}}',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
}
} ]
},
{ 'type': '/mwReference' },
{ 'type': '/paragraph' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': '/mwReferenceList' },
{ 'type': 'internalList' },
{ 'type': 'internalItem' },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
[
'B',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'a',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'r',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'Q', 'u', 'u', 'x',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
{ 'type': 'internalItem' },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'N', 'o', ' ', 'n', 'a', 'm', 'e',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
Ref in references support When we encounter a ref tag inside the mw-data of a references tag, we pass it off to the converter and store it as nested data. In toDomElements we convert any nested children and write them back to mw-data if changed. As refs in references are invisible we exclude them when generating the references list in ve.ce.MWReferenceListNode. Bug: 51741 Change-Id: I31d06616849a00449df0fc77f3b33e46207cdc7f
2013-07-25 17:11:50 +00:00
{ 'type': 'internalItem' },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'R', 'e', 'f', ' ', 'i', 'n', ' ', 'r', 'e', 'f', 's',
{ 'type': '/paragraph' },
{ 'type': '/internalItem' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': '/internalList' }
]
},
'mw:Reference with metadata': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p><span about="#mwt2" class="reference" ' +
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data-mw="{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:' +
'{&quot;html&quot;:&quot;Foo<!-- bar -->&quot;},&quot;attrs&quot;:{}}" ' +
'id="cite_ref-1-0" rel="dc:references" typeof="mw:Extension/ref" data-parsoid="{}">' +
'<a href="#cite_note-bar-1" data-parsoid="{}">[1]</a></span></p>',
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'head': '<base href="http://example.com" />',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
{
'type': 'mwReference',
'attributes': {
'contentsUsed': true,
'listGroup': 'mwReference/',
'listIndex': 0,
Prevent naming collisions when generating unique reference names Simply generating ':3' as the "unique" name for the 4th reference doesn't work. Even if getUniqueListKey() had been used, that only checks for conflicts with names that have already been encountered (i.e. occur in <ref> tags that precede the current one), not for conflicts with names that first occur further down in the document. The solution is to generate names at serialization time, when we have full knowledge of which names are in use. Internally, we use 'literal/<name>' for names that literally appeared in the source, and 'auto/<number>' for unnamed references. Then at serialization time, we translate 'auto/<number>' to 'literal/:<number>' if needed (i.e. if the reference was reused). ve.dm.MWReferenceNode.js: * toDataElement() ** Prefix listKey with literal/ or auto/ as appropriate * toDomElements() ** Map auto/ listKeys to unique names ** Don't try to unset the name if not present (was unsetting a property that didn't exist anyway) ve.dm.InternalList.js: * Remove now-unused isUniqueListKey() * Rewrite getUniqueListKey() ** Make prefix configurable ** Take previously generated unique keys into account ** Map the same old key (auto/N) to the same generated key (literal/:M) * Add getNextUniqueNumber() as a source for auto/N numbers: previously used the length of the itemHtmlQueue, but that only works during conversion, not from the UI dialog ve.ui.MWReferenceDialog.js: * For new references or conflicting names, generate an auto/N key and let toDomElements() deal with actually mapping that to name ve.dm.InternalList.test.js: * Rename listKeys to new style * Split the test case into two groups so we can test multi-group cases * Add tests for getUniqueListKey() ve.dm.mwExample.js: * Rename things to new style * Modify the test case so it attempts to trigger bug 54341 Bug: 54341 Change-Id: I726fb83e6fb66ffec643d996768a854ec9474b3d
2013-09-19 22:57:08 +00:00
'listKey': 'auto/0',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'mw': {
'attrs': {},
'body': {
'html': 'Foo<!-- bar -->'
},
'name': 'ref'
},
'originalMw': '{"name":"ref","body":{"html":"Foo<!-- bar -->"},"attrs":{}}',
'childDomElements': $( '<a href="#cite_note-bar-1" data-parsoid="{}">[1]</a>' ).toArray(),
'refGroup': ''
},
'htmlAttributes': [
{
'values': {
'about': '#mwt2',
'class': 'reference',
'data-mw': '{"name":"ref","body":{"html":"Foo<!-- bar -->"},"attrs":{}}',
'data-parsoid': '{}',
'id': 'cite_ref-1-0',
'rel': 'dc:references',
'typeof': 'mw:Extension/ref'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'children': [
{
'values': {
'data-parsoid': '{}',
'href': '#cite_note-bar-1'
},
'computed': {
'href': 'http://example.com/#cite_note-bar-1'
} } ]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
]
},
{ 'type': '/mwReference' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': 'internalItem' },
{
'internal': {
'generated': 'wrapper'
},
'type': 'paragraph'
},
'F', 'o', 'o',
{ 'type': '/paragraph' },
{
'type': 'alienMeta',
'attributes': {
'domElements': $( '<!-- bar -->' ).toArray()
}
},
{ 'type': '/alienMeta' },
{ 'type': '/internalItem' },
{ 'type': '/internalList' }
]
},
'internal link with ./ and ../': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p><a rel="mw:WikiLink" href="./../../../Foo/Bar">Foo</a></p>',
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'head': '<base href="http://example.com/one/two/three/four/five" />',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
[
'F',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Foo/Bar',
'origTitle': 'Foo/Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Foo/Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './../../../'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './../../../Foo/Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/one/Foo/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'o',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Foo/Bar',
'origTitle': 'Foo/Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Foo/Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './../../../'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './../../../Foo/Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/one/Foo/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'o',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Foo/Bar',
'origTitle': 'Foo/Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Foo/Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './../../../'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './../../../Foo/Bar',
'rel': 'mw:WikiLink'
},
'computed': {
'href': 'http://example.com/one/Foo/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
Support external links in MWInternalLinkAnnotation As URLs from the clipboard are always absolute, we need to detect if these are from the same wiki as the current document, and if so convert back to relative for Parsoid. Bug: 58136 Change-Id: Id251afe65193fc6356628f1deb5ed757f8a6d347
2014-01-06 13:56:55 +00:00
'internal link with absolute path': {
'body': '<p>' + ve.dm.mwExample.MWInternalLink.absoluteOpen + 'Foo</a></p>',
'data': [
{ 'type': 'paragraph' },
[
'F',
[ ve.dm.mwExample.MWInternalLink.absoluteData ]
],
[
'o',
[ ve.dm.mwExample.MWInternalLink.absoluteData ]
],
[
'o',
[ ve.dm.mwExample.MWInternalLink.absoluteData ]
],
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'normalizedBody': '<p><a rel="mw:WikiLink" href="Foo/Bar">Foo</a></p>',
'mwConfig': {
'wgArticlePath': '/wiki/$1'
}
},
Add a node type for numbered external links Since I0f0a826c in Parsoid, numbered external links are now empty <a rel="mw:ExtLink"></a> tags. This means we have to put in a node type for them to prevent them from being considered empty annotations and getting converted to alienMeta. MWNumberedExternalLinkNode is protected and focusable to avoid making the link text (which isn't editable) clickable. It isn't inspectable yet, we need to work on that. Bug: 53505 Change-Id: I83f69695f3974089e51a84e799f31ab6ed879e05
2013-10-17 20:15:36 +00:00
'numbered external link (empty mw:Extlink)': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p>Foo<a rel="mw:ExtLink" href="http://www.example.com"></a>Bar</p>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
Add a node type for numbered external links Since I0f0a826c in Parsoid, numbered external links are now empty <a rel="mw:ExtLink"></a> tags. This means we have to put in a node type for them to prevent them from being considered empty annotations and getting converted to alienMeta. MWNumberedExternalLinkNode is protected and focusable to avoid making the link text (which isn't editable) clickable. It isn't inspectable yet, we need to work on that. Bug: 53505 Change-Id: I83f69695f3974089e51a84e799f31ab6ed879e05
2013-10-17 20:15:36 +00:00
'F', 'o', 'o',
{
'type': 'link/mwNumberedExternal',
'attributes': {
'href': 'http://www.example.com'
},
'htmlAttributes': [ {
'values': {
'href': 'http://www.example.com',
'rel': 'mw:ExtLink'
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
},
'computed': {
'href': 'http://www.example.com/'
Add a node type for numbered external links Since I0f0a826c in Parsoid, numbered external links are now empty <a rel="mw:ExtLink"></a> tags. This means we have to put in a node type for them to prevent them from being considered empty annotations and getting converted to alienMeta. MWNumberedExternalLinkNode is protected and focusable to avoid making the link text (which isn't editable) clickable. It isn't inspectable yet, we need to work on that. Bug: 53505 Change-Id: I83f69695f3974089e51a84e799f31ab6ed879e05
2013-10-17 20:15:36 +00:00
}
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
Add a node type for numbered external links Since I0f0a826c in Parsoid, numbered external links are now empty <a rel="mw:ExtLink"></a> tags. This means we have to put in a node type for them to prevent them from being considered empty annotations and getting converted to alienMeta. MWNumberedExternalLinkNode is protected and focusable to avoid making the link text (which isn't editable) clickable. It isn't inspectable yet, we need to work on that. Bug: 53505 Change-Id: I83f69695f3974089e51a84e799f31ab6ed879e05
2013-10-17 20:15:36 +00:00
},
{ 'type': '/link/mwNumberedExternal' },
'B', 'a', 'r',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'URL link': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p><a rel="mw:ExtLink" href="http://www.mediawiki.org/">mw</a></p>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
[
'm',
[ {
'type': 'link/mwExternal',
'attributes': {
'href': 'http://www.mediawiki.org/',
Drop mw:ExtLink/URL support Because Parsoid has. Bug: 50734 Change-Id: Id2c893467c5063cc29cd9a91203406b86a3abfbe
2013-07-04 11:18:18 +00:00
'rel': 'mw:ExtLink'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': 'http://www.mediawiki.org/',
'rel': 'mw:ExtLink'
},
'computed': {
'href': 'http://www.mediawiki.org/'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'w',
[ {
'type': 'link/mwExternal',
'attributes': {
'href': 'http://www.mediawiki.org/',
Drop mw:ExtLink/URL support Because Parsoid has. Bug: 50734 Change-Id: Id2c893467c5063cc29cd9a91203406b86a3abfbe
2013-07-04 11:18:18 +00:00
'rel': 'mw:ExtLink'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': 'http://www.mediawiki.org/',
'rel': 'mw:ExtLink'
},
'computed': {
'href': 'http://www.mediawiki.org/'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'whitespace preservation with wrapped comments and language links': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': 'Foo\n' +
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'<link rel="mw:PageProp/Language" href="http://de.wikipedia.org/wiki/Foo">\n' +
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'<link rel="mw:PageProp/Language" href="http://fr.wikipedia.org/wiki/Foo">',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{
'type': 'paragraph',
'internal': {
'generated': 'wrapper',
'whitespace': [ undefined, undefined, undefined, '\n' ]
}
},
'F',
'o',
'o',
{ 'type': '/paragraph' },
{
'type': 'mwLanguage',
'attributes': {
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'href': 'http://de.wikipedia.org/wiki/Foo'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': 'http://de.wikipedia.org/wiki/Foo',
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'rel': 'mw:PageProp/Language'
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
},
'computed': {
'href': 'http://de.wikipedia.org/wiki/Foo'
}
}
],
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'internal': { 'whitespace': [ '\n', undefined, undefined, '\n' ] }
},
{ 'type': '/mwLanguage' },
{
'type': 'mwLanguage',
'attributes': {
Revert "Revert "Remove dual-type support for Languages and Categories"" The Parsoid team says the cache is clean of old language / category types, and would like us to use the new types for newly generates languages/categories. This reverts commit d8dcafe25bf3c0ce1fb07b43bf3e8c97e1ba574d. Change-Id: I0cffd5d299624230f3805f9468b2497f392c12c0
2013-12-06 21:12:44 +00:00
'href': 'http://fr.wikipedia.org/wiki/Foo'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': 'http://fr.wikipedia.org/wiki/Foo',
'rel': 'mw:PageProp/Language'
},
'computed': {
'href': 'http://fr.wikipedia.org/wiki/Foo'
}
}
],
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'internal': { 'whitespace': [ '\n' ] }
},
{ 'type': '/mwLanguage' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'document with meta elements': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<!-- No content conversion --><meta property="mw:PageProp/nocc" /><p>Foo' +
Don't corrupt categories/langlinks with new types Parsoid changed these types from mw:WikiLink/{Category,Language} to mw:PageProp/{Category,Language} in I0f0a826c. We had previously added support for them in 4d91e4ed but code overwrote the new types with the old ones on the way out, triggering the DOM corruption warning. Change-Id: I768ec2ffd623e5a01f18959277786697603a97f0
2013-10-17 13:48:37 +00:00
'<link rel="mw:PageProp/Category" href="./Category:Bar" />Bar' +
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'<meta property="mw:foo" content="bar" />Ba<!-- inline -->z</p>' +
'<meta property="mw:bar" content="baz" /><!--barbaz-->' +
Don't corrupt categories/langlinks with new types Parsoid changed these types from mw:WikiLink/{Category,Language} to mw:PageProp/{Category,Language} in I0f0a826c. We had previously added support for them in 4d91e4ed but code overwrote the new types with the old ones on the way out, triggering the DOM corruption warning. Change-Id: I768ec2ffd623e5a01f18959277786697603a97f0
2013-10-17 13:48:37 +00:00
'<link rel="mw:PageProp/Category" href="./Category:Foo_foo#Bar baz%23quux" />' +
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'<meta typeof="mw:Placeholder" data-parsoid="foobar" />',
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'head': '<base href="http://example.com" />',
The great directory split of 2013 Move all MW-specific files into the ve-mw directory, in preparation for moving them out into a separate repo. All MW-specific files were moved into a parallel directory structure in modules/ve-mw . Files with both generic and MW-specific things were split up. Files in ve/init/mw/ were moved to ve-mw/init/ rather than ve-mw/init/mw ; they're still named ve.init.mw.* but we should change that. Some of the test files for core classes had MW-specific test cases, so those were split up and the test runner was duplicated; we should refactor our tests to use data providers so we can add cases more easily. Split files: * ve.ce.Node.css * ve.ce.ContentBranchNode.test.js (MWEntityNode) * ve.ce.Document.test.js (some core test cases genericized) * ve.dm.InternalList.test.js (uses mwReference test document) * ve.dm.SurfaceFragment.test.js, ve.ui.FormatAction.test.js ** Made core tests use heading instead of mwHeading ** Updated core tests because normal headings don't break out of lists ** Moved test runners into ve.test.utils.js * ve.ui.Icons-*.css * ve.ui.Dialog.css (MW parts into ve.ui.MWDialog.css) * ve.ui.Tool.css * ve.ui.Widget.css (move ve-ui-rtl and ve-ui-ltr to ve.ui.css) ve.dm.Converter.test.js: Moved runner functions into ve.test.utils.js ve.dm.example.js: * Refactored createExampleDocument so mwExample can use it * Removed wgExtensionAssetsPath detection, moved into mw-preload.js * Genericized withMeta example document (original version copied to mwExample) * Moved references example document to mwExample ve.dm.mwExample.js: * Move withMeta and references example documents from ve.dm.example.js * Add createExampleDocument function ve-mw/test/index.php: Runner for MW-specific tests only ve-mw/test/mw-preload.js: Sets VE_TESTDIR for Special:JavaScriptTest only ve.ui.Window.js: * Remove magic path interpolation in addLocalStyleSheets() * Pass full(er) paths to addLocalStyleSheets(), here and in subclasses ve.ui.MWDialog.js: Subclass of Dialog that adds MW versions of stylesheets ve.ui.MW*Dialog.js: * Subclass MWDialog rather than Dialog * Load both core and MW versions of stylesheets that have both ve.ui.PagedDialog.js: Converted to a mixin rather than an abstract base class * Don't inherit ve.ui.Dialog * Rather than overriding initialize(), provide initializePages() which the host class is supposed to call from its initialize() * Rename onOutlineSelect to onPageOutlineSelect ve.ui.MWMetaDialog.js, ve.ui.MWTransclusionDialog.js: * Use PagedDialog as a mixin rather than a base class, inherit MWDialog bullet-icon.png: Unused, deleted Stuff we should do later: * Refactor tests to use data providers * Write utility function for SVG compat check * Separate omnibus CSS files such as ve.ui.Widget.css * Separate omnibus RL modules * Use icon classes in ViewPageTarget Change-Id: I1b28f8ba7f2d2513e5c634927a854686fb9dd5a5
2013-07-03 01:30:10 +00:00
'data': ve.dm.mwExample.withMeta
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'RDFa types spread across two attributes, about grouping is forced': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWTransclusion.mixed,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
ve.dm.mwExample.MWTransclusion.mixedDataOpen,
ve.dm.mwExample.MWTransclusion.mixedDataClose,
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
],
'storeItems': [
ve.dm.mwExample.MWTransclusion.mixedStoreItems
]
},
'mw:Entity': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p>a<span typeof="mw:Entity">¢</span>b<span typeof="mw:Entity">¥</span><span typeof="mw:Entity">™</span></p>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph' },
'a',
{
'type': 'mwEntity',
'attributes': { 'character': '¢' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
'b',
{
'type': 'mwEntity',
'attributes': { 'character': '¥' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
{
'type': 'mwEntity',
'attributes': { 'character': '™' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'wrapping with mw:Entity': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': 'a<span typeof="mw:Entity">¢</span>b<span typeof="mw:Entity">¥</span><span typeof="mw:Entity">™</span>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
'a',
{
'type': 'mwEntity',
'attributes': { 'character': '¢' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
'b',
{
'type': 'mwEntity',
'attributes': { 'character': '¥' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
{
'type': 'mwEntity',
'attributes': { 'character': '™' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'whitespace preservation with mw:Entity': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<p> a <span typeof="mw:Entity"> </span> b <span typeof="mw:Entity">¥</span>\t<span typeof="mw:Entity">™</span></p>',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ' ] } },
'a',
' ',
' ',
{
'type': 'mwEntity',
'attributes': { 'character': ' ' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
' ',
' ',
' ',
'b',
' ',
' ',
' ',
' ',
{
'type': 'mwEntity',
'attributes': { 'character': '¥' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
'\t',
{
'type': 'mwEntity',
'attributes': { 'character': '™' },
'htmlAttributes': [ { 'values': { 'typeof': 'mw:Entity' } } ]
},
{ 'type': '/mwEntity' },
{ 'type': '/paragraph' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'category default sort key': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': '<meta property="mw:PageProp/categorydefaultsort" content="foo">',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{
'type': 'mwDefaultSort',
'attributes': {
'content': 'foo'
},
'htmlAttributes': [ { 'values': {
'content': 'foo',
'property': 'mw:PageProp/categorydefaultsort'
} } ]
},
{ 'type': '/mwDefaultSort' },
Extend empty document check to check for meta-only data An empty document is one which contains no 'real' data, so we should check for meta-only documents when deciding whether to add in a wrapper paragraph. Bug: 50289 Change-Id: Ib3ebf0717aa0c6c51fd1d0b14e95de50b2842647
2013-07-15 11:06:31 +00:00
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
{ 'type': '/paragraph' },
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
},
'thumb image': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.MWBlockImage.html,
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
'data': ve.dm.mwExample.MWBlockImage.data.concat( [
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
{ 'type': 'internalList' },
{ 'type': '/internalList' }
Prevent deletion of FocusableNodes from a collapsed selection Instead select the node and require the user to press delete again if they really meant to delete the node. Also test cases! Bug: 55336 Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
2013-10-05 10:27:39 +00:00
] )
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'attribute preservation does not crash due to text node split': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body':
'<figure typeof="mw:Image/Thumb" data-parsoid="{}">' +
'<a href="Foo" data-parsoid="{}">' +
'<img src="Bar" width="1" height="2" resource="FooBar" data-parsoid="{}">' +
'</a>' +
'<figcaption data-parsoid="{}">' +
' foo <a rel="mw:WikiLink" href="./Bar" data-parsoid="{}">bar</a> baz' +
'</figcaption>' +
'</figure>',
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'head': '<base href="http://example.com" />',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'data': [
{
'type': 'mwBlockImage',
'attributes': {
'type': 'thumb',
'align': 'default',
'href': 'Foo',
'src': 'Bar',
Convert MWBlockImage dimensions to numbers and update tests MWInlineImage already does this but it wasn't copied over to MWBlockImage. Change-Id: I9f34182b30ae72beb7b5c3d5fde2f08185cba663
2013-10-15 16:50:01 +00:00
'width': 1,
'height': 2,
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'resource': 'FooBar',
Fix class attribute preservation for images * Port the class preservation logic from BlockImage to InlineImage * Add preservation for unrecognized classes * Add the logic for collapsing spaces in the class attribute in more places Change-Id: I26faad7e00ab2f0a0f5d076552e56b32c692ae74
2013-06-28 00:24:05 +00:00
'originalClasses': undefined,
'unrecognizedClasses': []
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
},
'htmlAttributes': [ {
'values': { 'data-parsoid': '{}' },
'children': [
{
'values': { 'data-parsoid': '{}' },
'children': [ {
'values': { 'data-parsoid': '{}' }
} ]
},
{
'values': { 'data-parsoid': '{}' },
'children': [
{ 'values': { 'data-parsoid': '{}' } }
]
}
]
} ]
},
{ 'type': 'mwImageCaption', 'internal': { 'whitespace': [ undefined, ' ' ] } },
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper', 'whitespace': [ ' ' ] } },
'f', 'o', 'o', ' ',
[
'b',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink',
'data-parsoid': '{}'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'a',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink',
'data-parsoid': '{}'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
[
'r',
[ {
'type': 'link/mwInternal',
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
Fix comparison of MW internal links We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and we also need to some HTML attribute removal as links from Parsoid will have href and rel set (again, this should be fixed in by Parsoid when the do the merging at their end). Bug: 49985 Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
2013-06-26 13:56:59 +00:00
'normalizedTitle': 'Bar',
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
'hrefPrefix': './'
},
Resolve rendered URLs according to the provided <base> This is done by using the computed property value rather than the literal attribute value when rendering href and src attributes. Helpfully, this provides perfect URL resolution natively in the browser, which means the document's <base> is respected and all that good stuff. For GeneratedContentNodes, we also need to find all DOM elements inside the rendered DOM that have href or src attributes and resolve those. This is done in the new getRenderedDomElements() function, which the existing cleanup steps (remove <link>/<meta>/<style>, clone for correct document) were moved into. In order to make sure that the computed values are always computed correctly, we need to make sure that in cases where HTML strings in data-mw are parsed, they're parsed in the context of the correct document so the correct <base> is applied. We still need to solve this problem for models that actually store and edit an href or src as an attribute. I'll post more about that on bug 48915. Bug: 48915 Change-Id: Iaccb9e3fc05cd151a0f5e632c8d3bd3568735309
2013-09-26 02:07:22 +00:00
'htmlAttributes': [
{
'values': {
'href': './Bar',
'rel': 'mw:WikiLink',
'data-parsoid': '{}'
},
'computed': {
'href': 'http://example.com/Bar'
}
}
]
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
} ]
],
' ', 'b', 'a', 'z',
{ 'type': '/paragraph' },
{ 'type': '/mwImageCaption' },
{ 'type': '/mwBlockImage' },
{ 'type': 'internalList' },
{ 'type': '/internalList' }
]
Add a node class for mw:Nowiki These represent <nowiki> tags. If the user doesn't edit the text inside the nowiki, we round-trip the <span typeof="mw:Nowiki"> wrapper cleanly, but if they do edit it, we unwrap it. This then triggers re-escaping in Parsoid, and prevents cases where the user edits the text to no longer need escaping but Parsoid still wraps it in <nowiki> because of the <span typeof="mw:Nowiki"> wrapper. In order to detect whether the contents have changed, the nowiki annotation stores a copy of its contents. To avoid infinite recursion, we have to exclude this attribute for hash generation. Bug: 47678 Change-Id: I2edc46b6d87d2f91e952efcb09c0edae5166958f
2013-07-17 01:22:22 +00:00
},
'mw:Nowiki': {
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'body': ve.dm.mwExample.mwNowikiHtml,
Add a node class for mw:Nowiki These represent <nowiki> tags. If the user doesn't edit the text inside the nowiki, we round-trip the <span typeof="mw:Nowiki"> wrapper cleanly, but if they do edit it, we unwrap it. This then triggers re-escaping in Parsoid, and prevents cases where the user edits the text to no longer need escaping but Parsoid still wraps it in <nowiki> because of the <span typeof="mw:Nowiki"> wrapper. In order to detect whether the contents have changed, the nowiki annotation stores a copy of its contents. To avoid infinite recursion, we have to exclude this attribute for hash generation. Bug: 47678 Change-Id: I2edc46b6d87d2f91e952efcb09c0edae5166958f
2013-07-17 01:22:22 +00:00
'data': ve.dm.mwExample.mwNowiki
},
'mw:Nowiki unwraps when text modified': {
'data': ve.dm.mwExample.mwNowiki,
'modify': function ( data ) {
data[7][0] = 'z';
},
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': '<p>Foo[[Bzr]]Baz</p>'
Add a node class for mw:Nowiki These represent <nowiki> tags. If the user doesn't edit the text inside the nowiki, we round-trip the <span typeof="mw:Nowiki"> wrapper cleanly, but if they do edit it, we unwrap it. This then triggers re-escaping in Parsoid, and prevents cases where the user edits the text to no longer need escaping but Parsoid still wraps it in <nowiki> because of the <span typeof="mw:Nowiki"> wrapper. In order to detect whether the contents have changed, the nowiki annotation stores a copy of its contents. To avoid infinite recursion, we have to exclude this attribute for hash generation. Bug: 47678 Change-Id: I2edc46b6d87d2f91e952efcb09c0edae5166958f
2013-07-17 01:22:22 +00:00
},
'mw:Nowiki unwraps when annotations modified': {
'data': ve.dm.mwExample.mwNowiki,
'modify': function ( data ) {
data[7][1].push( ve.dm.example.bold );
},
Rename 'html' to 'body' in converter tests Because that's what it is now since 'head' was added. Also removed the wrapping <body> tag (now added by the test runner) and renamed normalizedHtml to normalizedBody. Change-Id: I5624ae076c5e661d2789e499cd28e8282c885409
2013-10-18 21:27:25 +00:00
'normalizedBody': '<p>Foo[[B<b>a</b>r]]Baz</p>'
Separate out MW specific converter tests They are only run in the MW test runner, where the MW dependencies are available. Create a ve.test namespace for storing shared test runners. Change-Id: I079cb18b1c73614d25a12c5d6afcf0700469e52e
2013-06-26 21:18:39 +00:00
}
};
Reference in a new issue Copy permalink