mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-04-04 02:02:27 +02:00
Code Issues Projects Releases Wiki Activity

fix #577

Browse Source 
fix #581
This commit is contained in:
joyqi 2017-07-24 16:35:54 +08:00
parent 98ed395962
commit f88cd44d52
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/js/hyperdown.js
View File

@ -156,8 +156,11 @@
return html;
};
Parser.prototype.parse = function(text) {
Parser.prototype.parse = function(text, inline) {
var block, blocks, end, extract, html, j, len, lines, method, result, start, type, value;
if (inline == null) {
inline = false;
}
lines = [];
blocks = this.parseBlock(text, lines);
html = '';
@ -171,6 +174,9 @@
result = this.call('after' + ucfirst(method), result, value);
html += result;
}
if (inline && blocks.length === 1 && blocks[0][0] === 'normal') {
html = html.replace(/^\s*<p>(.*)<\/p>\s*$/m, '$1');
}
return html;
};
@ -735,7 +741,7 @@
leftLines.push(line.replace(new RegExp("^\\s{" + secondMinSpace + "}"), ''));
} else {
if (leftLines.length > 0) {
html += '<li>' + (this.parse(leftLines.join("\n"))) + '</li>';
html += '<li>' + (this.parse(leftLines.join("\n"), true)) + '</li>';
}
if (lastType !== type) {
if (!!lastType) {
@ -751,7 +757,7 @@
}
}
if (leftLines.length > 0) {
html += '<li>' + (this.parse(leftLines.join("\n"))) + ("</li></" + lastType + ">");
html += '<li>' + (this.parse(leftLines.join("\n"), true)) + ("</li></" + lastType + ">");
}
return html;
};

13
var/HyperDown.php
View File

@ -179,9 +179,10 @@ class HyperDown
* parse
*
* @param string $text
* @param bool $inline
* @return string
*/
private function parse($text)
private function parse($text, $inline = false)
{
$blocks = $this->parseBlock($text, $lines);
$html = '';
@ -198,6 +199,12 @@ class HyperDown
$html .= $result;
}
// inline mode for single normal block
if ($inline && count($blocks) == 1 && $blocks[0][0] == 'normal') {
// remove p tag
$html = preg_replace("/^\s*<p>(.*)<\/p>\s*$/", "\\1", $html);
}
return $html;
}
@ -982,7 +989,7 @@ class HyperDown
$leftLines[] = preg_replace("/^\s{" . $secondMinSpace . "}/", '', $line);
} else {
if (!empty($leftLines)) {
$html .= "<li>" . $this->parse(implode("\n", $leftLines)) . "</li>";
$html .= "<li>" . $this->parse(implode("\n", $leftLines), true) . "</li>";
}
if ($lastType != $type) {
@ -1002,7 +1009,7 @@ class HyperDown
}
if (!empty($leftLines)) {
$html .= "<li>" . $this->parse(implode("\n", $leftLines)) . "</li></{$lastType}>";
$html .= "<li>" . $this->parse(implode("\n", $leftLines), true) . "</li></{$lastType}>";
}
return $html;