dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for drop & paste in rich text and polls

This commit is contained in:
yflory 2020-07-09 12:40:31 +02:00
parent 3864b30d96
commit 896a1b1ddd
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/pad/inner.js
View File

@ -725,6 +725,7 @@ define([
var fmConfig = {
ckeditor: editor,
dropArea: $inner,
body: $('body'),
onUploaded: function(ev, data) {
var parsed = Hash.parsePadUrl(data.url);
@ -743,7 +744,24 @@ define([
editor.widgets.initOn(element, 'mediatag');
}
};
window.APP.FM = framework._.sfCommon.createFileManager(fmConfig);
var FM = window.APP.FM = framework._.sfCommon.createFileManager(fmConfig);
editor.on('paste', function (ev) {
try {
var files = ev.data.dataTransfer._.files;
files.forEach(function (f) {
FM.handleFile(f);
});
// If the paste data contains files, don't use the ckeditor default handlers
// ==> they would try to include either a remote image URL or a base64 image
if (files.length) {
ev.cancel();
ev.preventDefault();
}
} catch (e) {
console.error(e);
}
});
framework._.sfCommon.getAttribute(['pad', 'spellcheck'], function(err, data) {
if (framework.isReadOnly()) { return; }

19
www/poll/inner.js
View File

@ -2,6 +2,7 @@ define([
'jquery',
'/common/toolbar.js',
'/common/common-util.js',
'/common/common-hash.js',
'/bower_components/nthen/index.js',
'/common/sframe-common.js',
'/common/common-realtime.js',
@ -32,6 +33,7 @@ define([
$,
Toolbar,
Util,
Hash,
nThen,
SFCommon,
CommonRealtime,
@ -940,6 +942,23 @@ define([
$('.CodeMirror').parent().prepend(markdownTb.toolbar);
APP.toolbar.$bottomL.append(markdownTb.button);
// Add drop and paste handlers
var privateData = metadataMgr.getPrivateData();
var fmConfig = {
dropArea: $('.CodeMirror'),
body: $('body'),
onUploaded: function (ev, data) {
var parsed = Hash.parsePadUrl(data.url);
var secret = Hash.getSecrets('file', parsed.hash, data.password);
var fileHost = privateData.fileHost || privateData.origin;
var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
var key = Hash.encodeBase64(secret.keys.cryptKey);
var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
APP.editor.replaceSelection(mt);
}
};
common.createFileManager(fmConfig);
// Initialize author name for comments.
// Disable name modification for logged in users
var $cName = APP.$addComment.find('.cp-app-poll-comments-add-name')