1
0
mirror of https://github.com/erusev/parsedown.git synced 2023-08-10 21:13:06 +03:00

Compare commits

...

9 Commits

Author SHA1 Message Date
c26a2ee4bf Bump beta version 2018-06-11 19:15:32 +01:00
ba3b60d6e4 Merge pull request #641 from aidantwoods/fix/api-stability-complete-function-removal
Restore existence of protected API methods
2018-06-08 14:38:42 +01:00
0b1e6b8c86 Restore existence of protected API methods 2018-06-07 19:47:09 +01:00
1f69f7e697 Bump version 2018-05-08 22:46:15 +01:00
c83af0a7d5 Merge pull request #628 from aidantwoods/fix/revert-rawHtml-breaks-insertion
Preserve plain-text in AST to avoid blinding extensions to it
2018-05-08 22:41:44 +01:00
4686daf8c2 Preserve plain-text in AST to avoid blinding extensions to it 2018-05-08 22:32:57 +01:00
c9e7183cfa Merge pull request #627 from aidantwoods/fix/hidden-blocks
Intepret special "hidden" key as an empty element
2018-05-08 22:07:51 +01:00
9eed1104e7 Intepret special "hidden" key as an empty element 2018-05-08 21:54:30 +01:00
fd95703da5 Version bump 2018-05-07 14:26:12 +01:00

View File

@ -17,7 +17,7 @@ class Parsedown
{
# ~
const version = '1.8.0-beta-1';
const version = '1.8.0-beta-5';
# ~
@ -317,9 +317,16 @@ class Parsedown
protected function extractElement(array $Component)
{
if ( ! isset($Component['element']) and isset($Component['markup']))
if ( ! isset($Component['element']))
{
$Component['element'] = array('rawHtml' => $Component['markup']);
if (isset($Component['markup']))
{
$Component['element'] = array('rawHtml' => $Component['markup']);
}
elseif (isset($Component['hidden']))
{
$Component['element'] = array();
}
}
return $Component['element'];
@ -384,6 +391,11 @@ class Parsedown
}
}
protected function blockCodeComplete($Block)
{
return $Block;
}
#
# Comment
@ -501,6 +513,11 @@ class Parsedown
return $Block;
}
protected function blockFencedCodeComplete($Block)
{
return $Block;
}
#
# Header
@ -1208,14 +1225,14 @@ class Parsedown
'element' => array(),
);
$safeText = self::escape($text, true);
$Inline['element']['rawHtml'] = preg_replace(
$Inline['element']['elements'] = self::pregReplaceElements(
$this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/',
"<br />\n",
$safeText
array(
array('name' => 'br'),
array('text' => "\n"),
),
$text
);
$Inline['element']['allowRawHtmlInSafeMode'] = true;
return $Inline;
}