Skip to content
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.

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

use yarn, upgrade react-router v3, fixed issue #802

Merged
merged 5 commits into from
Nov 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/js/app.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import ReactDOM from 'react-dom';

import { IndexRoute, Router, Route } from 'react-router';
import { IndexRoute, Router, Route, hashHistory } from 'react-router';

import App from './components/App';
import Home from './components/Home';
import GettingStarted from './components/GettingStarted';
import PageNotFound from './components/PageNotFound';

const routes = (
<Router>
<Router history={ hashHistory }>
<Route path='/' component={ App }>
<IndexRoute component={ Home } />
<Route path='getting-started' component={ GettingStarted }/>
Expand Down
1 change: 1 addition & 0 deletions examples/js/custom/csv-button/default-custom-csv-button.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, ExportCSVButton } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, DeleteButton } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, InsertButton } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, InsertModalFooter } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, InsertModalHeader } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, ClearSearchButton } from 'react-bootstrap-table';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* eslint no-alert: 0 */
/* eslint no-console: 0 */
import React from 'react';
import { BootstrapTable, TableHeaderColumn, ShowSelectedOnlyButton } from 'react-bootstrap-table';

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"react-bootstrap": "^0.29.5",
"react-dom": "^0.14.3 || ^15.0.0",
"react-hot-loader": "^1.3.0",
"react-router": "^1.0.2",
"react-router": "^3.0.0",
"history": "3.0.0",
"style-loader": "^0.13.0",
"toastr": "^2.1.2",
"vinyl-source-stream": "^1.1.0",
Expand All @@ -64,8 +65,8 @@
},
"dependencies": {
"classnames": "^2.1.2",
"react-toastr": "^2.8.0",
"react-modal": "^1.4.0"
"react-modal": "^1.4.0",
"react-toastr": "^2.8.0"
},
"peerDependencies": {
"react": "^0.14.3 || ^15.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/toolbar/ToolBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class ToolBar extends Component {
if (this.props.clearSearch) {
if (this.props.clearSearchBtn) {
clearBtn = this.renderCustomBtn(this.props.clearSearchBtn,
[ this.handleClearBtnClick ], ClearSearchButton.name, 'onClick', this.handleClearBtnClick);
[ this.handleClearBtnClick ], ClearSearchButton.name, 'onClick', this.handleClearBtnClick); /* eslint max-len: 0*/
} else {
clearBtn = (
<ClearSearchButton onClick={ this.handleClearBtnClick }/>
Expand Down
Loading