Replace SimpleMDE with custom Markdown editor

9 files changed, 9 insertions, 44 deletions

diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index fac56db3..72fd40de 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -13,7 +13,7 @@
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
     <?= $this->form->label(t('Description'), 'description') ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/column/create.php b/app/Template/column/create.php
index 812e9139..71c94062 100644
--- a/app/Template/column/create.php
+++ b/app/Template/column/create.php
@@ -16,7 +16,7 @@
     <?= $this->form->checkbox('hide_in_dashboard', t('Hide tasks in this column in the dashboard'), 1) ?>
 
     <?= $this->form->label(t('Description'), 'description') ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
index 89487298..a72a5c84 100644
--- a/app/Template/column/edit.php
+++ b/app/Template/column/edit.php
@@ -18,7 +18,7 @@
     <?= $this->form->checkbox('hide_in_dashboard', t('Hide tasks in this column in the dashboard'), 1, $values['hide_in_dashboard'] == 1) ?>
 
     <?= $this->form->label(t('Description'), 'description') ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 0358107a..02cb48eb 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -6,20 +6,7 @@
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
 
-    <div class="markdown-editor-small">
-        <?= $this->form->textarea(
-            'comment',
-            $values,
-            $errors,
-            array(
-                'autofocus',
-                'required',
-                'placeholder="'.t('Leave a comment').'"',
-                'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"',
-            ),
-            'markdown-editor'
-        ) ?>
-    </div>
+    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index f69fc0c1..f295c8a7 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -3,21 +3,12 @@
 </div>
 
 <form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
 
-    <div class="markdown-editor-small">
-        <?= $this->form->textarea(
-            'comment',
-            $values,
-            $errors,
-            array('autofocus', 'required', 'placeholder="'.t('Leave a comment').'"'),
-            'markdown-editor'
-        ) ?>
-    </div>
+    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/comments/create.php b/app/Template/comments/create.php
index 3fa6ddc0..06173575 100644
--- a/app/Template/comments/create.php
+++ b/app/Template/comments/create.php
@@ -3,20 +3,7 @@
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
 
-    <div class="markdown-editor-small">
-        <?= $this->form->textarea(
-            'comment',
-            $values,
-            $errors,
-            array(
-                'data-markdown-editor-disable-toolbar="true"',
-                'required',
-                'placeholder="'.t('Leave a comment').'"',
-                'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"',
-            ),
-            'markdown-editor'
-        ) ?>
-    </div>
+    <?= $this->form->textEditor('comment', $values, $errors, array('required' => true)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/project_edit/description.php b/app/Template/project_edit/description.php
index f7e7be46..586ddfcb 100644
--- a/app/Template/project_edit/description.php
+++ b/app/Template/project_edit/description.php
@@ -11,7 +11,7 @@
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('name', $values) ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors, array('autofocus' => true)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/swimlane/create.php b/app/Template/swimlane/create.php
index f5aa1591..0eb25411 100644
--- a/app/Template/swimlane/create.php
+++ b/app/Template/swimlane/create.php
@@ -10,7 +10,7 @@
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
     <?= $this->form->label(t('Description'), 'description') ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index b10cdd52..2cbabb60 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -13,7 +13,7 @@
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
     <?= $this->form->label(t('Description'), 'description') ?>
-    <?= $this->form->textarea('description', $values, $errors, array(), 'markdown-editor') ?>
+    <?= $this->form->textEditor('description', $values, $errors) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>