[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.6]: Resolve URLs in show preview against correct base
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327429 )
Change subject: Resolve URLs in show preview against correct base
..
Resolve URLs in show preview against correct base
Bug: T153277
Change-Id: Icaa6de4618de008fb2024d1dd428114688cb1043
(cherry picked from commit 9728d781260ffeab6284203a6a471e9547e0c5fc)
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 4ac11c3..45e2a79 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1007,12 +1007,18 @@
wikitext: wikitext,
pst: true
} ).always( function ( response, details ) {
+ var doc, body;
if ( ve.getProp( response, 'visualeditor', 'result' )
=== 'success' ) {
- target.saveDialog.showPreview(
response.visualeditor.content );
+ doc = target.parseDocument(
response.visualeditor.content, 'visual' );
+ body = doc.body;
+ // Import body to current document, then
resolve attributes against original document (parseDocument called #fixBase)
+ document.adoptNode( body );
+ ve.resolveAttributes( body, doc,
ve.dm.Converter.static.computedAttributes );
+ target.saveDialog.showPreview( $( body
).contents() );
} else {
target.saveDialog.showPreview( $( '' ).text(
ve.msg(
'visualeditor-loaderror-message', ve.getProp( details, 'error', 'info' ) ||
'Failed to connect' )
- ).html() );
+ ) );
}
target.bindSaveDialogClearDiff();
} );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 0cd2131..b712e7f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -127,10 +127,10 @@
/**
* Set preview content and show preview panel.
*
- * @param {string} content Preview HTML
+ * @param {jQuery} content Preview content
*/
ve.ui.MWSaveDialog.prototype.showPreview = function ( content ) {
- this.$previewViewer.html( content );
+ this.$previewViewer.empty().append( content );
mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
this.actions.setAbilities( { approve: true } );
this.popPending();
--
To view, visit https://gerrit.wikimedia.org/r/327429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaa6de4618de008fb2024d1dd428114688cb1043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Thcipriani
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.6]: Resolve URLs in show preview against correct base
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327429 )
Change subject: Resolve URLs in show preview against correct base
..
Resolve URLs in show preview against correct base
Bug: T153277
Change-Id: Icaa6de4618de008fb2024d1dd428114688cb1043
(cherry picked from commit 9728d781260ffeab6284203a6a471e9547e0c5fc)
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/29/327429/1
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 4ac11c3..45e2a79 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1007,12 +1007,18 @@
wikitext: wikitext,
pst: true
} ).always( function ( response, details ) {
+ var doc, body;
if ( ve.getProp( response, 'visualeditor', 'result' )
=== 'success' ) {
- target.saveDialog.showPreview(
response.visualeditor.content );
+ doc = target.parseDocument(
response.visualeditor.content, 'visual' );
+ body = doc.body;
+ // Import body to current document, then
resolve attributes against original document (parseDocument called #fixBase)
+ document.adoptNode( body );
+ ve.resolveAttributes( body, doc,
ve.dm.Converter.static.computedAttributes );
+ target.saveDialog.showPreview( $( body
).contents() );
} else {
target.saveDialog.showPreview( $( '' ).text(
ve.msg(
'visualeditor-loaderror-message', ve.getProp( details, 'error', 'info' ) ||
'Failed to connect' )
- ).html() );
+ ) );
}
target.bindSaveDialogClearDiff();
} );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 0cd2131..b712e7f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -127,10 +127,10 @@
/**
* Set preview content and show preview panel.
*
- * @param {string} content Preview HTML
+ * @param {jQuery} content Preview content
*/
ve.ui.MWSaveDialog.prototype.showPreview = function ( content ) {
- this.$previewViewer.html( content );
+ this.$previewViewer.empty().append( content );
mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
this.actions.setAbilities( { approve: true } );
this.popPending();
--
To view, visit https://gerrit.wikimedia.org/r/327429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa6de4618de008fb2024d1dd428114688cb1043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
