Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342087 )
Change subject: ArticleTargetLoader: wikitext switch shouldn't require
FullRestbaseURL
......................................................................
ArticleTargetLoader: wikitext switch shouldn't require FullRestbaseURL
The non-FullRestbaseURL branch didn't handle converting the provided wikitext,
causing data loss when switching from source to visual modes.
Bug: T158692
Change-Id: I283afc4be1e322228d6ec572bfa8542ba8fd9ce7
(cherry picked from commit c5bb912e80aa0a046e0b21c039ec41729320e580)
---
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/87/342087/1
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index 929dc31..def7ed7 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -173,18 +173,21 @@
}
if (
- conf.fullRestbaseUrl &&
// wikitext can be an empty string
wikitext !== undefined &&
!$( '[name=wpSection]' ).val()
) {
+ if ( conf.fullRestbaseUrl ) {
+ pageHtmlUrl =
conf.fullRestbaseUrl + 'v1/transform/wikitext/to/html/';
+ } else {
+ pageHtmlUrl =
conf.restbaseUrl.replace( 'v1/page/html/', 'v1/transform/wikitext/to/html/' );
+ }
switched = true;
fromEditedState = modified;
window.onbeforeunload = null;
$( window ).off( 'beforeunload' );
restbaseXhr = $.ajax( {
- url: conf.fullRestbaseUrl +
'v1/transform/wikitext/to/html/' +
- encodeURIComponent(
pageName ) +
+ url: pageHtmlUrl +
encodeURIComponent( pageName ) +
( oldid === undefined ?
'' : '/' + oldid ),
type: 'POST',
data: {
--
To view, visit https://gerrit.wikimedia.org/r/342087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I283afc4be1e322228d6ec572bfa8542ba8fd9ce7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: DLynch <dly...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
