Merge pull request #18 from Chaosmeister/master

enable "URL-Rewriting" enabled instances to use checkboxes
add html validation

Author: Chaosmeister

Diff for: Assets/js/checkbox.js

@@ -1,32 +1,31 @@
-KB.on('dom.ready', function() {
+KB.on('dom.ready', function () {
     const urlParams = new URLSearchParams(window.location.search);
-    if ((urlParams.get('controller') == "TaskViewController" && urlParams.get('action') == 'show') || /\/task\/[0-9]+$/.test(window.location)) {
-        var Content = document.getElementsByClassName('sidebar-content')[0];
 
-        const elements = [...Content.getElementsByTagName('input')];
-        var checkboxes = elements.filter(input=>input.type == 'checkbox');
-        const matches = [...Content.innerHTML.matchAll(RegExp('(<input type="checkbox")|(\\[[xX ]\\])', 'gm'))];
-
-        var count = 0;
-        var currentCheckbox = 0;
-        for (const match of matches) {
-            ++count;
-            if (match[1] !== undefined) {
-                var checkbox = checkboxes[currentCheckbox];
-                checkbox.setAttribute('class', 'activecheckbox');
-                checkbox.setAttribute('number', count);
-                ++currentCheckbox;
-            }
-        }
+    let URLRewrite = /\/task\/[0-9]+$/.test(window.location);
+    if ((urlParams.get('controller') == "TaskViewController" && urlParams.get('action') == 'show') ||
+        URLRewrite) { // for activated URL-Rewrite
 
         KB.onClick('.activecheckbox', ToggleActiveCheckbox, !0);
 
         function ToggleActiveCheckbox(e) {
             const urlParams = new URLSearchParams(window.location.search);
 
-            const link = '?controller=CheckboxController&action=toggle&plugin=MarkdownPlus';
+            var task_id = null;
+            var taskIdElem = document.getElementById('form-task_id');
+            if (taskIdElem != null) {
+                task_id = taskIdElem.value;
+            }
+
+            let link = "";
+            if (URLRewrite) {
+                link = '/MarkdownPlus/Checkbox';
+            }
+            else {
+                link = '?controller=CheckboxController&action=toggle&plugin=MarkdownPlus';
+            }
+            
             KB.http.postJson(link, {
-                'task_id': urlParams.get('task_id'),
+                'task_id': task_id,
                 'number': e.target.getAttribute('number')
             });
         }

Diff for: Plugin.php

@@ -3,7 +3,6 @@
 namespace Kanboard\Plugin\MarkdownPlus;
 
 use Kanboard\Core\Plugin\Base;
-use Kanboard\Plugin\MarkdownPlus\Helper\MarkdownPlusHelper;
 
 class Plugin extends Base
 

Diff for: vendor/erusev/parsedown-extra/ParsedownExtra.php

@@ -629,6 +629,17 @@ protected function processTag($elementMarkup) # recursive
 
         # http://stackoverflow.com/q/4879946/200145
         $DOMDocument->loadHTML($elementMarkup);
+        
+        if (!$DOMDocument->validate()) {
+            $errormessage = 'could not parse html<br>';
+            $errors = libxml_get_errors();
+            foreach ($errors as $error) {
+                $errormessage .= $error->message;
+                $errormessage .= '<br>';
+            }
+            return $errormessage;
+        }
+
         $DOMDocument->removeChild($DOMDocument->doctype);
         $DOMDocument->replaceChild($DOMDocument->firstChild->firstChild->firstChild, $DOMDocument->firstChild);
 

Diff for: vendor/leblanc-simon/parsedown-checkbox/ParsedownCheckbox.php

@@ -11,6 +11,7 @@
 class ParsedownCheckbox extends ParsedownExtra
 {
     const VERSION = '0.0.4';
+    private static $count = 1;
 
     public function __construct()
     {
@@ -73,7 +74,7 @@ protected function checkboxUnchecked($text)
             $text = self::escape($text);
         }
 
-        return '<input type="checkbox" class="activeCheckBox"/> ' . $this->format($text);
+        return '<input type="checkbox" class="activecheckbox" number="'. ParsedownCheckbox::$count++ .'"/> ' . $this->format($text);
     }
 
     protected function checkboxChecked($text)
@@ -82,7 +83,7 @@ protected function checkboxChecked($text)
             $text = self::escape($text);
         }
 
-        return '<input type="checkbox" class="activeCheckBox" checked/> ' . $this->format($text);
+        return '<input type="checkbox" class="activecheckbox" number="'. ParsedownCheckbox::$count++ .'" checked/> ' . $this->format($text);
     }
 
     /**