jenkins-bot has submitted this change and it was merged.
Change subject: On file pages, only replace the (local) image description when
saving
......................................................................
On file pages, only replace the (local) image description when saving
Instead of overwriting everything else on the page (including the thumbnail!)
Bug: 65349
Change-Id: Ib6c4928646d6d278e29fbe31ae1902b0dc3b146a
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Catrope: 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 9b2f02e..24955d4 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1514,8 +1514,16 @@
* @param {string} categoriesHtml Rendered categories HTML from server
*/
ve.init.mw.ViewPageTarget.prototype.replacePageContent = function ( html,
categoriesHtml ) {
- var $content = $( $.parseHTML( html ) );
- mw.hook( 'wikipage.content' ).fire( $( '#mw-content-text'
).empty().append( $content ) );
+ var $content = $( $.parseHTML( html ) ), $editableContent;
+
+ if ( $( '#mw-imagepage-content' ).length ) {
+ // On file pages, we only want to replace the (local)
description.
+ $editableContent = $( '#mw-imagepage-content' );
+ } else {
+ $editableContent = $( '#mw-content-text' );
+ }
+
+ mw.hook( 'wikipage.content' ).fire( $editableContent.empty().append(
$content ) );
$( '#catlinks' ).replaceWith( categoriesHtml );
};
--
To view, visit https://gerrit.wikimedia.org/r/133897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6c4928646d6d278e29fbe31ae1902b0dc3b146a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
