Skip to content

Updating eslint dependency. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcousens merged 2 commits into from
Jun 3, 2015
Merged

Updating eslint dependency. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f358b4
Updating eslint dependency.
AlexKVal Jun 1, 2015
704933a
Cleaning up eslint warnings.
AlexKVal Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"no-trailing-spaces": 0,
"no-underscore-dangle": 0,
"no-unused-expressions": 0,
"object-curly-spacing": [1, "always"],
"quotes": [2, "single", "avoid-escape"],
"react/jsx-quotes": 1,
"react/jsx-no-undef": 1,
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"babel-eslint": "^3.1.1",
"babel-jest": "^5.2.0",
"eslint": "^0.21.0",
"eslint": "^0.22.1",
"eslint-plugin-react": "^2.3.0",
"gulp": "^3.8.11",
"jest-cli": "^0.4.3",
Expand All @@ -40,7 +40,7 @@
"bump:minor": "gulp bump:minor",
"dev": "gulp dev",
"examples": "gulp dev:server",
"lint": "eslint ./; true",
"lint": "eslint .",
"release": "gulp release",
"publish:site": "gulp publish:examples",
"test": "jest; true",
Expand Down
50 changes: 26 additions & 24 deletions src/DateSelectCalendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ module.exports = React.createClass({
render() {
var self = this;
var firstDayOfMonth = moment().startOf('month').format('D');
var lastDayOfMonth = moment().endOf('month').format('D');
var currentDayOfMonth = moment().format('D');
var lastDayOfMonth = moment().endOf('month').format('D');
var currentDayOfMonth = moment().format('D');

var calendarClass = classNames('DateSelectCalendar', {
'DateSelectCalendar--start': this.props.startDate,
Expand All @@ -50,50 +50,52 @@ module.exports = React.createClass({
var currentMonth = moment().format('MMMM');
var currentYear = moment().format('YYYY');
var years = [];
var months = ['January','February','March','April','June','July','August','September','October','November','December'];
var months = ['January', 'February', 'March', 'April', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
var daysOfTheMonth = [];
var daysOfTheWeek = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
for(var i = firstDayOfMonth; i < lastDayOfMonth; i++) {
var daysOfTheWeek = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
for (var i = firstDayOfMonth; i < lastDayOfMonth; i++) {
daysOfTheMonth.push(i);
}
for (var i = this.props.yearRange[0]; i < this.props.yearRange[1]; i++) {
years.push(i);
for (var j = this.props.yearRange[0]; j < this.props.yearRange[1]; j++) {
years.push(j);
}


// elements

var weekDays = daysOfTheWeek.map(function(day, i) {
return <abbr key={'day' + i} className="DateSelectCalendar__legend__day" title={day}>{day.slice(0,1)}</abbr>
return <abbr key={'day' + i} className="DateSelectCalendar__legend__day" title={day}>{day.slice(0, 1)}</abbr>;
});
var monthDays = daysOfTheMonth.map(function(day) {
var dayClass = classNames('DateSelectCalendar__month__day', {
'is-current-day': day == currentDayOfMonth,
'is-selected': day == self.state.selectedDate,
'is-current-day': day === currentDayOfMonth,
'is-selected': day === self.state.selectedDate,
'is-before-selected-day': self.state.selectedDate && (day < self.state.selectedDate),
'is-after-selected-day': self.state.selectedDate && (day > self.state.selectedDate)
})
return <button key={'day' + day} onClick={self.handleDaySelection.bind(self, day)} className={dayClass}>{day}</button>
});
return <button key={'day' + day} onClick={self.handleDaySelection.bind(self, day)} className={dayClass}>{day}</button>;
});

var titleMonths = months.map(function(month, i) {
return <option key={'month' + i} value={month}>{month.slice(0,3)}</option>
return <option key={'month' + i} value={month}>{month.slice(0, 3)}</option>;
});
var titleYears = years.map(function(year, i) {
return <option key={'year' + i} value={year}>{year}</option>
return <option key={'year' + i} value={year}>{year}</option>;
});

var calendar = <div className={calendarClass}>
{!this.props.isHeaderless && <DateSelectHeader selectedDate={this.state.selectedDate} isExpanded={this.props.isExpanded} />}
<div className="DateSelectCalendar__toolbar">
<button className="DateSelectCalendar__toolbar__button DateSelectCalendar__toolbar__button--prev">Previous Month</button>
<select className="DateSelectCalendar__toolbar__select" defaultValue={currentMonth}>{titleMonths}</select>
<select className="DateSelectCalendar__toolbar__select" defaultValue={currentYear}>{titleYears}</select>
<button className="DateSelectCalendar__toolbar__button DateSelectCalendar__toolbar__button--next">Next Month</button>
var calendar = (
<div className={calendarClass}>
{!this.props.isHeaderless && <DateSelectHeader selectedDate={this.state.selectedDate} isExpanded={this.props.isExpanded} />}
<div className="DateSelectCalendar__toolbar">
<button className="DateSelectCalendar__toolbar__button DateSelectCalendar__toolbar__button--prev">Previous Month</button>
<select className="DateSelectCalendar__toolbar__select" defaultValue={currentMonth}>{titleMonths}</select>
<select className="DateSelectCalendar__toolbar__select" defaultValue={currentYear}>{titleYears}</select>
<button className="DateSelectCalendar__toolbar__button DateSelectCalendar__toolbar__button--next">Next Month</button>
</div>
<div className="DateSelectCalendar__legend">{weekDays}</div>
<div className="DateSelectCalendar__month">{monthDays}</div>
</div>
<div className="DateSelectCalendar__legend">{weekDays}</div>
<div className="DateSelectCalendar__month">{monthDays}</div>
</div>
);

return calendar;
}
Expand Down
10 changes: 5 additions & 5 deletions src/DateSelectDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = React.createClass({
};
},
renderDialog() {
if (!this.props.isOpen) return;
if (!this.props.isOpen) return null;
return (
<div className="DateSelect-dialog">
<div className="DateSelect-content">
Expand All @@ -44,15 +44,15 @@ module.exports = React.createClass({
);
},
renderRanges() {
if (!this.props.showPredefinedRanges) return;
if (!this.props.showPredefinedRanges) return null;
var self = this;
var rangeItems = this.props.predefinedRangeOptions.map(function(r,i) {
var rangeItems = this.props.predefinedRangeOptions.map(function(r, i) {
function action() {
self.setState({
startDate: moment().format('D'),
endDate: r.value.format('D')
});
};
}
return <button key={'range-button' + i} onClick={action} className="DateSelect__range__item">{r.label}</button>;
});
return (
Expand All @@ -62,7 +62,7 @@ module.exports = React.createClass({
);
},
renderBackdrop() {
if (!this.props.isOpen) return;
if (!this.props.isOpen) return null;
return (
<div className="DateSelect-backdrop" onClick={this.props.backdropClosesDateSelect ? this.props.onCancel : null} />
);
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/DateSelect-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('DateSelect test', function() {
);

it('should be rendered', function() {
expect(true).toEqual(true);
expect(instance).toBeDefined();
});

});