mrflos/memo
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Add markdown support (marked lib)

Browse source 
Conflicts:
	client/css/style.css
This commit is contained in:
Luc Didry 2016-09-14 22:59:09 +02:00
parent 9a3f4ddb2f
commit 36ee5a6db5
5 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/script.js
View file

@ -108,7 +108,8 @@ function getMessage(m) {
break;
case 'editCard':
$("#" + data.id).children('.content:first').text(data.value);
$("#" + data.id).children('.content:first').attr('data-text', data.value);
$("#" + data.id).children('.content:first').html(marked(data.value));
break;
case 'initColumns':
@ -175,12 +176,13 @@ function drawNewCard(id, text, x, y, rot, colour, sticker, animationspeed) {
<img class="card-image" src="images/' +
colour + '-card.png">\
<div id="content:' + id +
'" class="content stickertarget droppable">' +
text + '</div><span class="filler"></span>\
'" class="content stickertarget droppable" data-text="">' +
marked(text) + '</div><span class="filler"></span>\
</div>';
var card = $(h);
card.appendTo('#board');
$("#" + id).children('.content:first').attr('data-text', text);
//@TODO
//Draggable has a bug which prevents blur event
@ -291,10 +293,14 @@ function drawNewCard(id, text, x, y, rot, colour, sticker, animationspeed) {
);
card.children('.content').editable(function(value, settings) {
$("#" + id).children('.content:first').attr('data-text', value);
onCardChange(id, value);
return (value);
return (marked(value));
}, {
type: 'textarea',
data: function() {
return $("#" + id).children('.content:first').attr('data-text');
},
submit: 'OK',
style: 'inherit',
cssclass: 'card-edit-form',