From b0a2fe9f16101a0ec1c1e9be1c615aa200b597a4 Mon Sep 17 00:00:00 2001 From: luzhongfang Date: Sun, 28 Jan 2018 23:39:01 +0800 Subject: [PATCH 1/3] misc: if before cursor is a contentEditable=false element, set the range to nextSibling --- src/js/selection.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/js/selection.js b/src/js/selection.js index 34deaac15..b1e297705 100644 --- a/src/js/selection.js +++ b/src/js/selection.js @@ -213,6 +213,11 @@ range = this.importSelectionMoveCursorPastAnchor(selectionState, range); } + if (range.commonAncestorContainer.contentEditable == 'false') { + range.setStart(range.commonAncestorContainer.nextSibling, 0); + range.collapse(true); + } + this.selectRange(doc, range); }, From 27515544a0d1219604023e8a0e46c4d98f518c65 Mon Sep 17 00:00:00 2001 From: luzhongfang Date: Tue, 30 Jan 2018 19:27:46 +0800 Subject: [PATCH 2/3] misc: set == to === --- src/js/selection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/selection.js b/src/js/selection.js index b1e297705..19540cc4c 100644 --- a/src/js/selection.js +++ b/src/js/selection.js @@ -213,7 +213,7 @@ range = this.importSelectionMoveCursorPastAnchor(selectionState, range); } - if (range.commonAncestorContainer.contentEditable == 'false') { + if (range.commonAncestorContainer.contentEditable === 'false') { range.setStart(range.commonAncestorContainer.nextSibling, 0); range.collapse(true); } From 507db5b38793a838473fc4130cb88504bdcf0444 Mon Sep 17 00:00:00 2001 From: luzhongfang Date: Tue, 30 Jan 2018 19:31:21 +0800 Subject: [PATCH 3/3] misc: fix space --- src/js/selection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/selection.js b/src/js/selection.js index 19540cc4c..cae1de92e 100644 --- a/src/js/selection.js +++ b/src/js/selection.js @@ -214,8 +214,8 @@ } if (range.commonAncestorContainer.contentEditable === 'false') { - range.setStart(range.commonAncestorContainer.nextSibling, 0); - range.collapse(true); + range.setStart(range.commonAncestorContainer.nextSibling, 0); + range.collapse(true); } this.selectRange(doc, range);