-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(bbcode): highlight.js does not work after changing post content (…
…#3817) * fix(bbcode): highlight.js does not work after changing post content Signed-off-by: Sami Mazouz <[email protected]> * chore(bbcode): organize bbcode code Signed-off-by: Sami Mazouz <[email protected]> * Apply fixes from StyleCI --------- Signed-off-by: Sami Mazouz <[email protected]> Co-authored-by: StyleCI Bot <[email protected]>
- Loading branch information
1 parent
412dacd
commit 12eaa61
Showing
4 changed files
with
101 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of Flarum. | ||
* | ||
* For detailed copyright and license information, please view the | ||
* LICENSE file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Flarum\BBCode; | ||
|
||
use s9e\TextFormatter\Configurator; | ||
|
||
class Configure | ||
{ | ||
public function __invoke(Configurator $config) | ||
{ | ||
$this->addTagsFromRepositories($config); | ||
$this->adaptHighlightJs($config); | ||
} | ||
|
||
protected function addTagsFromRepositories(Configurator $config): void | ||
{ | ||
$config->BBCodes->addFromRepository('B'); | ||
$config->BBCodes->addFromRepository('I'); | ||
$config->BBCodes->addFromRepository('U'); | ||
$config->BBCodes->addFromRepository('S'); | ||
$config->BBCodes->addFromRepository('URL'); | ||
$config->BBCodes->addFromRepository('IMG'); | ||
$config->BBCodes->addFromRepository('EMAIL'); | ||
$config->BBCodes->addFromRepository('CODE'); | ||
$config->BBCodes->addFromRepository('QUOTE', 'default', [ | ||
'authorStr' => '<xsl:value-of select="@author"/> <xsl:value-of select="$L_WROTE"/>' | ||
]); | ||
$config->BBCodes->addFromRepository('LIST'); | ||
$config->BBCodes->addFromRepository('DEL'); | ||
$config->BBCodes->addFromRepository('COLOR'); | ||
$config->BBCodes->addFromRepository('CENTER'); | ||
$config->BBCodes->addFromRepository('SIZE'); | ||
$config->BBCodes->addFromRepository('*'); | ||
} | ||
|
||
/** | ||
* Fix for highlight JS not working after changing post content. | ||
* | ||
* @link https://github.com/flarum/framework/issues/3794 | ||
*/ | ||
protected function adaptHighlightJs(Configurator $config): void | ||
{ | ||
$codeTag = $config->tags->get('CODE'); | ||
$script = ' | ||
<script> | ||
if(window.hljsLoader && !document.currentScript.parentNode.hasAttribute(\'data-s9e-livepreview-onupdate\')) { | ||
window.hljsLoader.highlightBlocks(document.currentScript.parentNode); | ||
} | ||
</script>'; | ||
$codeTag->template = str_replace('</pre>', $script.'</pre>', $codeTag->template); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of Flarum. | ||
* | ||
* For detailed copyright and license information, please view the | ||
* LICENSE file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Flarum\BBCode; | ||
|
||
use s9e\TextFormatter\Renderer; | ||
use Symfony\Contracts\Translation\TranslatorInterface; | ||
|
||
class Render | ||
{ | ||
/** | ||
* @var TranslatorInterface | ||
*/ | ||
protected $translator; | ||
|
||
public function __construct(TranslatorInterface $translator) | ||
{ | ||
$this->translator = $translator; | ||
} | ||
|
||
public function __invoke(Renderer $renderer, $context, string $xml): string | ||
{ | ||
$renderer->setParameter('L_WROTE', $this->translator->trans('flarum-bbcode.forum.quote.wrote')); | ||
|
||
return $xml; | ||
} | ||
} |