Skip to content

Commit

Permalink
static getter added to mergeble method (#1422)
Browse files Browse the repository at this point in the history
* static getter added to mergable method

* build production bundle

* Changelog added
  • Loading branch information
robonetphy committed Nov 10, 2020
1 parent e477621 commit b134fcc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dist/editor.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

### 2.19.1

- `Fix` - The problem with destroy() method [#1380](https://github.com/codex-team/editor.js/issues/1380)
- `Fix` - The problem with destroy() method [#1380](https://github.com/codex-team/editor.js/issues/1380).
- `Fix` - add getter keyword to `block.mergeable` method [#1415](https://github.com/codex-team/editor.js/issues/1415).


### 2.19

Expand Down
2 changes: 1 addition & 1 deletion src/components/block/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ export default class Block {
*
* @returns {boolean}
*/
public mergeable(): boolean {
public get mergeable(): boolean {
return _.isFunction(this.tool.merge);
}

Expand Down

0 comments on commit b134fcc

Please sign in to comment.