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

More warnings fix #1565

Merged
merged 1 commit into from
Mar 15, 2017
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: 3 additions & 1 deletion docs/developer-guide/map-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const TestSupport = React.createClass({

module.exports = TestSupport;
```
* include the tool(s) in the requires section of plugins.js amd give it a **name**:
* include the tool(s) in the requires section of plugins.js and give it a **name**:

```js
module.exports = {
Expand Down Expand Up @@ -97,3 +97,5 @@ module.exports = {
}
}
```

NOTE: When using the "impl" configuration you are responsible for the correct configuration of such tool, **remember to add any other property it may require in the configuration**.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"react-responsive": "1.1.3",
"react-selectize": "2.0.3",
"react-share": "1.8.0",
"react-sidebar": "2.1.2",
"react-sidebar": "2.3.0",
"react-sortable-items": "https://github.com/geosolutions-it/react-sortable-items/tarball/react15",
"react-spinkit": "2.1.1",
"react-swipeable-views": "0.11.1",
Expand Down
17 changes: 8 additions & 9 deletions web/client/components/catalog/Catalog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ const Catalog = React.createClass({
maxButtons={5}
activePage={page + 1}
onSelect={this.handlePage} />
<div className="push-right">
<Message msgId="catalog.pageInfo" msgParams={{start, end: start + returned - 1, total}} />
{this.renderLoading()}
</div>
</div>);
<div className="push-right">
<Message msgId="catalog.pageInfo" msgParams={{start, end: start + returned - 1, total}} />
{this.renderLoading()}
</div>
</div>);
},
renderRecords() {
return (<div>
Expand All @@ -166,16 +166,15 @@ const Catalog = React.createClass({
}
},
renderButtons() {
// TODO check this part in ms2, customize for webmapper
const buttons = [];
if (this.props.includeSearchButton) {
buttons.push(<Button bsStyle="primary" style={this.props.buttonStyle} onClick={this.search}
className={this.props.buttonClassName}>
className={this.props.buttonClassName} key="catalog_search_button">
{this.renderLoading()} <Message msgId="catalog.search"/>
</Button>);
}
if (this.props.includeResetButton) {
buttons.push(<Button style={this.props.buttonStyle} onClick={this.reset}>
buttons.push(<Button style={this.props.buttonStyle} onClick={this.reset} key="catalog_reset_button">
<Message msgId="catalog.reset"/>
</Button>);
}
Expand All @@ -188,7 +187,7 @@ const Catalog = React.createClass({
return null;
},
renderFormats() {
return this.props.formats.map((format) => <option value={format.name}>{format.label}</option>);
return this.props.formats.map((format) => <option value={format.name} key={format.name}>{format.label}</option>);
},
render() {
const textSearch = (<FormGroup><FormControl
Expand Down
1 change: 0 additions & 1 deletion web/client/components/data/identify/DefaultViewer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ const DefaultViewer = React.createClass({
<Container {...this.props.containerProps}
onChangeIndex={(index) => {this.setState({index}); }}
ref="container"
defaultActiveKey={0}
index={this.state.index || 0}
key={"swiper"}
className="swipeable-view"
Expand Down