Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-21 09:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reverted incomplete fix for "Checklist + card title with starting number and point", because it disabled some markdown. Related #2696

Browse source 
More fixes to GFM checklist not displayed properly in card title, fixes #2818

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2020-09-09 08:52:37 +03:00
parent ca39fce578
commit bf18792d77
1 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
packages/markdown/marked/lib/marked.js
View file

@ -4,21 +4,14 @@
* https://github.com/markedjs/marked * https://github.com/markedjs/marked
*/ */
/* /* Wekan changes below, with this same code:
Wekan Changes:
Disable list formatting and converting to HTML. Fixes: _proto.checkbox = function checkbox(checked) {
- Checklist + card title with starting number and point - return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
https://github.com/wekan/wekan/issues/2696 + // return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
- How to begin a card title with "3. "? + // Wekan: Instead of HTML, use unicode checked characters
https://github.com/wekan/wekan/issues/1421 + return (checked ? '🗹 ' : '☐ ');
- GFM checklist not displayed properly in card title #2818 };
https://github.com/wekan/wekan/issues/2818
With below using this code, search with text "Wekan":
//var cap = this.rules.block.list.exec(src);
// Wekan: do not autonumber lists:
cap = false;
*/ */
/** /**
@ -601,9 +594,7 @@ With below using this code, search with text "Wekan":
}; };
_proto.list = function list(src) { _proto.list = function list(src) {
//var cap = this.rules.block.list.exec(src); var cap = this.rules.block.list.exec(src);
// Wekan: do not autonumber lists:
cap = false;
if (cap) { if (cap) {
var raw = cap[0]; var raw = cap[0];
@ -1873,7 +1864,9 @@ With below using this code, search with text "Wekan":
}; };
_proto.checkbox = function checkbox(checked) { _proto.checkbox = function checkbox(checked) {
return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> '; // return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
// Wekan: Instead of HTML, use unicode checked characters
return (checked ? '🗹 ' : '☐ ');
}; };
_proto.paragraph = function paragraph(text) { _proto.paragraph = function paragraph(text) {