jenkins-bot has submitted this change and it was merged.
Change subject: Resolve image paths when writing to clipboard
......................................................................
Resolve image paths when writing to clipboard
Bug: T111927
Change-Id: Idf3b761481454197eecbc0f6cd5cf6199419ca6c
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 00fcf29..8c63f7a 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -90,7 +90,7 @@
( originalMw && ve.compare( dataElement.attributes.mw,
JSON.parse( originalMw ) ) )
) {
// The object in the store is also used for CE rendering so
return a copy
- return ve.copyDomElements( dataElement.originalDomElements, doc
);
+ els = ve.copyDomElements( dataElement.originalDomElements, doc
);
} else {
if ( converter.isForClipboard() && index !== null ) {
// For the clipboard use the current DOM contents so
the user has something
@@ -102,8 +102,15 @@
el.setAttribute( 'data-mw', JSON.stringify(
dataElement.attributes.mw ) );
els = [ el ];
}
- return els;
}
+ if ( converter.isForClipboard() ) {
+ // Resolve image sources
+ $( els ).find( 'img' ).addBack( 'img' ).each( function () {
+ var $this = $( this );
+ $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ),
doc ) );
+ } );
+ }
+ return els;
};
ve.dm.MWExtensionNode.static.getHashObject = function ( dataElement ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 23df152..4d5f075 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -183,6 +183,12 @@
els[ i ] = wrapTextNode( els[ i ] );
els[ i ].setAttribute( 'data-ve-ignore', 'true' );
}
+
+ // Resolve image sources
+ $( els ).find( 'img' ).addBack( 'img' ).each( function () {
+ var $this = $( this );
+ $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ),
doc ) );
+ } );
}
return els;
};
--
To view, visit https://gerrit.wikimedia.org/r/237071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf3b761481454197eecbc0f6cd5cf6199419ca6c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[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
