Comparing version 1.0.0-beta.10 to 1.0.0-beta.11
@@ -36,3 +36,2 @@ import Parchment from 'parchment'; | ||
let target = this, index = 0; | ||
this._length = Cursor.CONTENTS.length; | ||
while (target != null && target.statics.scope !== Parchment.Scope.BLOCK_BLOT) { | ||
@@ -43,5 +42,7 @@ index += target.offset(target.parent); | ||
if (target != null) { | ||
this._length = Cursor.CONTENTS.length; | ||
target.optimize(); | ||
target.formatAt(index, Cursor.CONTENTS.length, name, value); | ||
this._length = 0; | ||
} | ||
this._length = 0; | ||
} | ||
@@ -48,0 +49,0 @@ |
@@ -0,1 +1,14 @@ | ||
# 1.0.0-beta.11 | ||
Fixed some regressive bugs from previous release. | ||
### Bug Fixes | ||
- Fix activating more than one format before typing [#841](https://github.com/quilljs/quill/issues/841) | ||
- Run default matchers before before user defined ones [#843](https://github.com/quilljs/quill/issues/843) | ||
- Fix merging theme configurations [#844](https://github.com/quilljs/quill/issues/844), [#845](845) | ||
Thanks [benbro](https://github.com/benbro), [jackmu95](https://github.com/jackmu95), and [george-norris-salesforce](https://github.com/george-norris-salesforce) for the bug reports. | ||
# 1.0.0-beta.10 | ||
@@ -2,0 +15,0 @@ |
@@ -335,3 +335,3 @@ import './polyfill'; | ||
} | ||
let themeConfig = extend(true, {}, Theme.DEFAULTS); | ||
let themeConfig = extend(true, {}, userConfig.theme.DEFAULTS); | ||
[themeConfig, userConfig].forEach(function(config) { | ||
@@ -338,0 +338,0 @@ config.modules = config.modules || {}; |
@@ -17,2 +17,13 @@ import Delta from 'rich-text/lib/delta'; | ||
const CLIPBOARD_CONFIG = [ | ||
[Node.TEXT_NODE, matchText], | ||
['br', matchBreak], | ||
[Node.ELEMENT_NODE, matchNewline], | ||
[Node.ELEMENT_NODE, matchBlot], | ||
[Node.ELEMENT_NODE, matchSpacing], | ||
[Node.ELEMENT_NODE, matchAttributor], | ||
[Node.ELEMENT_NODE, matchStyles], | ||
['b', matchAlias.bind(matchAlias, 'bold')], | ||
['i', matchAlias.bind(matchAlias, 'italic')] | ||
]; | ||
@@ -40,3 +51,3 @@ const STYLE_ATTRIBUTORS = [ | ||
this.matchers = []; | ||
this.options.matchers.forEach((pair) => { | ||
CLIPBOARD_CONFIG.concat(this.options.matchers).forEach((pair) => { | ||
this.addMatcher(...pair); | ||
@@ -123,13 +134,3 @@ }); | ||
Clipboard.DEFAULTS = { | ||
matchers: [ | ||
[Node.TEXT_NODE, matchText], | ||
['br', matchBreak], | ||
[Node.ELEMENT_NODE, matchNewline], | ||
[Node.ELEMENT_NODE, matchBlot], | ||
[Node.ELEMENT_NODE, matchSpacing], | ||
[Node.ELEMENT_NODE, matchAttributor], | ||
[Node.ELEMENT_NODE, matchStyles], | ||
['b', matchAlias.bind(matchAlias, 'bold')], | ||
['i', matchAlias.bind(matchAlias, 'italic')] | ||
] | ||
matchers: [] | ||
}; | ||
@@ -136,0 +137,0 @@ |
{ | ||
"name": "quill", | ||
"version": "1.0.0-beta.10", | ||
"version": "1.0.0-beta.11", | ||
"description": "Cross browser rich text editor", | ||
@@ -5,0 +5,0 @@ "author": "Jason Chen <jhchen7@gmail.com>", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
633148
14033