From f88cd44d5254581bae0d4c3020f48ccc1d23b891 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Mon, 24 Jul 2017 16:35:54 +0800
Subject: [PATCH] fix #577 fix #581

---
 admin/js/hyperdown.js | 12 +++++++++---
 var/HyperDown.php     | 13 ++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/admin/js/hyperdown.js b/admin/js/hyperdown.js
index 436fc4a9..0ab078aa 100644
--- a/admin/js/hyperdown.js
+++ b/admin/js/hyperdown.js
@@ -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;
     };
diff --git a/var/HyperDown.php b/var/HyperDown.php
index a8c549cb..a3af0321 100644
--- a/var/HyperDown.php
+++ b/var/HyperDown.php
@@ -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;