Fixed #92

xdan · Oct 30, 2018 · 1a5a3b9 · 1a5a3b9
1 parent ac03edc
commit 1a5a3b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/modules/Selection.ts b/src/modules/Selection.ts
@@ -351,6 +351,19 @@ export class Select extends Component{
                             }
                         }
                     }
+
+                    if (node && !sel.isCollapsed && node.nodeType !== Node.TEXT_NODE) {
+                        let leftChild: Node | null = node, rightChild: Node | null = node;
+
+                        do {
+                            leftChild = leftChild.firstChild;
+                            rightChild = rightChild.lastChild;
+                        } while(leftChild && rightChild && leftChild.nodeType !== Node.TEXT_NODE);
+
+                        if (leftChild === rightChild && leftChild && leftChild.nodeType === Node.TEXT_NODE) {
+                            node = leftChild;
+                        }
+                    }
                 }
 
                 // check - cursor inside editor

diff --git a/test/tests/interfaceTest.js b/test/tests/interfaceTest.js
@@ -1216,8 +1216,8 @@ describe('Test interface', function() {
                         editor.selection.selectRange(range);
 
                         var bold = editor.container.querySelector('.jodit_toolbar_btn-bold');
-                        var italic = editor.container.querySelector('.jodit_toolbar_italic');
-                        var underline = editor.container.querySelector('.jodit_toolbar_underline');
+                        var italic = editor.container.querySelector('.jodit_toolbar_btn-italic');
+                        var underline = editor.container.querySelector('.jodit_toolbar_btn-underline');
 
                         expect(true).to.be.equal(bold.classList.contains('jodit_active'));
                         expect(true).to.be.equal(italic.classList.contains('jodit_active'));