Skip to content

Commit 6a46275

Browse files
committed
Updating all packages to latest
1 parent 2eb844f commit 6a46275

File tree

4 files changed

+56
-61
lines changed

4 files changed

+56
-61
lines changed

.babelrc

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"stage": 0,
3-
"optional": "runtime",
4-
"loose": "all",
2+
"presets": [
3+
"es2015",
4+
"react"
5+
],
56
"plugins": [
6-
"typecheck"
7+
"typecheck",
8+
"transform-runtime"
79
]
810
}

.eslintrc

+2-11
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,8 @@
66
"node": true
77
},
88
"rules": {
9-
"react/jsx-uses-react": 2,
10-
"react/jsx-uses-vars": 2,
11-
"react/react-in-jsx-scope": 2,
12-
"comma-dangle": 0, // not sure why airbnb turned this on. gross!
13-
"indent": [2, 2, {"SwitchCase": 1}],
14-
"spaced-comment": 0,
15-
16-
//Temporarirly disabled due to a possible bug in babel-eslint (todomvc example)
17-
"block-scoped-var": 0,
18-
// Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
19-
"padded-blocks": 0
9+
"max-len": [2, 200, 2],
10+
"consistent-return": 0,
2011
},
2112
"plugins": [
2213
"react"

package.json

+25-21
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "react-pdfjs",
3-
"version": "1.0.6",
2+
"name": "react-pdf-js",
3+
"version": "1.0.0",
44
"description": "A React component to wrap PDF.js",
55
"main": "./lib/index.js",
66
"jsnext:main": "./src/index.js",
77
"repository": {
88
"type": "git",
9-
"url": "https://github.com/erikras/react-pdfjs"
9+
"url": "https://github.com/mikecousins/react-pdfjs"
1010
},
1111
"scripts": {
1212
"build": "npm run build:lib && npm run build:umd && npm run build:umd:min",
@@ -23,30 +23,34 @@
2323
"pdf",
2424
"pdfjs"
2525
],
26-
"author": "Erik Rasmussen <rasmussenerik@gmail.com> (http://github.com/erikras)",
26+
"author": "Mike Cousins <mike@mikecousins.com> (http://github.com/mikecousins)",
2727
"license": "MIT",
2828
"bugs": {
29-
"url": "https://github.com/erikras/react-pdfjs/issues"
29+
"url": "https://github.com/mikecousins/react-pdfjs/issues"
3030
},
31-
"homepage": "https://github.com/erikras/react-pdfjs",
31+
"homepage": "https://github.com/mikecousins/react-pdfjs",
3232
"dependencies": {
33-
"pdfjs-dist": "1.3.78"
33+
"pdfjs-dist": "1.4.237"
3434
},
3535
"devDependencies": {
36-
"babel": "^5.8.23",
37-
"babel-core": "^5.8.25",
38-
"babel-eslint": "^4.1.3",
39-
"babel-loader": "^5.3.2",
40-
"babel-plugin-react-transform": "^1.1.1",
41-
"babel-plugin-typecheck": "^1.3.0",
42-
"babel-runtime": "^5.8.25",
43-
"eslint": "^1.9.0",
44-
"eslint-config-airbnb": "^0.1.0",
45-
"eslint-plugin-react": "^3.5.1",
46-
"react": "^0.14.0",
47-
"rifraf": "^2.0.2",
48-
"rimraf": "^2.4.3",
49-
"webpack": "^1.12.3"
36+
"babel-cli": "6.7.5",
37+
"babel-core": "6.7.6",
38+
"babel-eslint": "6.0.2",
39+
"babel-loader": "6.2.4",
40+
"babel-plugin-react-transform": "2.0.2",
41+
"babel-plugin-transform-runtime": "6.7.5",
42+
"babel-plugin-typecheck": "3.8.0",
43+
"babel-preset-es2015": "6.6.0",
44+
"babel-preset-react": "6.5.0",
45+
"babel-runtime": "6.6.1",
46+
"eslint": "2.7.0",
47+
"eslint-config-airbnb": "7.0.0",
48+
"eslint-plugin-react": "4.3.0",
49+
"eslint-plugin-jsx-a11y": "0.6.2",
50+
"react": "15.0.1",
51+
"rifraf": "2.0.2",
52+
"rimraf": "2.5.2",
53+
"webpack": "1.12.15"
5054
},
5155
"npmName": "react-pdfjs",
5256
"npmFileMap": [

src/Pdf.js

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,48 @@
1-
import React, {Component, PropTypes} from 'react';
1+
import React from 'react';
22

33
if (typeof window !== 'undefined') {
44
require('pdfjs-dist/build/pdf.combined');
55
}
66

7-
class Pdf extends Component {
7+
class Pdf extends React.Component {
88
constructor(props) {
99
super(props);
1010
this.onDocumentComplete = this.onDocumentComplete.bind(this);
1111
this.onPageComplete = this.onPageComplete.bind(this);
1212
}
1313

14-
state = {};
15-
1614
componentDidMount() {
1715
this.loadPDFDocument(this.props);
1816
this.renderPdf();
1917
}
2018

2119
componentWillReceiveProps(newProps) {
22-
const {pdf} = this.state;
20+
const { pdf } = this.state;
2321
if ((newProps.file && newProps.file !== this.props.file) ||
2422
(newProps.content && newProps.content !== this.props.content)) {
2523
this.loadPDFDocument(newProps);
2624
}
2725

2826
if (pdf && ((newProps.page && newProps.page !== this.props.page) ||
2927
(newProps.scale && newProps.scale !== this.props.scale))) {
30-
this.setState({page: null});
28+
this.setState({ page: null });
3129
pdf.getPage(newProps.page).then(this.onPageComplete);
3230
}
3331
}
3432

3533
onDocumentComplete(pdf) {
36-
this.setState({pdf: pdf});
37-
const {onDocumentComplete} = this.props;
34+
this.setState({ pdf });
35+
const { onDocumentComplete } = this.props;
3836
if (typeof onDocumentComplete === 'function') {
3937
onDocumentComplete(pdf.numPages);
4038
}
4139
pdf.getPage(this.props.page).then(this.onPageComplete);
4240
}
4341

4442
onPageComplete(page) {
45-
this.setState({page: page});
43+
this.setState({ page });
4644
this.renderPdf();
47-
const {onPageComplete} = this.props;
45+
const { onPageComplete } = this.props;
4846
if (typeof onPageComplete === 'function') {
4947
onPageComplete(page.pageIndex + 1);
5048
}
@@ -79,37 +77,37 @@ class Pdf extends Component {
7977
}
8078

8179
renderPdf() {
82-
const {page} = this.state;
80+
const { page } = this.state;
8381
if (page) {
84-
let {canvas} = this.refs;
82+
let { canvas } = this.refs;
8583
if (canvas.getDOMNode) { // compatible with react 0.13
8684
canvas = canvas.getDOMNode();
8785
}
8886
const canvasContext = canvas.getContext('2d');
89-
const {scale} = this.props;
87+
const { scale } = this.props;
9088
const viewport = page.getViewport(scale);
9189
canvas.height = viewport.height;
9290
canvas.width = viewport.width;
93-
page.render({canvasContext, viewport});
91+
page.render({ canvasContext, viewport });
9492
}
9593
}
9694

9795
render() {
98-
const {loading} = this.props;
99-
const {page} = this.state;
100-
return page ? <canvas ref="canvas"/> : loading || <div>Loading PDF...</div>;
96+
const { loading } = this.props;
97+
const { page } = this.state;
98+
return page ? <canvas ref="canvas" /> : loading || <div>Loading PDF...</div>;
10199
}
102100
}
103101
Pdf.displayName = 'React-PDFjs';
104102
Pdf.propTypes = {
105-
content: PropTypes.string,
106-
file: PropTypes.string,
107-
loading: PropTypes.any,
108-
page: PropTypes.number,
109-
scale: PropTypes.number,
110-
onDocumentComplete: PropTypes.func,
111-
onPageComplete: PropTypes.func
103+
content: React.PropTypes.string,
104+
file: React.PropTypes.string,
105+
loading: React.PropTypes.any,
106+
page: React.PropTypes.number,
107+
scale: React.PropTypes.number,
108+
onDocumentComplete: React.PropTypes.func,
109+
onPageComplete: React.PropTypes.func,
112110
};
113-
Pdf.defaultProps = {page: 1, scale: 1.0};
111+
Pdf.defaultProps = { page: 1, scale: 1.0 };
114112

115113
export default Pdf;

0 commit comments

Comments
 (0)