DLynch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405759 )

Change subject: MWWikitextStringTransferHandler: Perform Parsoid cleanup on 
result
......................................................................

MWWikitextStringTransferHandler: Perform Parsoid cleanup on result

Parsoid markup delivered as a result of a paste was being handled differently.

Bug: T183173
Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55
---
M 
modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
M modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/59/405759/1

diff --git 
a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
 
b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
index d913356..e9b9c8c 100644
--- 
a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
+++ 
b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
@@ -176,6 +176,21 @@
                                ]
                        },
                        {
+                               msg: 'Headings, parsoid fallback ids don\'t 
interfere with whitespace stripping',
+                               pasteString: '== Tudnivalók ==',
+                               pasteType: 'text/plain',
+                               parsoidResponse: '<h2 id="Tudnivalók"><span 
id="Tudnival.C3.B3k" typeof="mw:FallbackId"></span> Tudnivalók </h2>',
+                               annotations: [],
+                               assertDom: true,
+                               expectedData: [
+                                       { type: 'mwHeading', attributes: { 
level: 2 }, originalDomElements: $( '<h2 id="Tudnivalók"> Tudnivalók </h2>' 
).toArray() },
+                                       'T', 'u', 'd', 'n', 'i', 'v', 'a', 'l', 
'ó', 'k',
+                                       { type: '/mwHeading' },
+                                       { type: 'internalList' },
+                                       { type: '/internalList' }
+                               ]
+                       },
+                       {
                                msg: 'Magic link (RFC)',
                                pasteString: 'RFC 1234',
                                pasteType: 'text/plain',
diff --git 
a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
 
b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
index 10aedba..2929f4d 100644
--- 
a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
+++ 
b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
@@ -128,6 +128,11 @@
                        }
                }
 
+               // Strip Parsoid sections
+               ve.unwrapParsoidSections( htmlDoc.body );
+               // Strip legacy IDs, for example in section headings
+               ve.stripParsoidFallbackIds( htmlDoc.body );
+
                // Pass an empty object for the second argument (importRules) 
so that clipboard mode is used
                // TODO: Fix that API
                doc = handler.surface.getModel().getDocument().newFromHtml( 
htmlDoc, {} );

-- 
To view, visit https://gerrit.wikimedia.org/r/405759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to