jenkins-bot has submitted this change and it was merged.
Change subject: Only trigger Firefox data:uri image paste if there is no other
HTML
......................................................................
Only trigger Firefox data:uri image paste if there is no other HTML
Bug: T142622
Change-Id: I440fb00841ae13c628d4b8d4e354d5f2883caab9
---
M src/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
DLynch: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 41aec9b..48bb3d3 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1873,7 +1873,7 @@
// jshint unused:false
var clipboardKey, clipboardId, clipboardIndex, clipboardHash,
$elements, parts, pasteData, slice, internalListRange,
- data, pastedDocumentModel, htmlDoc, $images, i,
+ data, pastedDocumentModel, htmlDoc, $body, $images, i,
context, left, right, contextRange, pastedText, handled,
tableAction,
items = [],
@@ -2067,8 +2067,11 @@
}
// Some browsers don't provide pasted image data through the
clipboardData API and
// instead create img tags with data URLs, so detect those here
- $images = $( htmlDoc.body ).find( 'img[src^=data\\:]' );
- if ( $images.length ) {
+ $body = $( htmlDoc.body );
+ $images = $body.children( 'img[src^=data\\:]' );
+ // Check the body contained just children.
+ // TODO: In the future this may want to trigger image uploads
*and* paste the HTML.
+ if ( $images.length === $body.children().length ) {
for ( i = 0; i < $images.length; i++ ) {
items.push(
ve.ui.DataTransferItem.static.newFromDataUri(
$images.eq( i ).attr( 'src' ),
--
To view, visit https://gerrit.wikimedia.org/r/304058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I440fb00841ae13c628d4b8d4e354d5f2883caab9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
