Skip to content

Commit

Permalink
Linting JSX files (#941)
Browse files Browse the repository at this point in the history
`.jsx` linting is now in-scope for the `npm run lint` command, and
I linted the base files and some of the viz, there's still quite a bit
of work there, but that's a first pass on it.
  • Loading branch information
mistercrunch authored Aug 22, 2016
1 parent 7f2805a commit a8fd23d
Show file tree
Hide file tree
Showing 26 changed files with 1,429 additions and 1,411 deletions.
1 change: 0 additions & 1 deletion caravel/assets/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
node_modules/*
vendor/*
javascripts/dist/*
visualizations/*
stylesheets/*
spec/*
2 changes: 1 addition & 1 deletion caravel/assets/javascripts/dashboard/Dashboard.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const $ = window.$ = require('jquery');
const jQuery = window.jQuery = $;
const jQuery = window.jQuery = require('jquery'); // eslint-disable-line
const px = require('../modules/caravel.js');
const d3 = require('d3');
const urlLib = require('url');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class GridLayout extends React.Component {
rowHeight={100}
autoSize
margin={[20, 20]}
useCSSTransforms={true}
useCSSTransforms
draggableHandle=".drag"
>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { PropTypes } from 'react';
import update from 'immutability-helper';
import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
import Modal from './Modal.jsx';
require('../../../node_modules/react-bootstrap-table/css/react-bootstrap-table.css');
require('react-bootstrap-table/css/react-bootstrap-table.css');

const propTypes = {
dashboard: PropTypes.object.isRequired,
Expand Down Expand Up @@ -129,7 +129,8 @@ class SliceAdder extends React.Component {

render() {
const hideLoad = this.slicesLoaded || this.errored;
const enableAddSlice = this.state.selectionMap && Object.keys(this.state.selectionMap).some(function (key) {
let enableAddSlice = this.state.selectionMap && Object.keys(this.state.selectionMap);
enableAddSlice = enableAddSlice.some(function (key) {
return this.state.selectionMap[key];
}, this);
const modalContent = (
Expand Down
Loading

0 comments on commit a8fd23d

Please sign in to comment.