From 473547d90d1e2b2cd511682a8f0a1fd823889f0d Mon Sep 17 00:00:00 2001 From: Dmitrii Abramov Date: Tue, 10 May 2016 13:56:34 -0700 Subject: [PATCH] fix eslint errors --- .eslintignore | 5 --- .eslintrc.js | 3 +- CalendarPicker/CalendarPicker.js | 57 ++++++++++++++++---------------- CalendarPicker/Styles.js | 6 ++-- CalendarPicker/Util.js | 2 +- CalendarPicker/makeStyles.js | 14 ++++---- index.ios.js | 14 ++++---- 7 files changed, 48 insertions(+), 53 deletions(-) diff --git a/.eslintignore b/.eslintignore index 65a2002b..b0ff3d06 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,8 +1,3 @@ -browser_bundle.js -browser_entry_point.js -esfmt_bundle.js tmp/ -__tests__/files/ -__tests__/code_snippets/ coverage/ package/ diff --git a/.eslintrc.js b/.eslintrc.js index 427afa26..e2f3801d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,7 +15,8 @@ module.exports = { semi: [ 2, 'always' - ] + ], + 'react/prop-types': [0] }, env: { es6: true, diff --git a/CalendarPicker/CalendarPicker.js b/CalendarPicker/CalendarPicker.js index 5939f86f..136e3b26 100755 --- a/CalendarPicker/CalendarPicker.js +++ b/CalendarPicker/CalendarPicker.js @@ -4,13 +4,13 @@ */ 'use strict'; -import React, { Component } from 'react'; +import React from 'react'; import { Dimensions, StyleSheet, View, Text, - TouchableOpacity, + TouchableOpacity } from 'react-native'; var { @@ -18,33 +18,33 @@ var { MONTHS, MAX_ROWS, MAX_COLUMNS, - getDaysInMonth, + getDaysInMonth } = require('./Util'); var makeStyles = require('./makeStyles'); //The styles in makeStyles are intially scaled to this width -const IPHONE6_WIDTH = 375 +const IPHONE6_WIDTH = 375; var initialScale = Dimensions.get('window').width / IPHONE6_WIDTH ; -var styles = StyleSheet.create(makeStyles(initialScale)) +var styles = StyleSheet.create(makeStyles(initialScale)); var Day = React.createClass({ propTypes: { onDayChange: React.PropTypes.func, selected: React.PropTypes.bool, day: React.PropTypes.oneOfType([ - React.PropTypes.number, - React.PropTypes.string + React.PropTypes.number, + React.PropTypes.string ]).isRequired, screenWidth: React.PropTypes.number, startFromMonday: React.PropTypes.bool, selectedDayColor: React.PropTypes.string, - selectedDayTextColor: React.PropTypes.string, + selectedDayTextColor: React.PropTypes.string }, getDefaultProps () { return { onDayChange () {} - } + }; }, getInitialState () { @@ -56,8 +56,8 @@ var Day = React.createClass({ render() { if (this.props.selected) { - var selectedDayColorStyle = this.props.selectedDayColor ? {backgroundColor: this.props.selectedDayColor} : {} - var selectedDayTextColorStyle = this.props.selectedDayTextColor ? {color: this.props.selectedDayTextColor} : {} + var selectedDayColorStyle = this.props.selectedDayColor ? {backgroundColor: this.props.selectedDayColor} : {}; + var selectedDayTextColorStyle = this.props.selectedDayTextColor ? {color: this.props.selectedDayTextColor} : {}; return ( @@ -94,11 +94,11 @@ var Days = React.createClass({ year: React.PropTypes.number.isRequired, onDayChange: React.PropTypes.func.isRequired, selectedDayColor: React.PropTypes.string, - selectedDayTextColor: React.PropTypes.string, + selectedDayTextColor: React.PropTypes.string }, getInitialState() { return { - selectedStates: [], + selectedStates: [] }; }, @@ -120,7 +120,7 @@ var Days = React.createClass({ } this.setState({ - selectedStates: selectedStates, + selectedStates: selectedStates }); }, @@ -143,8 +143,7 @@ var Days = React.createClass({ year = this.props.year, currentDay = 0, thisMonthFirstDay = this.props.startFromMonday ? new Date(year, month, 0) : new Date(year, month, 1), - slotsAccumulator = 0, - slotsAccumulatorOffset = this.props.startFromMonday ? 1 : 0; + slotsAccumulator = 0; for (i = 0; i < MAX_ROWS; i++ ) { // Week rows columns = []; @@ -164,7 +163,7 @@ var Days = React.createClass({ currentDay++; } } else { - columns.push(); @@ -196,7 +195,7 @@ var WeekDaysLabels = React.createClass({ render() { return ( - { (this.props.weekdays || WEEKDAYS).map((day, key) => { return {day} }) } + { (this.props.weekdays || WEEKDAYS).map((day, key) => { return {day}; }) } ); } @@ -279,43 +278,43 @@ var CalendarPicker = React.createClass({ nextTitle: React.PropTypes.string, selectedDayColor: React.PropTypes.string, selectedDayTextColor: React.PropTypes.string, - scaleFactor: React.PropTypes.number, + scaleFactor: React.PropTypes.number }, getDefaultProps() { return { onDateChange () {} - } + }; }, getInitialState() { if (this.props.scaleFactor !== undefined) { - styles = StyleSheet.create(makeStyles(this.props.scaleFactor)) + styles = StyleSheet.create(makeStyles(this.props.scaleFactor)); } return { date: this.props.selectedDate, day: this.props.selectedDate.getDate(), month: this.props.selectedDate.getMonth(), year: this.props.selectedDate.getFullYear(), - selectedDay: [], + selectedDay: [] }; }, onDayChange(day) { - this.setState({day: day.day,}); + this.setState({day: day.day}); this.onDateChange(); }, onMonthChange(month) { - this.setState({month: month,}); + this.setState({month: month}); this.onDateChange(); }, getNextYear(){ - this.setState({year: this.state.year + 1,}); + this.setState({year: this.state.year + 1}); this.onDateChange(); }, getPrevYear() { - this.setState({year: this.state.year - 1,}); + this.setState({year: this.state.year - 1}); this.onDateChange(); }, @@ -327,8 +326,8 @@ var CalendarPicker = React.createClass({ } = this.state, date = new Date(year, month, day); - this.setState({date: date,}); - this.props.onDateChange(date); + this.setState({date: date}); + this.props.onDateChange(date); }, render() { @@ -364,4 +363,4 @@ var CalendarPicker = React.createClass({ } }); -module.exports = CalendarPicker; \ No newline at end of file +module.exports = CalendarPicker; diff --git a/CalendarPicker/Styles.js b/CalendarPicker/Styles.js index beac0aa7..d82992bc 100755 --- a/CalendarPicker/Styles.js +++ b/CalendarPicker/Styles.js @@ -19,7 +19,7 @@ var styles = StyleSheet.create({ dayButton: { flex: 1, justifyContent: 'center', - alignSelf: 'center', + alignSelf: 'center' }, dayLabel: { @@ -41,11 +41,11 @@ var styles = StyleSheet.create({ }, daysWrapper: { - alignSelf: 'center', + alignSelf: 'center' }, dayLabels: { - textAlign: 'center', + textAlign: 'center' }, monthLabel: { diff --git a/CalendarPicker/Util.js b/CalendarPicker/Util.js index b1b1a297..c7044318 100755 --- a/CalendarPicker/Util.js +++ b/CalendarPicker/Util.js @@ -17,5 +17,5 @@ module.exports = { getDaysInMonth: function(month, year) { var lastDayOfMonth = new Date(year, month + 1, 0); return lastDayOfMonth.getDate(); - }, + } }; diff --git a/CalendarPicker/makeStyles.js b/CalendarPicker/makeStyles.js index 69768729..b0aa4c32 100644 --- a/CalendarPicker/makeStyles.js +++ b/CalendarPicker/makeStyles.js @@ -50,14 +50,14 @@ function makeStyles(scaler) { }, daysWrapper: { - alignSelf: 'center', + alignSelf: 'center' }, dayLabels: { width: 50*scaler, fontSize: 10*scaler, color: '#000', - textAlign: 'center', + textAlign: 'center' }, selectedDay: { @@ -86,17 +86,17 @@ function makeStyles(scaler) { }, monthSelector: { - width: 80*scaler, + width: 80*scaler }, prev: { textAlign: 'left', - fontSize: 14*scaler, + fontSize: 14*scaler }, next: { textAlign: 'right', - fontSize: 14*scaler, + fontSize: 14*scaler }, yearLabel: { @@ -113,8 +113,8 @@ function makeStyles(scaler) { weekRow: { flexDirection: 'row' } - } + }; } -module.exports = makeStyles \ No newline at end of file +module.exports = makeStyles; \ No newline at end of file diff --git a/index.ios.js b/index.ios.js index c1b8e2c3..10d51f32 100644 --- a/index.ios.js +++ b/index.ios.js @@ -4,7 +4,7 @@ */ 'use strict'; -import React, { Component } from 'react'; +import React from 'react'; import { AppRegistry, Dimensions, @@ -14,13 +14,13 @@ import { } from 'react-native'; var CalendarPicker = require('./CalendarPicker/CalendarPicker'), - CalendarPicker2; + CalendarPicker2; CalendarPicker2 = React.createClass({ getInitialState: function() { return { - date: new Date(), + date: new Date() }; }, @@ -36,8 +36,8 @@ CalendarPicker2 = React.createClass({ selectedDate={this.state.date} onDateChange={this.onDateChange} screenWidth={Dimensions.width} - weekdays = {["Mon", "Tue", "Wed", "Th", "Fri", "Sat", "Sun"]} - months = {["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]} + weekdays = {['Mon', 'Tue', 'Wed', 'Th', 'Fri', 'Sat', 'Sun']} + months = {['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']} nextTitle={'Next'} previousTitle={'Previous'} startFromMonday={true} @@ -54,11 +54,11 @@ CalendarPicker2 = React.createClass({ const styles = StyleSheet.create({ container: { - marginTop: 30, + marginTop: 30 }, selectedDate: { backgroundColor: 'rgba(0,0,0,0)', - color: '#000', + color: '#000' } });