wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 10:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Parsoid hack and fix new references.

Browse source 
Now that I797b2bd87 is in we can remove the data-parsoid hack
for new references. Also fix the converter to always insert content
for keyless references.

Change-Id: Ia42907feb8f64637189eba15139177c7eb5e8899
This commit is contained in:
Ed Sanders 2013-06-10 23:01:17 +01:00
parent 8039b1c2f8
commit e67b4030f3
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
View file

@ -78,7 +78,8 @@ ve.dm.MWReferenceNode.static.toDomElements = function ( dataElement, doc, conver
mwAttr = ve.copyObject( dataElement.attributes.mw ) || {}; mwAttr = ve.copyObject( dataElement.attributes.mw ) || {};
setContents = dataElement.attributes.contentsUsed; setContents = dataElement.attributes.contentsUsed ||
dataElement.attributes.listKey === null;
if ( !setContents ) { if ( !setContents ) {
// Check if any other nodes with this key provided content. If not // Check if any other nodes with this key provided content. If not

9
modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
View file

@ -145,16 +145,7 @@ ve.ui.MWReferenceDialog.prototype.onClose = function ( action ) {
'listGroup': 'mwReference/' + groupName, 'listGroup': 'mwReference/' + groupName,
'listKey': key, 'listKey': key,
'refGroup': groupName 'refGroup': groupName
},
//TODO: remove these htmlAttributes once fixed in Parsoid
'htmlAttributes': [
{
'keys': [ 'data-parsoid' ],
'values': {
'data-parsoid': '{"src":""}'
} }
}
]
}, },
{ 'type': '/mwReference' } { 'type': '/mwReference' }
] ); ] );