web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace mediatag markdown syntax by html. Enable file upload in /code.

Browse Source
This commit is contained in:
yflory
2017-07-11 11:56:06 +02:00
parent 59213a9c4e
commit 8f5a244999
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
www/code/main.js
View File

@@ -364,6 +364,21 @@ define([
return; return;
} }
UserList.getLastName(toolbar.$userNameButton, isNew); UserList.getLastName(toolbar.$userNameButton, isNew);
var fmConfig = {
dropArea: $iframe.find('.CodeMirror'),
body: $iframe.find('body'),
onUploaded: function (ev, data) {
//var cursor = editor.getCursor();
var cleanName = data.name.replace(/[\[\]]/g, '');
//var text = '!['+cleanName+']('+data.url+')';
var parsed = Cryptpad.parsePadUrl(data.url);
var hexFileName = Cryptpad.base64ToHex(parsed.hashData.channel);
var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;
var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + parsed.hashData.key + '"></media-tag>';
editor.replaceSelection(mt);
}
};
APP.FM = Cryptpad.createFileManager(fmConfig);
}; };
config.onRemote = function () { config.onRemote = function () {

2
www/common/diffMarked.js
View File

@@ -154,9 +154,11 @@ define([
var $mts = $content.find('media-tag:not(:has(*))'); var $mts = $content.find('media-tag:not(:has(*))');
$mts.each(function (i, el) { $mts.each(function (i, el) {
MediaTag(el); MediaTag(el);
console.log(el.outerHTML);
var observer = new MutationObserver(function(mutations) { var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) { mutations.forEach(function(mutation) {
if (mutation.type === 'childList') { if (mutation.type === 'childList') {
console.log(el.outerHTML);
var list_values = [].slice.call(el.children); var list_values = [].slice.call(el.children);
mediaMap[el.getAttribute('src')] = list_values; mediaMap[el.getAttribute('src')] = list_values;
} }

11
www/slide/main.js
View File

@@ -623,11 +623,12 @@ define([
onUploaded: function (ev, data) { onUploaded: function (ev, data) {
//var cursor = editor.getCursor(); //var cursor = editor.getCursor();
var cleanName = data.name.replace(/[\[\]]/g, ''); var cleanName = data.name.replace(/[\[\]]/g, '');
var text = '!['+cleanName+']('+data.url+')'; //var text = '!['+cleanName+']('+data.url+')';
/*if (data.mediatag) { var parsed = Cryptpad.parsePadUrl(data.url);
text = '!'+text; var hexFileName = Cryptpad.base64ToHex(parsed.hashData.channel);
}*/ var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;
editor.replaceSelection(text); var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + parsed.hashData.key + '"></media-tag>';
editor.replaceSelection(mt);
} }
}; };
APP.FM = Cryptpad.createFileManager(fmConfig); APP.FM = Cryptpad.createFileManager(fmConfig);

2
www/slide/slide.less
View File

@@ -397,7 +397,7 @@ div#modal #content, #print {
p { p {
display: flex; display: flex;
flex-flow: column; flex-flow: row wrap;
padding: 0; padding: 0;
margin: 0; margin: 0;
min-height:0; min-height:0;