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

improve consistency

Browse Source
This commit is contained in:
Emanuil Rusev 2014-09-22 02:36:42 +03:00
parent e0965ce09b
commit 59c77e706b
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Parsedown.php
View File

@ -59,11 +59,6 @@ class Parsedown
private $breaksEnabled; private $breaksEnabled;
/**
* @var boolean If true HTML is escaped
*/
private $noMarkup = false;
function setBreaksEnabled($breaksEnabled) function setBreaksEnabled($breaksEnabled)
{ {
$this->breaksEnabled = $breaksEnabled; $this->breaksEnabled = $breaksEnabled;
@ -71,15 +66,11 @@ class Parsedown
return $this; return $this;
} }
/** private $markupEscaped;
* Set the `noMarkup` option
* function setMarkupEscaped($markupEscaped)
* @param boolean $noMarkup If true HTML is escaped
* @return $this
*/
function setNoMarkup($noMarkup)
{ {
$this->noMarkup = (bool) $noMarkup; $this->markupEscaped = $markupEscaped;
return $this; return $this;
} }
@ -637,9 +628,9 @@ class Parsedown
protected function identifyMarkup($Line) protected function identifyMarkup($Line)
{ {
if ($this->noMarkup) if ($this->markupEscaped)
{ {
return null; return;
} }
if (preg_match('/^<(\w[\w\d]*)(?:[ ][^>]*)?(\/?)[ ]*>/', $Line['text'], $matches)) if (preg_match('/^<(\w[\w\d]*)(?:[ ][^>]*)?(\/?)[ ]*>/', $Line['text'], $matches))
@ -1167,9 +1158,9 @@ class Parsedown
protected function identifyTag($Excerpt) protected function identifyTag($Excerpt)
{ {
if ($this->noMarkup) if ($this->markupEscaped)
{ {
return null; return;
} }
if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<\/?\w.*?>/', $Excerpt['text'], $matches)) if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<\/?\w.*?>/', $Excerpt['text'], $matches))

2
test/Test.php
View File

@ -101,7 +101,7 @@ MARKDOWN_WITH_MARKUP;
<p>&lt;/style></p> <p>&lt;/style></p>
EXPECTED_HTML; EXPECTED_HTML;
$parsedownWithNoMarkup = new Parsedown(); $parsedownWithNoMarkup = new Parsedown();
$parsedownWithNoMarkup->setNoMarkup(true); $parsedownWithNoMarkup->setMarkupEscaped(true);
$this->assertEquals($expectedHtml, $parsedownWithNoMarkup->text($markdownWithHtml)); $this->assertEquals($expectedHtml, $parsedownWithNoMarkup->text($markdownWithHtml));
} }
} }