Skip to content

[3.0] code tag changes #8891

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

Draft
live627 wants to merge 1 commit into
base: release-3.0
Choose a base branch
from
+98 −181
Draft

[3.0] code tag changes #8891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 12 additions & 38 deletions Sources/BBCode/Code1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Code1 extends BBCode
/**
*
*/
public ?string $content = '<div class="codeheader"><span class="code">{txt_code}</span> <a class="codeoperation smf_select_text">{txt_code_select}</a> <a class="codeoperation smf_expand_code hidden" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}">{txt_code_expand}</a></div><code class="bbc_code">$1</code>';
public ?string $content = '<div class="codeheader">{txt_code}</div><pre data-select-txt="{txt_code_select}" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}" class="bbc_code"><code>$1</code></pre>';

/**
*
Expand All @@ -63,53 +63,27 @@ public function validate(BBCodeInterface &$bbc, array|string &$data, array $disa
if (!isset($disabled['code'])) {
$code = \is_array($data) ? $data[0] : $data;

$add_begin = (
\is_array($data)
&& isset($data[1])
&& strtoupper($data[1]) === 'PHP'
&& !str_contains($code, '&lt;?php')
);
$parts = preg_split('~(&lt;\?php|\?&gt;)~', $code, -1, PREG_SPLIT_DELIM_CAPTURE);

if ($add_begin) {
$code = '&lt;?php ' . $code . '?&gt;';
$data[1] = 'PHP';
}

$php_parts = preg_split('~(&lt;\?php|\?&gt;)~', $code, -1, PREG_SPLIT_DELIM_CAPTURE);

for ($php_i = 0, $php_n = \count($php_parts); $php_i < $php_n; $php_i++) {
for ($i = 0, $n = count($parts); $i < $n; $i++) {
// Do PHP code coloring?
if ($php_parts[$php_i] != '&lt;?php') {
if ($parts[$i] != '&lt;?php') {
continue;
}

$php_string = '';

while ($php_i + 1 < \count($php_parts) && $php_parts[$php_i] != '?&gt;') {
$php_string .= $php_parts[$php_i];
$php_parts[$php_i++] = '';
}

$php_parts[$php_i] = Parser::highlightPhpCode($php_string . $php_parts[$php_i]);
$string = '';

if (\is_array($data) && empty($data[1])) {
$data[1] = 'PHP';
while ($i + 1 < $n && $parts[$i] != '?&gt;') {
$string .= $parts[$i];
$parts[$i++] = '';
}
$parts[$i] = Parser::highlightPhpCode($string . $parts[$i]);
}

// Fix the PHP code stuff...
$code = str_replace("<pre style=\"display: inline;\">\t</pre>", "\t", implode('', $php_parts));

$code = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $code);

if ($add_begin) {
$code = preg_replace(['/^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)/', '/\?&gt;((?:\s*<\/(font|span)>)*)$/m'], '$1', $code, 2);
}

if (\is_array($data)) {
$data[0] = $code;
if (is_array($data)) {
$data[0] = implode('', $parts);
} else {
$data = $code;
$data = implode('', $parts);
}
}
}
Expand Down
50 changes: 12 additions & 38 deletions Sources/BBCode/Code2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Code2 extends BBCode
/**
*
*/
public ?string $content = '<div class="codeheader"><span class="code">{txt_code}</span> ($2) <a class="codeoperation smf_select_text">{txt_code_select}</a> <a class="codeoperation smf_expand_code hidden" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}">{txt_code_expand}</a></div><code class="bbc_code">$1</code>';
public ?string $content = '<div class="codeheader">{txt_code} ($2)</div><pre data-select-txt="{txt_code_select}" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}" class="bbc_code"><code>$1</code></pre>';

/**
*
Expand All @@ -63,53 +63,27 @@ public function validate(BBCodeInterface &$bbc, array|string &$data, array $disa
if (!isset($disabled['code'])) {
$code = \is_array($data) ? $data[0] : $data;

$add_begin = (
\is_array($data)
&& isset($data[1])
&& strtoupper($data[1]) === 'PHP'
&& !str_contains($code, '&lt;?php')
);
$parts = preg_split('~(&lt;\?php|\?&gt;)~', $code, -1, PREG_SPLIT_DELIM_CAPTURE);

if ($add_begin) {
$code = '&lt;?php ' . $code . '?&gt;';
$data[1] = 'PHP';
}

$php_parts = preg_split('~(&lt;\?php|\?&gt;)~', $code, -1, PREG_SPLIT_DELIM_CAPTURE);

for ($php_i = 0, $php_n = \count($php_parts); $php_i < $php_n; $php_i++) {
for ($i = 0, $n = count($parts); $i < $n; $i++) {
// Do PHP code coloring?
if ($php_parts[$php_i] != '&lt;?php') {
if ($parts[$i] != '&lt;?php') {
continue;
}

$php_string = '';

while ($php_i + 1 < \count($php_parts) && $php_parts[$php_i] != '?&gt;') {
$php_string .= $php_parts[$php_i];
$php_parts[$php_i++] = '';
}

$php_parts[$php_i] = Parser::highlightPhpCode($php_string . $php_parts[$php_i]);
$string = '';

if (\is_array($data) && empty($data[1])) {
$data[1] = 'PHP';
while ($i + 1 < $n && $parts[$i] != '?&gt;') {
$string .= $parts[$i];
$parts[$i++] = '';
}
$parts[$i] = Parser::highlightPhpCode($string . $parts[$i]);
}

// Fix the PHP code stuff...
$code = str_replace("<pre style=\"display: inline;\">\t</pre>", "\t", implode('', $php_parts));

$code = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $code);

if ($add_begin) {
$code = preg_replace(['/^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)/', '/\?&gt;((?:\s*<\/(font|span)>)*)$/m'], '$1', $code, 2);
}

if (\is_array($data)) {
$data[0] = $code;
if (is_array($data)) {
$data[0] = implode('', $parts);
} else {
$data = $code;
$data = implode('', $parts);
}
}
}
Expand Down
16 changes: 4 additions & 12 deletions Themes/default/css/jquery.sceditor.default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! SCEditor | (C) 2011-2013, Sam Clarke | sceditor.com/license */
html, p, code::before, table {
html, p, .bbc_code code::before, table {
margin: 0;
padding: 0;
font-family: Verdana, Arial, Helvetica, sans-serif;
Expand Down Expand Up @@ -44,30 +44,22 @@ table, td {
min-width: 0.5ch;
}

code::before {
.bbc_code code::before {
position: absolute;
content: 'Code:';
top: -1.35em;
left: 0;
}
code[data-title]::before {
.bbc_code code[data-title]::before {
content: 'Code: (' attr(data-title) ')';
}
code {
.bbc_code {
margin-top: 1.5em;
position: relative;
background: #eee;
border: 1px solid #aaa;
white-space: pre-wrap;
padding: .25em;
display: block;
}
.ie6 code, .ie7 code {
margin-top: 0;
}
code::before, code {
display: block;
text-align: left;
}

span.phpcode, font[face=monospace] {
Expand Down
40 changes: 30 additions & 10 deletions Themes/default/scripts/jquery.sceditor.smf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,11 +1652,13 @@ sceditor.formats.bbcode.set(
sceditor.formats.bbcode.set(
'php', {
tags: {
span: {
'class': 'phpcode'
code: {
class: 'phpcode'
}
},
allowsEmpty: true,
isInline: true,
allowedChildren: ['#', '#newline'],
format: '[php]{0}[/php]',
html: function (element, attrs, content) {
// If the content contains multiple lines, format as a code block.
Expand Down Expand Up @@ -1684,23 +1686,41 @@ sceditor.formats.bbcode.set(
sceditor.formats.bbcode.set(
'code', {
tags: {
code: null
code: null,
div: {
class: 'codeheader'
},
pre: {
class: 'bbc_code'
}
},
isInline: false,
allowedChildren: ['#', '#newline'],
format: function (element, content) {
var
dom = sceditor.dom,
attr = dom.attr,
title = attr(element, 'data-title'),
from = title ?' =' + title : '';
let title = element.getAttribute('data-title');

if (element.className === 'php')
return content;
else if (element.tagName === 'DIV')
return '';
else if (element.tagName === 'PRE')
return content;
else if (element.parentNode.tagName === 'PRE' && !title)
{
const t = element.parentNode.previousSibling.textContent;

if (t.indexOf('(') != -1)
title = t.replace(/^[^(]+\(/, '').replace(/\)? \[.+/, '');
}

const from = title ? ' =' + title : '';

return '[code' + from + ']' + "\n" + content.replace('&#91;', '[') + "\n" + '[/code]';
return '[code' + from + ']' + content.replace('&#91;', '[') + '[/code]';
},
html: function (element, attrs, content) {
var from = attrs.defaultattr ? ' data-title="' + attrs.defaultattr + '"' : '';

return '<code data-name="' + this.opts.txtVars.code + '"' + from + '>' + content.replace('[', '&#91;').replaceAll(/\[tab\]/, '<span style="white-space: pre;" class="tab">\t</span>').replace(/^<br[^>]*>/, '').replace(/<br[^>]*>$/, '') + '</code>'
return '<pre class="bbc_code"><code data-name="' + this.opts.txtVars.code + '"' + from + '>' + content.replace('[', '&#91;').replaceAll(/\[tab\]/, '<span style="white-space: pre;" class="tab">\t</span>') + '</code></pre>';
}
}
);
Expand Down
Loading