Merged r19834 from trunk to 4.1-stable (#33639).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19835 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-06-26 13:50:09 +00:00
parent f9cec4a18a
commit f3acfc772a

View File

@@ -257,7 +257,7 @@ function copyImageFromClipboard(e) {
if (!$(e.target).hasClass('wiki-edit')) { return; }
var clipboardData = e.clipboardData || e.originalEvent.clipboardData
if (!clipboardData) { return; }
if (clipboardData.types.some(function(t){ return /^text/.test(t); })) { return; }
if (clipboardData.types.some(function(t){ return /^text\/plain$/.test(t); })) { return; }
var items = clipboardData.items
for (var i = 0 ; i < items.length ; i++) {