Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Issue 869 #963

Merged
merged 3 commits into from
Nov 30, 2019
+7 −2
Merged

[Fix] Issue 869 #963

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bd2407
Issue 869
Nov 29, 2019
039cf99
Merge branch 'release/2.16' of github.com:codex-team/editor.js into f…
Nov 30, 2019
dfc96e4
Merge branch 'release/2.16' of github.com:codex-team/editor.js into f…
Nov 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/editor.js
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

- `Improvements` — Inline Toolbar design improved
- `Improvements` — Conversion Toolbar now included in the Inline Toolbar [#853](https://github.com/codex-team/editor.js/issues/853)
— `New` *API* — Block [lifecycle hooks](tools.md#block-lifecycle-hooks)
- `Fix` — On selection from end to start backspace is working as expected now [#869](https://github.com/codex-team/editor.js/issues/869)

### 2.15.1

5 changes: 4 additions & 1 deletion src/components/modules/blockEvents.ts
View file
Original file line number Diff line number Diff line change
@@ -374,7 +374,10 @@ export default class BlockEvents extends Module {
}

const isFirstBlock = BlockManager.currentBlockIndex === 0;
const canMergeBlocks = Caret.isAtStart && currentBlock.currentInput === currentBlock.firstInput && !isFirstBlock;
const canMergeBlocks = Caret.isAtStart &&
SelectionUtils.isCollapsed &&
currentBlock.currentInput === currentBlock.firstInput &&
!isFirstBlock;

if (canMergeBlocks) {
/**