Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67896
Change subject: Remove Parsoid hack and fix new references.
......................................................................
Remove Parsoid hack and fix new references.
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
---
M modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
2 files changed, 3 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/96/67896/1
diff --git a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
index 71fecd0..0a16b8e 100644
--- a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
@@ -78,7 +78,8 @@
mwAttr = ve.copyObject( dataElement.attributes.mw ) || {};
- setContents = dataElement.attributes.contentsUsed;
+ setContents = dataElement.attributes.contentsUsed ||
+ dataElement.attributes.listKey === null;
if ( !setContents ) {
// Check if any other nodes with this key provided content. If
not
diff --git a/modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
index a6f3ab4..56c8919 100644
--- a/modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -145,16 +145,7 @@
'listGroup': 'mwReference/' +
groupName,
'listKey': key,
'refGroup': groupName
- },
- //TODO: remove these htmlAttributes
once fixed in Parsoid
- 'htmlAttributes': [
- {
- 'keys': [
'data-parsoid' ],
- 'values': {
- 'data-parsoid':
'{"src":""}'
- }
- }
- ]
+ }
},
{ 'type': '/mwReference' }
] );
--
To view, visit https://gerrit.wikimedia.org/r/67896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia42907feb8f64637189eba15139177c7eb5e8899
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
