Merged r19089 from trunk to 4.1-stable (#32469, #3816).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19090 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-11-19 02:36:08 +00:00
parent a59f8813ab
commit e88dfda424

View File

@@ -255,6 +255,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(t => /^text/.test(t))) { return; }
var items = clipboardData.items
for (var i = 0 ; i < items.length ; i++) {