jenkins-bot has submitted this change and it was merged.
Change subject: Move paste rules to Target
......................................................................
Move paste rules to Target
Because ViewPageTarget isn't always loaded.
Bug: 60912
Change-Id: I16bd6a329120b3dd7dcb0de3e76e69e84c18553f
(cherry picked from commit cf628016946b84b253b37758ab810930ce293dbd)
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
4 files changed, 17 insertions(+), 18 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 5559a66..8000c66 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -134,19 +134,6 @@
/* Static Properties */
-ve.init.mw.ViewPageTarget.static.pasteRules = {
- 'external': {
- 'blacklist': [
- // Annotations
- 'link', 'textStyle/span', 'textStyle/underline',
- // Nodes
- 'image', 'div', 'alienInline', 'alienBlock'
- ],
- 'removeHtmlAttributes': true
- },
- 'all': null
-};
-
/**
* Compatibility map used with jQuery.client to black-list incompatible
browsers.
*
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5c246a4..5ec9310 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -198,9 +198,21 @@
'promote': [ 'reference', 'mediaInsert' ],
'demote': [ 'language', 'specialcharacter' ]
}
-
];
+ve.init.mw.Target.static.pasteRules = {
+ 'external': {
+ 'blacklist': [
+ // Annotations
+ 'link', 'textStyle/span', 'textStyle/underline',
+ // Nodes
+ 'image', 'div', 'alienInline', 'alienBlock'
+ ],
+ 'removeHtmlAttributes': true
+ },
+ 'all': null
+};
+
/* Static Methods */
/**
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 1584ae0..cc73830 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -92,11 +92,11 @@
];
ve.ui.MWMediaEditDialog.static.pasteRules = ve.extendObject(
- ve.copy( ve.init.mw.ViewPageTarget.static.pasteRules ),
+ ve.copy( ve.init.mw.Target.static.pasteRules ),
{
'all': {
'blacklist': OO.simpleArrayUnion(
- ve.getProp(
ve.init.mw.ViewPageTarget.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.mw.Target.static.pasteRules, 'all', 'blacklist' ) || [],
[
// Tables (but not lists) are possible
in wikitext with a leading
// line break but we prevent creating
these with the UI
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index dcd07f3..35cfa89 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -90,11 +90,11 @@
];
ve.ui.MWReferenceDialog.static.pasteRules = ve.extendObject(
- ve.copy( ve.init.mw.ViewPageTarget.static.pasteRules ),
+ ve.copy( ve.init.mw.Target.static.pasteRules ),
{
'all': {
'blacklist': OO.simpleArrayUnion(
- ve.getProp(
ve.init.mw.ViewPageTarget.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.mw.Target.static.pasteRules, 'all', 'blacklist' ) || [],
[
// Nested references are impossible
'mwReference', 'mwReferenceList',
--
To view, visit https://gerrit.wikimedia.org/r/111919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16bd6a329120b3dd7dcb0de3e76e69e84c18553f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
