fix eslint

Author: afc163

examples/customRequest.js

@@ -35,6 +35,7 @@ const uploadProps = {
     withCredentials,
   }) {
     // EXAMPLE: post form-data with 'axios'
+    // eslint-disable-next-line no-undef
     const formData = new FormData();
     if (data) {
       Object.keys(data).forEach(key => {

examples/directoryUpload.js

@@ -19,7 +19,6 @@ class Test extends React.Component {
       },
       onStart: (file) => {
         console.log('onStart', file.name);
-        // this.refs.inner.abort(file);
       },
       onSuccess(file) {
         console.log('onSuccess', file);
@@ -40,7 +39,7 @@ class Test extends React.Component {
     >
 
       <div>
-        <Upload {...this.uploaderProps} ref="inner"><a>开始上传</a></Upload>
+        <Upload {...this.uploaderProps}><a>开始上传</a></Upload>
       </div>
 
     </div>);

examples/drag.js

@@ -4,32 +4,27 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import Upload from 'rc-upload';
 
-class Test extends React.Component {
-  render() {
-    const props = {
-      action: '/upload.do',
-      type: 'drag',
-      accept: '.png',
-      beforeUpload(file) {
-        console.log('beforeUpload', file.name);
-      },
-      onStart: (file) => {
-        console.log('onStart', file.name);
-      },
-      onSuccess(file) {
-        console.log('onSuccess', file);
-      },
-      onProgress(step, file) {
-        console.log('onProgress', Math.round(step.percent), file.name);
-      },
-      onError(err) {
-        console.log('onError', err);
-      },
-      style: { display: 'inline-block', width: 200, height: 200, background: '#eee' },
-      // openFileDialogOnClick: false
-    };
-    return <Upload {...props} />;
-  }
-}
+const props = {
+  action: '/upload.do',
+  type: 'drag',
+  accept: '.png',
+  beforeUpload(file) {
+    console.log('beforeUpload', file.name);
+  },
+  onStart: (file) => {
+    console.log('onStart', file.name);
+  },
+  onSuccess(file) {
+    console.log('onSuccess', file);
+  },
+  onProgress(step, file) {
+    console.log('onProgress', Math.round(step.percent), file.name);
+  },
+  onError(err) {
+    console.log('onError', err);
+  },
+  style: { display: 'inline-block', width: 200, height: 200, background: '#eee' },
+  // openFileDialogOnClick: false
+};
 
-ReactDOM.render(<Test />, document.getElementById('__react-content'));
+ReactDOM.render(<Upload {...props} />, document.getElementById('__react-content'));

examples/simple.js

@@ -24,7 +24,6 @@ class Test extends React.Component {
       },
       onStart: (file) => {
         console.log('onStart', file.name);
-        // this.refs.inner.abort(file);
       },
       onSuccess(file) {
         console.log('onSuccess', file);
@@ -61,7 +60,7 @@ class Test extends React.Component {
       </style>
 
       <div>
-        <Upload {...this.uploaderProps} ref="inner"><a>开始上传</a></Upload>
+        <Upload {...this.uploaderProps}><a>开始上传</a></Upload>
       </div>
 
       <h2>滚动</h2>

examples/transformFile.js

@@ -24,6 +24,7 @@ const uploadProps = {
   },
   transformFile(file) {
     return new Promise((resolve) => {
+      // eslint-disable-next-line no-undef
       const reader = new FileReader();
       reader.readAsDataURL(file);
       reader.onload = () => {

package.json

@@ -30,8 +30,8 @@
     "build": "rc-tools run build",
     "gh-pages": "rc-tools run gh-pages",
     "start": "node server",
-    "compile": "rc-tools run compile --babel-runtime",
-    "pub": "rc-tools run pub --babel-runtime",
+    "compile": "rc-tools run compile",
+    "pub": "rc-tools run pub",
     "lint": "rc-tools run lint",
     "test": "jest --setupTestFrameworkScriptFile=raf/polyfill",
     "coverage": "jest --coverage && cat ./coverage/lcov.info | coveralls"
@@ -46,17 +46,16 @@
     "jest": "^20.0.1",
     "pre-commit": "1.x",
     "raf": "^3.4.0",
-    "rc-tools": "6.x",
+    "rc-tools": "8.x",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "sinon": "9.0.2",
+    "sinon": "^9.0.2",
     "vinyl-fs": "^3.0.3"
   },
   "pre-commit": [
     "lint"
   ],
   "dependencies": {
-    "babel-runtime": "6.x",
     "classnames": "^2.2.5"
   },
   "jest": {

src/AjaxUploader.jsx

@@ -113,11 +113,13 @@ class AjaxUploader extends Component {
         }
         return this.post(file);
       }).catch(e => {
-        console && console.log(e); // eslint-disable-line
+        // eslint-disable-next-line no-console
+        console.log(e);
       });
     } else if (before !== false) {
       setTimeout(() => this.post(file), 0);
     }
+    return undefined;
   }
 
   post(file) {
@@ -209,7 +211,7 @@ class AjaxUploader extends Component {
     const {
       component: Tag, prefixCls, className, disabled, id,
       style, multiple, accept, children, directory, openFileDialogOnClick,
-      ...otherProps,
+      ...otherProps
     } = this.props;
     const cls = classNames({
       [prefixCls]: true,

src/request.js

@@ -32,6 +32,7 @@ function getBody(xhr) {
 //  headers: Object,
 // }
 export default function upload(option) {
+  // eslint-disable-next-line no-undef
   const xhr = new XMLHttpRequest();
 
   if (option.onProgress && xhr.upload) {
@@ -43,6 +44,7 @@ export default function upload(option) {
     };
   }
 
+  // eslint-disable-next-line no-undef
   const formData = new FormData();
 
   if (option.data) {
@@ -62,6 +64,7 @@ export default function upload(option) {
     });
   }
 
+  // eslint-disable-next-line no-undef
   if (option.file instanceof Blob) {
     formData.append(option.filename, option.file, option.file.name);
   } else {
@@ -79,10 +82,9 @@ export default function upload(option) {
       return option.onError(getError(option, xhr), getBody(xhr));
     }
 
-    option.onSuccess(getBody(xhr), xhr);
+    return option.onSuccess(getBody(xhr), xhr);
   };
 
-
   xhr.open(option.method, option.action, true);
 
   // Has to be after `.open()`. See https://github.com/enyo/dropzone/issues/179
@@ -98,11 +100,12 @@ export default function upload(option) {
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
   }
 
-  for (const h in headers) {
-    if (headers.hasOwnProperty(h) && headers[h] !== null) {
+  Object.keys(headers).forEach(h => {
+    if (headers[h] !== null) {
       xhr.setRequestHeader(h, headers[h]);
-    }
-  }
+    } 
+  });
+
   xhr.send(formData);
 
   return {

src/traverseFileTree.js

@@ -52,9 +52,9 @@ const traverseFileTree = (files, callback, isAccepted) => {
       });
     }
   };
-  for (const file of files) {
+  files.forEach(file => {
     _traverseFileTree(file.webkitGetAsEntry());
-  }
+  });
 };
 
 export default traverseFileTree;

tests/request.spec.js

@@ -1,8 +1,7 @@
 /* eslint no-console:0 */
-
 import expect from 'expect.js';
-import request from '../src/request';
 import sinon from 'sinon';
+import request from '../src/request';
 
 let xhr;
 let requests;