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

Allow newline between various tags #2313

Merged
merged 17 commits into from Feb 8, 2018
Merged

Allow newline between various tags #2313

Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7c52da3
Allow newline between color tags
HoutarouOreki Feb 1, 2018
490ed78
Allow various multiline tags
HoutarouOreki Feb 1, 2018
0c1176e
try fixing unexpected return..?
HoutarouOreki Feb 1, 2018
a2fcfb6
Try fixing capturing groups for parseColour
HoutarouOreki Feb 1, 2018
afa8cde
Try fixing capturing groups for parseColour
HoutarouOreki Feb 1, 2018
8745a34
uhhh behavior testing (temporary)
HoutarouOreki Feb 1, 2018
1e6d321
testing
HoutarouOreki Feb 1, 2018
e78af1d
Fix wrong capturing groups?
HoutarouOreki Feb 1, 2018
10c78cf
Try another way of matching all characters
HoutarouOreki Feb 2, 2018
b2caa94
Bring back original capturing groups
HoutarouOreki Feb 2, 2018
2143bd7
Merge branch 'master' into master
HoutarouOreki Feb 2, 2018
18e50e3
Don't parse headings through multiple lines
HoutarouOreki Feb 2, 2018
631b85e
Merge branch 'master' of https://github.com/HoutarouOreki/osu-web
HoutarouOreki Feb 2, 2018
e715297
Merge branch 'master' into master
HoutarouOreki Feb 3, 2018
ec7824a
Restore dots, introduce modifiers
HoutarouOreki Feb 5, 2018
5ba4c8c
Merge branch 'master' of https://github.com/HoutarouOreki/osu-web
HoutarouOreki Feb 5, 2018
6260c38
Merge branch 'master' into master
notbakaneko Feb 8, 2018
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
21 changes: 16 additions & 5 deletions app/Libraries/BBCodeForDB.php
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ function ($m) {
public function parseColour($text)
{
return preg_replace(
",\[(color=(?:#[[:xdigit:]]{6}|[[:alpha:]]+))\](.*?)\[(/color)\],",
",\[(color=(?:#[[:xdigit:]]{6}|[[:alpha:]]+))\](.*?)\[(/color)\],s",
"[\\1:{$this->uid}]\\2[\\3:{$this->uid}]",
$text
);
Expand Down Expand Up @@ -140,13 +140,12 @@ public function parseImage($text)
* - Italic (i)
* - Strike (strike, s)
* - Underline (u)
* - Heading (heading)
*/
public function parseInlineSimple($text)
{
foreach (['b', 'i', 'strike', 's', 'u', 'heading'] as $tag) {
foreach (['b', 'i', 'strike', 's', 'u'] as $tag) {
$text = preg_replace(
"#\[{$tag}](.*?)\[/{$tag}\]#",
"#\[{$tag}](.*?)\[/{$tag}\]#s",
"[{$tag}:{$this->uid}]\\1[/{$tag}:{$this->uid}]",
$text
);
Expand All @@ -155,6 +154,17 @@ public function parseInlineSimple($text)
return $text;
}

public function parseHeading($text)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

{
$text = preg_replace(
"#\[heading](.*?)\[/heading\]#",
"[heading:{$this->uid}]\\1[/heading:{$this->uid}]",
$text
);

return $text;
}

public function parseLinks($text)
{
$spaces = ["(^|\s)", "((?:\.|\))?(?:$|\s|\n|\r))"];
Expand Down Expand Up @@ -239,7 +249,7 @@ public function parseQuote($text)
public function parseSize($text)
{
return preg_replace(
"#\[(size=(?:\d+))\](.+?)\[(/size)\]#",
"#\[(size=(?:\d+))\](.*?)\[(/size)\]#s",
"[\\1:{$this->uid}]\\2[\\3:{$this->uid}]",
$text
);
Expand Down Expand Up @@ -318,6 +328,7 @@ public function generate()
$text = $this->parseBlockSimple($text);
$text = $this->parseImage($text);
$text = $this->parseInlineSimple($text);
$text = $this->parseHeading($text);
$text = $this->parseAudio($text);
$text = $this->parseEmail($text);
$text = $this->parseUrl($text);
Expand Down