X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ea62fe6004b2403c245d02a0b957f29d9c232ccd..45d08604482ff811f1627f8dc489f14b455ea75c:/resources/js/wysiwyg/plugins-tasklist.js

diff --git a/resources/js/wysiwyg/plugins-tasklist.js b/resources/js/wysiwyg/plugins-tasklist.js
index 2dd6528e1..4afbfa8e6 100644
--- a/resources/js/wysiwyg/plugins-tasklist.js
+++ b/resources/js/wysiwyg/plugins-tasklist.js
@@ -26,7 +26,7 @@ function register(editor, url) {
             editor.on('NodeChange', event => {
                 const parentListEl = event.parents.find(el => el.nodeName === 'LI');
                 const inList = parentListEl && parentListEl.classList.contains('task-list-item');
-                api.setActive(inList);
+                api.setActive(Boolean(inList));
             });
         }
     });
@@ -39,7 +39,7 @@ function register(editor, url) {
             const parentList = event.parents.find(el => el.nodeName === 'LI');
             const inTaskList = parentList && parentList.classList.contains('task-list-item');
             const inUlList = parentList && parentList.parentNode.nodeName === 'UL';
-            api.setActive(inUlList && !inTaskList);
+            api.setActive(Boolean(inUlList && !inTaskList));
         });
     };
     existingBullListButton.onAction = function() {
@@ -84,9 +84,10 @@ function register(editor, url) {
 
     // Handle checkbox click in editor
     editor.on('click', function(event) {
-        const clickedEl = event.originalTarget;
+        const clickedEl = event.target;
         if (clickedEl.nodeName === 'LI' && clickedEl.classList.contains('task-list-item')) {
             handleTaskListItemClick(event, clickedEl, editor);
+            event.preventDefault();
         }
     });
 }
@@ -156,7 +157,7 @@ function serializeTaskListNode(node) {
     }
 
     // Create & insert checkbox input element
-    const checkbox = new tinymce.html.Node.create('input', inputAttrs);
+    const checkbox = tinymce.html.Node.create('input', inputAttrs);
     checkbox.shortEnded = true;
     node.firstChild ? node.insert(checkbox, node.firstChild, true) : node.append(checkbox);
 }