Skip to content

Commit 02e09b3

Browse files
authored
Merge pull request #217 from zenoamaro/fix/font-size-inline
Remove custom inline formats in favor of native Quill modules
2 parents 214fd70 + 71070ff commit 02e09b3

File tree

3 files changed

+249
-126
lines changed

3 files changed

+249
-126
lines changed

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-quill",
3-
"version": "1.0.0-rc.2",
3+
"version": "1.0.0-rc.3",
44
"description": "The Quill rich-text editor as a React component.",
55
"author": "zenoamaro <[email protected]>",
66
"homepage": "https://github.com/zenoamaro/react-quill",
@@ -42,29 +42,29 @@
4242
],
4343
"dependencies": {
4444
"lodash": "^4.17.4",
45-
"quill": "^1.2.0"
45+
"quill": "^1.2.6"
4646
},
4747
"peerDependencies": {
4848
"react": "^0.14.0 || ^15.0.0-0"
4949
},
5050
"devDependencies": {
51-
"blanket": "^1.1.6",
52-
"chai": "^3.5.0",
53-
"chai-enzyme": "^0.6.1",
54-
"cheerio": "^0.22.0",
55-
"enzyme": "^2.7.1",
56-
"jsdom": "^9.11.0",
57-
"jsdom-global": "^2.1.1",
58-
"jshint": "^2.5.10",
59-
"mocha": "^3.2.0",
60-
"mocha-text-cov": "^0.1.0",
51+
"blanket": "^1.2.3",
52+
"chai": "^4.0.2",
53+
"chai-enzyme": "^0.7.1",
54+
"cheerio": "^1.0.0-rc.1",
55+
"enzyme": "^2.8.2",
56+
"jsdom": "^11.0.0",
57+
"jsdom-global": "^3.0.2",
58+
"jshint": "^2.9.4",
59+
"mocha": "^3.4.2",
60+
"mocha-text-cov": "^0.1.1",
6161
"react": "^0.14.0",
6262
"react-addons-test-utils": "^0.14.0",
6363
"react-dom": "^0.14.0",
6464
"should": "^4.3.0",
65-
"sinon": "^1.17.7",
65+
"sinon": "^2.3.5",
6666
"travis-cov": "^0.2.5",
67-
"uglify-js": "^2.4.15",
67+
"uglify-js": "^3.0.18",
6868
"webpack": "^1.4.13"
6969
}
7070
}

src/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ React-Quill v1.0.0
33
https://github.com/zenoamaro/react-quill
44
*/
55
var Quill = require('quill');
6-
var Parchment = Quill.import('parchment');
7-
var QuillStyle = Parchment.Attributor.Style;
8-
var styleOptions = { scope: Parchment.Scope.INLINE };
9-
Quill.register(new QuillStyle('size', 'font-size', styleOptions), true);
10-
Quill.register(new QuillStyle('font', 'font-family', styleOptions), true);
116

127
module.exports = require('./component');
138
module.exports.Quill = Quill;

0 commit comments

Comments
 (0)