mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-25 04:19:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:typecho/typecho

Browse Source
This commit is contained in:
joyqi 2017-10-27 16:42:29 +08:00
commit 8191c8fcea
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/editor-js.php
View File

@ -75,10 +75,15 @@ $(document).ready(function () {
'pre' : 'pre|code'
});
converter.hook('beforeParseInline', function (html) {
return html.replace(/^\s*<!\-\-\s*more\s*\-\->\s*$/, function () {
return converter.makeHolder('<!--more-->');
});
});
// 自动跟随
converter.hook('makeHtml', function (html) {
// convert all comment
html = html.replace(/&lt;!--(.+?)--&gt;/g, '<!--$1-->');
html = html.replace('<p><!--more--></p>', '<!--more-->');
if (html.indexOf('<!--more-->') > 0) {
var parts = html.split(/\s*<\!\-\-more\-\->\s*/),

6
var/Markdown.php
View File

@ -28,8 +28,8 @@ class Markdown
});
$parser->hook('beforeParseInline', function ($html) use ($parser) {
return preg_replace_callback("/<!\-\-(.+?)\-\->/s", function ($matches) use ($parser) {
return $parser->makeHolder($matches[0]);
return preg_replace_callback("/^\s*<!\-\-\s*more\s*\-\->\s*$/s", function ($matches) use ($parser) {
return $parser->makeHolder('<!--more-->');
}, $html);
});
@ -43,7 +43,7 @@ class Markdown
));
}
return $parser->makeHtml($text);
return str_replace('<p><!--more--></p>', '<!--more-->', $parser->makeHtml($text));
}
/**