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

ve.dm.Node: blacklistedAnnotationTypes -> disallowedAnnotationTypes

Browse source 
Pulls through I69bea8829091b72f52e8486f7171d70e3194c6ef

Bug: T254646
Change-Id: Ibe880de0436e58416a857756d45fa4dc194196b1
This commit is contained in:
Ed Sanders 2020-06-10 12:15:18 +01:00 committed by James D. Forrester
parent 980e25f2e7
commit 310b4d6e4c
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
View file

@ -54,7 +54,7 @@ ve.dm.MWBlockImageNode.static.childNodeTypes = [ 'mwImageCaption' ];
ve.dm.MWBlockImageNode.static.matchTagNames = [ 'figure' ];
ve.dm.MWBlockImageNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWBlockImageNode.static.disallowedAnnotationTypes = [ 'link' ];
ve.dm.MWBlockImageNode.static.classAttributes = {
'mw-image-border': { borderImage: true },

2
modules/ve-mw/dm/nodes/ve.dm.MWGalleryNode.js
View file

@ -39,7 +39,7 @@ ve.dm.MWGalleryNode.static.matchTagNames = [ 'ul' ];
ve.dm.MWGalleryNode.static.childNodeTypes = [ 'mwGalleryCaption', 'mwGalleryImage' ];
ve.dm.MWGalleryNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWGalleryNode.static.disallowedAnnotationTypes = [ 'link' ];
ve.dm.MWGalleryNode.static.cloneElement = function () {
// Parent method

2
modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
View file

@ -48,7 +48,7 @@ ve.dm.MWInlineImageNode.static.preserveHtmlAttributes = function ( attribute ) {
// be safe to remove when verion 1.5 content is no longer acceptable.
ve.dm.MWInlineImageNode.static.matchTagNames = [ 'span', 'figure-inline' ];
ve.dm.MWInlineImageNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWInlineImageNode.static.disallowedAnnotationTypes = [ 'link' ];
ve.dm.MWInlineImageNode.static.toDataElement = function ( domElements, converter ) {
var dataElement, attributes, types,

2
modules/ve-mw/dm/nodes/ve.dm.MWMagicLinkNode.js
View file

@ -39,7 +39,7 @@ ve.dm.MWMagicLinkNode.static.matchTagNames = [ 'a' ];
ve.dm.MWMagicLinkNode.static.matchRdfaTypes = [ 'mw:WikiLink', 'mw:ExtLink' ];
ve.dm.MWMagicLinkNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWMagicLinkNode.static.disallowedAnnotationTypes = [ 'link' ];
/**
* Determine whether the given `element` is a magic link.

2
modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
View file

@ -39,7 +39,7 @@ ve.dm.MWNumberedExternalLinkNode.static.matchTagNames = [ 'a' ];
ve.dm.MWNumberedExternalLinkNode.static.matchRdfaTypes = [ 'mw:ExtLink', 've:NumberedLink' ];
ve.dm.MWNumberedExternalLinkNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWNumberedExternalLinkNode.static.disallowedAnnotationTypes = [ 'link' ];
ve.dm.MWNumberedExternalLinkNode.static.matchFunction = function ( domElement ) {
// Must be empty, or explicitly flagged as a numbered link. We can't just

2
modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
View file

@ -520,7 +520,7 @@ ve.ui.MWLinkAnnotationInspector.prototype.getInsertionText = function () {
*/
ve.ui.MWLinkAnnotationInspector.prototype.getInsertionData = function () {
// If this is a new external link, insert an autonumbered link instead of a link annotation
// (applying the annotation on this later does nothing because of blacklistedAnnotationTypes).
// (applying the annotation on this later does nothing because of disallowedAnnotationTypes).
// Otherwise call parent method to figure out the text to insert and annotate.
if ( this.isNew && this.isExternal() ) {
return [