update eslint

attentiveness · Aug 2, 2016 · 5e6d461 · 5e6d461
1 parent c3c3ccd
commit 5e6d461
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 40 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -14,8 +14,13 @@
         "comma-dangle": 0,
         "react/prop-types": 0,
         "no-use-before-define": 0,
-        "radix": ["error", "as-needed"],
         "react/prefer-stateless-function": 0,
-        "no-param-reassign": 0
+        "radix": ["error", "as-needed"],
+        "no-param-reassign": 0,
+        "react/jsx-filename-extension": 0,
+        "object-property-newline": 0,
+        "no-mixed-operators": 0,
+        "import/prefer-default-export": 0,
+        "import/no-extraneous-dependencies": 0
     }
 }
diff --git a/app/components/ReadingToolbar.js b/app/components/ReadingToolbar.js
@@ -52,10 +52,8 @@ const ReadingToolbar = ({
   const handleIconClicked = () => {
     if (onIconClicked) {
       onIconClicked();
-    } else {
-      if (navigator) {
-        naviGoBack(navigator);
-      }
+    } else if (navigator) {
+      naviGoBack(navigator);
     }
   };
 

diff --git a/app/containers/app.js b/app/containers/app.js
@@ -24,8 +24,8 @@ import {
   View
 } from 'react-native';
 
-import Splash from '../pages/Splash';
 import { registerApp } from 'react-native-wechat';
+import Splash from '../pages/Splash';
 import { naviGoBack } from '../utils/CommonUtil';
 
 let tempNavigator;
@@ -54,10 +54,8 @@ class App extends React.Component {
     if (route.name === 'WebViewPage') {
       BackAndroid.removeEventListener('hardwareBackPress', this.goBack);
       isRemoved = true;
-    } else {
-      if (isRemoved) {
-        BackAndroid.addEventListener('hardwareBackPress', this.goBack);
-      }
+    } else if (isRemoved) {
+      BackAndroid.addEventListener('hardwareBackPress', this.goBack);
     }
     return (
       <Component navigator={navigator} route={route} />
@@ -72,7 +70,6 @@ class App extends React.Component {
           barStyle="default"
         />
         <Navigator
-          ref="navigator"
           style={styles.navigator}
           configureScene={this.configureScene}
           renderScene={this.renderScene}

diff --git a/app/pages/About.js b/app/pages/About.js
@@ -24,9 +24,9 @@ import {
   View
 } from 'react-native';
 
+import DeviceInfo from 'react-native-device-info';
 import ReadingToolbar from '../components/ReadingToolbar';
 import Button from '../components/Button';
-import DeviceInfo from 'react-native-device-info';
 
 let API_STORE = 'http://apistore.baidu.com/';
 let READING_REPO = 'https://github.com/attentiveness/reading';

diff --git a/app/pages/Category.js b/app/pages/Category.js
@@ -33,6 +33,7 @@ import { toastShort } from '../utils/ToastUtil';
 import { CATEGORIES } from '../constants/Alias';
 
 const checkIno = require('../img/check.png');
+
 let toolbarActions = [
   { title: '提交', icon: checkIno, show: 'always' }
 ];

diff --git a/app/pages/Feedback.js b/app/pages/Feedback.js
@@ -22,12 +22,13 @@ import {
   View
 } from 'react-native';
 
-import ReadingToolbar from '../components/ReadingToolbar';
 import AV from 'leancloud-storage';
 import DeviceInfo from 'react-native-device-info';
+import ReadingToolbar from '../components/ReadingToolbar';
 import { toastShort } from '../utils/ToastUtil';
 
 const checkIco = require('../img/check.png');
+
 let toolbarActions = [
   { title: '提交', icon: checkIco, show: 'always' }
 ];

diff --git a/app/pages/Main.js b/app/pages/Main.js
@@ -32,11 +32,13 @@ import {
   View,
   DeviceEventEmitter
 } from 'react-native';
-import LoadingView from '../components/LoadingView';
+
 import DrawerLayout from 'react-native-drawer-layout';
-import { fetchArticles } from '../actions/read';
-import ReadingToolbar from '../components/ReadingToolbar';
+import TimeAgo from 'react-native-timeago';
 import ScrollableTabView, { DefaultTabBar } from 'react-native-scrollable-tab-view';
+import * as readAction from '../actions/read';
+import LoadingView from '../components/LoadingView';
+import ReadingToolbar from '../components/ReadingToolbar';
 import About from '../pages/About';
 import Feedback from '../pages/Feedback';
 import CategoryContainer from '../containers/CategoryContainer';
@@ -45,14 +47,15 @@ import Storage from '../utils/Storage';
 import { CATEGORIES } from '../constants/Alias';
 import WebViewPage from '../pages/WebViewPage';
 import { formatStringWithHtml } from '../utils/FormatUtil';
-import TimeAgo from 'react-native-timeago';
+
 require('moment/locale/zh-cn');
 
 const homeImg = require('../img/home.png');
 const categoryImg = require('../img/category.png');
 const inspectionImg = require('../img/inspection.png');
 const infoImg = require('../img/info.png');
 const menuImg = require('../img/menu.png');
+
 const propTypes = {
   dispatch: PropTypes.func.isRequired,
   read: PropTypes.object.isRequired
@@ -83,7 +86,7 @@ class Main extends React.Component {
     const { dispatch } = this.props;
     DeviceEventEmitter.addListener('changeCategory', (typeIds) => {
       typeIds.forEach((typeId) => {
-        dispatch(fetchArticles(false, true, typeId));
+        dispatch(readAction.fetchArticles(false, true, typeId));
       });
       this.setState({
         typeIds
@@ -96,7 +99,7 @@ class Main extends React.Component {
             typeIds = [0, 12, 9, 2];
           }
           typeIds.forEach((typeId) => {
-            dispatch(fetchArticles(false, true, typeId));
+            dispatch(readAction.fetchArticles(false, true, typeId));
           });
           this.setState({
             typeIds
@@ -121,7 +124,7 @@ class Main extends React.Component {
   onRefresh(typeId) {
     const { dispatch } = this.props;
     canLoadMore = false;
-    dispatch(fetchArticles(true, false, typeId));
+    dispatch(readAction.fetchArticles(true, false, typeId));
   }
 
   onPress(article) {
@@ -135,7 +138,7 @@ class Main extends React.Component {
 
   onPressDrawerItem(index) {
     const { navigator } = this.props;
-    this.refs.drawer.closeDrawer();
+    this.drawer.closeDrawer();
     switch (index) {
       case 1:
         navigator.push({
@@ -162,7 +165,7 @@ class Main extends React.Component {
   }
 
   onIconClicked() {
-    this.refs.drawer.openDrawer();
+    this.drawer.openDrawer();
   }
 
   onScroll() {
@@ -176,7 +179,7 @@ class Main extends React.Component {
     if (canLoadMore && time - loadMoreTime > 1) {
       page++;
       const { dispatch } = this.props;
-      dispatch(fetchArticles(false, false, typeId, true, page));
+      dispatch(readAction.fetchArticles(false, false, typeId, true, page));
       canLoadMore = false;
       loadMoreTime = Date.parse(new Date()) / 1000;
     }
@@ -352,7 +355,7 @@ class Main extends React.Component {
     const { read, navigator } = this.props;
     return (
       <DrawerLayout
-        ref="drawer"
+        ref={(ref) => { this.drawer = ref; }}
         drawerWidth={Dimensions.get('window').width / 5 * 3}
         drawerPosition={Platform.OS === 'android' ? DrawerLayoutAndroid.positions.Left : 'left'}
         renderNavigationView={this.renderNavigationView}

diff --git a/app/pages/WebViewPage.js b/app/pages/WebViewPage.js
@@ -29,15 +29,16 @@ import {
   Modal
 } from 'react-native';
 
+import * as WeChat from 'react-native-wechat';
 import ReadingToolbar from '../components/ReadingToolbar';
 import { toastShort } from '../utils/ToastUtil';
 import LoadingView from '../components/LoadingView';
 import { naviGoBack } from '../utils/CommonUtil';
-import * as WeChat from 'react-native-wechat';
 
 const shareImg = require('../img/share.png');
 const shareIconWechat = require('../img/share_icon_wechat.png');
 const shareIconMoments = require('../img/share_icon_moments.png');
+
 let toolbarActions = [
   { title: '分享', icon: shareImg, show: 'always' }
 ];
@@ -79,7 +80,7 @@ class WebViewPage extends React.Component {
       });
       return true;
     } else if (canGoBack) {
-      this.refs.webview.goBack();
+      this.webview.goBack();
       return true;
     }
     return naviGoBack(this.props.navigator);
@@ -201,7 +202,7 @@ class WebViewPage extends React.Component {
           {this.renderSpinner()}
         </Modal>
         <WebView
-          ref="webview"
+          ref={(ref) => { this.webview = ref; }}
           automaticallyAdjustContentInsets={false}
           style={{ flex: 1 }}
           source={{ uri: route.article.url }}

diff --git a/app/root.js b/app/root.js
@@ -23,14 +23,10 @@ import App from './containers/app';
 
 const store = configureStore();
 
-class Root extends React.Component {
-  render() {
-    return (
-      <Provider store={store}>
-        <App />
-      </Provider>
-    );
-  }
-}
+const Root = () => (
+  <Provider store={store}>
+    <App />
+  </Provider>
+);
 
 export default Root;
diff --git a/app/utils/Storage.js b/app/utils/Storage.js
@@ -16,9 +16,8 @@
  *
  */
 import React from 'react-native';
-const {
-	AsyncStorage
-} = React;
+
+const { AsyncStorage } = React;
 
 class DeviceStorage {
   static get(key) {