Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267287
Change subject: MWTable: use new sanitization method
......................................................................
MWTable: use new sanitization method
This prevents tables from getting sanitized even on
VE to VE copy. Also by calling ClassAttributeNode sanitize
extra CSS classes are removed.
Bug: T97462
Bug: T125220
Depends-On: Ia3ce386b2a03bc227818b10423bca72c736c0656
Change-Id: Ifd91e00b40665b446bbdcdf8859d2bb641bc0e67
---
M modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/87/267287/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
index 88d636f..2f0031e 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTableNode.js
@@ -51,11 +51,6 @@
this.setClassAttributes( attributes, classAttr );
- // Default to wikitable when pasting
- if ( converter.isFromClipboard() ) {
- attributes.wikitable = true;
- }
-
if ( !ve.isEmptyObject( attributes ) ) {
dataElement.attributes = attributes;
}
@@ -73,6 +68,13 @@
return [ element ];
};
+ve.dm.MWTableNode.static.sanitize = function ( dataElement ) {
+ // Mixin method
+ ve.dm.ClassAttributeNode.static.sanitize.call( this, dataElement );
+
+ ve.setProp( dataElement, 'attributes', 'wikitable', true );
+};
+
/* Registration */
ve.dm.modelRegistry.register( ve.dm.MWTableNode );
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index ea01957..a3624c4 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -113,7 +113,8 @@
// Nodes
'div', 'alienInline', 'alienBlock', 'comment'
],
- removeOriginalDomElements: true
+ removeOriginalDomElements: true,
+ nodeSanitization: true
},
all: null
};
--
To view, visit https://gerrit.wikimedia.org/r/267287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd91e00b40665b446bbdcdf8859d2bb641bc0e67
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
