Skip to content

Commit

Permalink
Merge pull request zenoamaro#217 from zenoamaro/fix/font-size-inline
Browse files Browse the repository at this point in the history
Remove custom inline formats in favor of native Quill modules
  • Loading branch information
alexkrolick authored Jun 21, 2017
2 parents 214fd70 + 71070ff commit 02e09b3
Show file tree
Hide file tree
Showing 3 changed files with 249 additions and 126 deletions.
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-quill",
"version": "1.0.0-rc.2",
"version": "1.0.0-rc.3",
"description": "The Quill rich-text editor as a React component.",
"author": "zenoamaro <[email protected]>",
"homepage": "https://github.com/zenoamaro/react-quill",
Expand Down Expand Up @@ -42,29 +42,29 @@
],
"dependencies": {
"lodash": "^4.17.4",
"quill": "^1.2.0"
"quill": "^1.2.6"
},
"peerDependencies": {
"react": "^0.14.0 || ^15.0.0-0"
},
"devDependencies": {
"blanket": "^1.1.6",
"chai": "^3.5.0",
"chai-enzyme": "^0.6.1",
"cheerio": "^0.22.0",
"enzyme": "^2.7.1",
"jsdom": "^9.11.0",
"jsdom-global": "^2.1.1",
"jshint": "^2.5.10",
"mocha": "^3.2.0",
"mocha-text-cov": "^0.1.0",
"blanket": "^1.2.3",
"chai": "^4.0.2",
"chai-enzyme": "^0.7.1",
"cheerio": "^1.0.0-rc.1",
"enzyme": "^2.8.2",
"jsdom": "^11.0.0",
"jsdom-global": "^3.0.2",
"jshint": "^2.9.4",
"mocha": "^3.4.2",
"mocha-text-cov": "^0.1.1",
"react": "^0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-dom": "^0.14.0",
"should": "^4.3.0",
"sinon": "^1.17.7",
"sinon": "^2.3.5",
"travis-cov": "^0.2.5",
"uglify-js": "^2.4.15",
"uglify-js": "^3.0.18",
"webpack": "^1.4.13"
}
}
5 changes: 0 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ React-Quill v1.0.0
https://github.com/zenoamaro/react-quill
*/
var Quill = require('quill');
var Parchment = Quill.import('parchment');
var QuillStyle = Parchment.Attributor.Style;
var styleOptions = { scope: Parchment.Scope.INLINE };
Quill.register(new QuillStyle('size', 'font-size', styleOptions), true);
Quill.register(new QuillStyle('font', 'font-family', styleOptions), true);

module.exports = require('./component');
module.exports.Quill = Quill;
Expand Down
Loading

0 comments on commit 02e09b3

Please sign in to comment.