fix: fixed Markdown editor mode, closes #1674

thorsten · Mar 21, 2020 · 3fa1173 · 3fa1173
1 parent 9a8c611
commit 3fa1173
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 25 deletions.
diff --git a/phpmyfaq/admin/ajax.markdown.php b/phpmyfaq/admin/ajax.markdown.php
@@ -26,7 +26,6 @@
 
 $answer = Filter::filterInput(INPUT_POST, 'text', FILTER_SANITIZE_STRING);
 $http = new HttpHelper();
-$http->setContentType('application/json');
 $http->addHeader();
 
 $parsedown = new ParsedownExtra();

diff --git a/phpmyfaq/admin/assets/js/record.js b/phpmyfaq/admin/assets/js/record.js
@@ -237,7 +237,7 @@ document.addEventListener('DOMContentLoaded', () => {
   $(function() {
     // set the textarea to its previous height
     const answerHeight = localStorage.getItem('textarea.answer.height'),
-      answer = $('#answer');
+      answer = $('#answer-markdown');
 
     if (answerHeight !== 'undefined') {
       answer.height(answerHeight);
@@ -254,8 +254,13 @@ document.addEventListener('DOMContentLoaded', () => {
       .on('click', function() {
         if ($(this).attr('data-markdown-tab') === 'preview') {
           $('.markdown-preview').height(answer.height());
-          $.post('index.php?action=ajax&ajax=markdown', { text: answer.val() }, function(result) {
-            $('.markdown-preview').html(result);
+          $.ajax({
+            type: 'POST',
+            url: 'index.php?action=ajax&ajax=markdown',
+            data: 'text=' + answer.val(),
+            success: data => {
+              $('.markdown-preview').html(data);
+            },
           });
         }
       });

diff --git a/phpmyfaq/admin/footer.php b/phpmyfaq/admin/footer.php
@@ -86,7 +86,7 @@
               // General options
               mode: 'exact',
               language: '<?=(Language::isASupportedTinyMCELanguage($faqLangCode) ? $faqLangCode : 'en') ?>',
-              elements: '<?= ('add-news' == $action || 'edit-news' == $action) ? 'news' : 'answer' ?>',
+              selector: 'textarea#<?= ('add-news' == $action || 'edit-news' == $action) ? 'news' : 'answer' ?>',
               theme: 'modern',
               plugins: [
                 'advlist autolink lists link image charmap print preview hr anchor pagebreak',

diff --git a/phpmyfaq/admin/record.edit.php b/phpmyfaq/admin/record.edit.php
@@ -367,27 +367,30 @@ class="form-control form-control-lg"
                                 <?php endif; ?>
                                 <?php if ($faqConfig->get('main.enableMarkdownEditor')): ?>
                                     <div class="form-group row">
-                                        <div class="col-lg-12">
-                                            <ul class="nav nav-tabs markdown-tabs">
-                                                <li class="active"><a data-toggle="tab" href="#text">Text</a></li>
-                                                <li><a data-toggle="tab" href="#preview" data-markdown-tab="preview">Preview</a>
-                                                </li>
-                                            </ul>
-                                            <div class="tab-content">
-                                                <div class="tab-pane active" id="text">
-                                                    <div class="form-group row">
-                                                        <div class="col-lg-12">
-                                    <textarea id="answer" name="answer" class="form-control" rows="7"
-                                              placeholder="<?= $PMF_LANG['ad_entry_content'] ?>"><?= $faqData['content'] ?></textarea>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="tab-pane" id="preview">
-                                                    <article class="markdown-preview">
-                                                    </article>
-                                                </div>
+                                      <div class="col-lg-12">
+                                        <ul class="nav nav-tabs markdown-tabs mb-2">
+                                          <li class="nav-item">
+                                            <a class="nav-link active" data-toggle="tab" href="#text">Text</a>
+                                          </li>
+                                          <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#preview" data-markdown-tab="preview">Preview</a>
+                                          </li>
+                                        </ul>
+                                        <div class="tab-content">
+                                          <div class="tab-pane active" id="text">
+                                            <div class="form-group row">
+                                              <div class="col-lg-12">
+                                                <textarea id="answer-markdown" name="answer" class="form-control"
+                                                          rows="7" placeholder="<?= $PMF_LANG['ad_entry_content'] ?>"
+                                                ><?= $faqData['content'] ?></textarea>
+                                              </div>
                                             </div>
+                                          </div>
+                                          <div class="tab-pane" id="preview">
+                                            <article class="markdown-preview"></article>
+                                          </div>
                                         </div>
+                                      </div>
                                     </div>
                                 <?php endif; ?>
                             </div>

diff --git a/phpmyfaq/assets/src/editor.js b/phpmyfaq/assets/src/editor.js
@@ -22,7 +22,7 @@ $(document).ready(function() {
       // General options
       mode: 'exact',
       language: 'en',
-      elements: 'answer',
+      selector: 'textarea#answer',
       theme: 'modern',
       plugins: [
         'advlist autolink lists link image charmap print preview hr anchor pagebreak',