Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60938
Change subject: Revert "Hack to escape angle brackets in data-parsoid attribute"
......................................................................
Revert "Hack to escape angle brackets in data-parsoid attribute"
VERY VERY temporary hack that needs to go die in a fire now
This reverts commit bdb4a116d96bcc94884d5f257fdcd7838a275531.
Change-Id: Ie3f12b5fea9dc7eda92c16ed66fb44e07135a5c4
---
M VisualEditor.php
M modules/ve/dm/nodes/ve.dm.AlienNode.js
2 files changed, 5 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/38/60938/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 4591a0e..df34f48 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -279,6 +279,8 @@
've/dm/nodes/ve.dm.MWEntityNode.js',
've/dm/nodes/ve.dm.MWHeadingNode.js',
've/dm/nodes/ve.dm.MWPreformattedNode.js',
+ 've/dm/nodes/ve.dm.MWReferenceListNode.js',
+ 've/dm/nodes/ve.dm.MWReferenceNode.js',
've/dm/annotations/ve.dm.LinkAnnotation.js',
've/dm/annotations/ve.dm.MWExternalLinkAnnotation.js',
@@ -332,6 +334,8 @@
've/ce/nodes/ve.ce.MWEntityNode.js',
've/ce/nodes/ve.ce.MWHeadingNode.js',
've/ce/nodes/ve.ce.MWPreformattedNode.js',
+ 've/ce/nodes/ve.ce.MWReferenceListNode.js',
+ 've/ce/nodes/ve.ce.MWReferenceNode.js',
've/ce/annotations/ve.ce.LinkAnnotation.js',
've/ce/annotations/ve.ce.MWExternalLinkAnnotation.js',
@@ -489,13 +493,9 @@
'scripts' => array(
've/dm/nodes/ve.dm.MWInlineImageNode.js',
've/dm/nodes/ve.dm.MWTemplateNode.js',
- 've/dm/nodes/ve.dm.MWReferenceListNode.js',
- 've/dm/nodes/ve.dm.MWReferenceNode.js',
've/ce/nodes/ve.ce.MWInlineImageNode.js',
've/ce/nodes/ve.ce.MWTemplateNode.js',
- 've/ce/nodes/ve.ce.MWReferenceListNode.js',
- 've/ce/nodes/ve.ce.MWReferenceNode.js',
),
'dependencies' => array(
'ext.visualEditor.core',
diff --git a/modules/ve/dm/nodes/ve.dm.AlienNode.js
b/modules/ve/dm/nodes/ve.dm.AlienNode.js
index a17b29a..7275c88 100644
--- a/modules/ve/dm/nodes/ve.dm.AlienNode.js
+++ b/modules/ve/dm/nodes/ve.dm.AlienNode.js
@@ -48,19 +48,7 @@
ve.dm.AlienNode.static.toDomElements = function ( dataElement, doc ) {
var wrapper = doc.createElement( 'div' );
-
- // Filthy hack: Parsoid is currently sending us unescaped angle brackets
- // inside data-parsoid. For some reason FF picks this up as html and
tries
- // to sanitise it, converting <ref/> to <ref></span> (!?).
- // As a *very temporary* fix we can regex replace them here.
- $( wrapper ).html(
- dataElement.attributes.html.replace(
- /data-parsoid="([^"]+)"/g,
- function( r0, r1 ) {
- return 'data-parsoid="' + r1.replace( /</g,
'<' ).replace( />/g, '>' ) + '"';
- }
- )
- );
+ $( wrapper ).html( dataElement.attributes.html );
// Convert wrapper.children to an array
return Array.prototype.slice.call( wrapper.childNodes, 0 );
};
--
To view, visit https://gerrit.wikimedia.org/r/60938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3f12b5fea9dc7eda92c16ed66fb44e07135a5c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
