infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Upload pasted images in codemirror

pull/1/head
yflory 2020-07-08 18:55:42 +02:00
parent 89aae79531
commit 3864b30d96
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/common/sframe-common-codemirror.js
View File

@ -234,6 +234,19 @@ define([
editor.scrollIntoView(cursor);
});
// Don't paste file path in the users wants to paste a file
editor.on('paste', function (editor, ev) {
try {
if (!ev.clipboardData.items) { return; }
var items = Array.prototype.slice.apply(ev.clipboardData.items);
var hasFile = items.some(function (el) {
return el.kind === "file";
});
if (!hasFile) { return; }
ev.preventDefault();
} catch (e) { console.error(e); }
});
var setMode = exp.setMode = function (mode, cb) {
exp.highlightMode = mode;
if (mode === 'markdown') { mode = 'gfm'; }

20
www/common/sframe-common-file.js
View File

@ -528,6 +528,26 @@ define([
$hoverArea.removeClass('cp-fileupload-hovering');
onFileDrop(dropped, e);
});
// Upload files on paste
$area.on('paste', function (e) {
try {
var ev = e.originalEvent;
if (!ev.clipboardData.items) { return; }
var items = Array.prototype.slice.apply(ev.clipboardData.items);
var hasFile = items.some(function (el) {
return el.kind === "file";
});
if (!hasFile) { return; }
ev.preventDefault();
items.forEach(function (el) {
if (el.kind !== "file") { return; }
var file = el.getAsFile();
handleFile(file, e);
});
} catch (e) { console.error(e); }
});
};
var createCkeditorDropHandler = function () {
var editor = config.ckeditor;