dont allow checklist changes when disabled

jaredly · Aug 8, 2018 · 6b6a4f7 · 6b6a4f7
1 parent b60b0c2
commit 6b6a4f7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/assets/core.styl b/assets/core.styl
@@ -20,10 +20,12 @@ resets(arr)
 .ql-container.ql-disabled
   .ql-tooltip
     visibility: hidden
-  .ql-editor
-    li[data-list="checked"]:before,
-    li[data-list="unchecked"]:before
-      pointer-events: none
+
+.ql-container:not(.ql-disabled)
+  li[data-list=checked],
+  li[data-list=unchecked]
+    > .ql-ui
+      cursor: pointer
 
 .ql-clipboard
   left: -100000px
@@ -78,8 +80,6 @@ resets(arr)
   li[data-list=unchecked]
     > .ql-ui
       color: #777
-      cursor: pointer
-      pointer-events: all
 
   li[data-list=bullet] > .ql-ui:before
     content: '\2022'

diff --git a/blots/scroll.js b/blots/scroll.js
@@ -91,6 +91,10 @@ class Scroll extends ScrollBlot {
     }
   }
 
+  isEnabled() {
+    return this.domNode.getAttribute('contenteditable') === 'true';
+  }
+
   leaf(index) {
     return this.path(index).pop() || [null, -1];
   }

diff --git a/core/quill.js b/core/quill.js
@@ -340,7 +340,7 @@ class Quill {
   }
 
   isEnabled() {
-    return !this.container.classList.contains('ql-disabled');
+    return this.scroll.isEnabled();
   }
 
   off(...args) {

diff --git a/formats/list.js b/formats/list.js
@@ -25,6 +25,7 @@ class ListItem extends Block {
     super(scroll, domNode);
     const ui = domNode.ownerDocument.createElement('span');
     const listEventHandler = () => {
+      if (!scroll.isEnabled()) return;
       const format = this.statics.formats(domNode, scroll);
       if (format === 'checked') {
         this.format('list', 'unchecked');