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

Jump to bottom

markdown: setBreaksEnabled( ) einstellbar machen #3885

Merged
merged 12 commits into from
Oct 2, 2020
Merged

markdown: setBreaksEnabled( ) einstellbar machen #3885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b768eb2
setBreaksEnabled( ) einstellbar machen
christophboecker Sep 24, 2020
3c318e0
Leerzeichen entfernt
christophboecker Sep 24, 2020
c61a1e8
SET_BREAKS_ENABLED per Funktions-Parameter
christophboecker Sep 25, 2020
38322df
Anzeige der README.md jetzt mit ex_markdown::SET_BREAKS_DISABLED
christophboecker Sep 25, 2020
50ed947
softLineBreaks (def=true) abschaltbar
christophboecker Sep 30, 2020
bafeacf
Anzeige der README.md jetzt mit "Softbreaks disabled"
christophboecker Sep 30, 2020
a18a417
Merge branch 'master' into markdown
christophboecker Oct 1, 2020
80a42b6
Leerzeichen in Zeile 440 eingefügt
christophboecker Oct 1, 2020
6563c40
cs fix
gharlan Oct 2, 2020
9643501
Weitere Stellen
gharlan Oct 2, 2020
34a6088
trailing whitespace in markdown nicht entfernen
gharlan Oct 2, 2020
048f5af
Merge branch 'master' into markdown
kodiakhq[bot] Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ indent_size = 4

[*.md]
max_line_length = 80
trim_trailing_whitespace = false

[COMMIT_EDITMSG]
max_line_length = 0
2 changes: 1 addition & 1 deletion redaxo/src/core/lib/be/controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ public static function includeCurrentPageSubPath(array $context = [])
$path = $languagePath;
}

[$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path));
[$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path), 2, 3, false);
$fragment = new rex_fragment();
$fragment->setVar('content', $content, false);
$fragment->setVar('toc', $toc, false);
Expand Down
8 changes: 4 additions & 4 deletions redaxo/src/core/lib/util/markdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public static function factory()
*
* @return string HTML code
*/
public function parse($code)
public function parse($code, bool $softLineBreaks = true)
{
$parser = new ParsedownExtra();
$parser->setBreaksEnabled(true);
$parser->setBreaksEnabled($softLineBreaks);

return rex_string::sanitizeHtml($parser->text($code));
}
Expand All @@ -48,10 +48,10 @@ public function parse($code)
*
* @return array tupel of table-of-content and content
*/
public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3)
public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, bool $softLineBreaks = true)
{
$parser = new rex_parsedown_with_toc();
$parser->setBreaksEnabled(true);
$parser->setBreaksEnabled($softLineBreaks);
$parser->topLevel = $topLevel;
$parser->bottomLevel = $bottomLevel;

Expand Down
4 changes: 2 additions & 2 deletions redaxo/src/core/pages/packages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
$package->includeFile('help.php');
$content .= ob_get_clean();
} elseif (is_readable($package->getPath('README.'. rex_i18n::getLanguage() .'.md'))) {
[$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.'. rex_i18n::getLanguage() .'.md')));
[$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.'. rex_i18n::getLanguage() .'.md')), 2, 3, false);
$fragment = new rex_fragment();
$fragment->setVar('content', $readmeContent, false);
$fragment->setVar('toc', $readmeToc, false);
$content .= $fragment->parse('core/page/docs.php');
} elseif (is_readable($package->getPath('README.md'))) {
[$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.md')));
[$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.md')), 2, 3, false);
$fragment = new rex_fragment();
$fragment->setVar('content', $readmeContent, false);
$fragment->setVar('toc', $readmeToc, false);
Expand Down