jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392476 )
Change subject: Move source mode newline hack down to ArticleTarget
......................................................................
Move source mode newline hack down to ArticleTarget
We need this hack when visually editing articles, but not in e.g. the
Flow integration. Move it down so that mw.Target has a clean
parseDocument method that can be used by Flow without undesirable
newlines being introduced.
Change-Id: I52bba88b3d33c3d6d16c4cf832f23f970a243abf
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 66889b7..781af06 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -209,6 +209,22 @@
'showWatchthis'
] );
+/* Static methods */
+
+/**
+ * @inheritdoc
+ */
+ve.init.mw.ArticleTarget.static.parseDocument = function ( documentString,
mode ) {
+ // Add trailing linebreak to wikitext documents for consistency
+ // with old editor and usability. Will be stripped on save. T156609
+ if ( mode === 'source' ) {
+ documentString += '\n';
+ }
+
+ // Parent method
+ return ve.init.mw.ArticleTarget.super.static.parseDocument.call( this,
documentString, mode );
+};
+
/* Methods */
/**
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 08d17f2..3663177 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -191,9 +191,6 @@
ve.init.mw.Target.static.parseDocument = function ( documentString, mode ) {
var doc;
if ( mode === 'source' ) {
- // Add trailing linebreak to wikitext documents for consistency
- // with old editor and usability. Will be stripped on save.
T156609
- documentString += '\n';
// Parent method
doc = ve.init.mw.Target.super.static.parseDocument.call( this,
documentString, mode );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/392476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52bba88b3d33c3d6d16c4cf832f23f970a243abf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits