Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add option to use soft breaks for markdown rendering #1408

Merged
merged 4 commits into from
Apr 21, 2019
Merged

add option to use soft breaks for markdown rendering #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10c4163
add option to use soft breaks for markdown rendering
tessus Apr 10, 2019
63aea58
oops, I didn't use the British spelling
tessus Apr 10, 2019
d973fb1
moved setting to section Plugins
tessus Apr 21, 2019
98cb007
change text -> Enable soft breaks
tessus Apr 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ReactNativeClient/lib/MdToHtml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class MdToHtml {
if (!options.paddingBottom) options.paddingBottom = '0';
if (!options.highlightedKeywords) options.highlightedKeywords = [];

const breaks_ = Setting.value('markdown.softbreaks') ? false : true;

const cacheKey = md5(escape(body + JSON.stringify(options) + JSON.stringify(style)));
const cachedOutput = this.cachedOutputs_[cacheKey];
if (cachedOutput) return cachedOutput;
Expand All @@ -63,7 +65,7 @@ class MdToHtml {
};

const markdownIt = new MarkdownIt({
breaks: true,
breaks: breaks_,
linkify: true,
html: true,
highlight: function(str, lang) {
Expand Down
1 change: 1 addition & 0 deletions ReactNativeClient/lib/models/Setting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class Setting extends BaseModel {
'body': _('Focus body'),
};
}},
'markdown.softbreaks': { value: false, type: Setting.TYPE_BOOL, section: 'plugins', public: true, appTypes: ['mobile', 'desktop'], label: () => _('Enable soft breaks') },
'markdown.plugin.katex': {value: true, type: Setting.TYPE_BOOL, section: 'plugins', public: true, appTypes: ['mobile', 'desktop'], label: () => _('Enable math expressions')},
'markdown.plugin.mark': {value: true, type: Setting.TYPE_BOOL, section: 'plugins', public: true, appTypes: ['mobile', 'desktop'], label: () => _('Enable ==mark== syntax')},
'markdown.plugin.footnote': {value: true, type: Setting.TYPE_BOOL, section: 'plugins', public: true, appTypes: ['mobile', 'desktop'], label: () => _('Enable footnotes')},
Expand Down