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.

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

fix #1151 fixed some warnings #1226

Merged
merged 3 commits into from
Nov 2, 2016
Merged

fix #1151 fixed some warnings #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a09320
fix #1151 fixed some warnings
saidaipparla Oct 27, 2016
5dbb0a7
fix
saidaipparla Oct 28, 2016
0effe65
fix for setting icon in toc layer
saidaipparla Nov 2, 2016
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
2 changes: 1 addition & 1 deletion web/client/components/TOC/fragments/settings/Display.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = React.createClass({
<Label key="opacity-percent" >{Math.round(this.props.settings.options.opacity * 100) + "%"}</Label>
</div>
{this.props.element.type === "wms" ?
[(<div><input type="checkbox" key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)}
[(<div key="transparent-check"><input type="checkbox" key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)}
onChange={(event) => {this.props.onChange("transparent", event.target.checked); }}/>
<label key="transparent-label" className="control-label">Transparent</label></div>)] : null}
</div>);
Expand Down
4 changes: 2 additions & 2 deletions web/client/components/maps/MapGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var MapGrid = React.createClass({
deleteMap: React.PropTypes.func,
resetCurrentMap: React.PropTypes.func,
updatePermissions: React.PropTypes.func,
metadataModal: React.PropTypes.object
metadataModal: React.PropTypes.func
},
getDefaultProps() {
return {
Expand Down Expand Up @@ -90,7 +90,7 @@ var MapGrid = React.createClass({
renderMetadataModal() {
if (this.props.metadataModal) {
let MetadataModal = this.props.metadataModal;
return (<MetadataModal ref="metadataModal" show={this.props.currentMap && this.props.currentMap.displayMetadataEdit} onHide={this.props.resetCurrentMap}
return (<MetadataModal key="metadataModal" ref="metadataModal" show={this.props.currentMap && this.props.currentMap.displayMetadataEdit} onHide={this.props.resetCurrentMap}
onClose={this.props.resetCurrentMap}
map={this.props.currentMap}
onSaveAll={this.props.saveAll}
Expand Down
2 changes: 1 addition & 1 deletion web/client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>
<!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->
</head>
<body className="themed">
<div id="container"></div>
Expand Down
2 changes: 1 addition & 1 deletion web/client/localConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
"closeGlyph": "1-close",
"submitConfig": {
"buttonConfig": {
"bsSize": "medium",
"bsSize": "small",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you checked that the button doesn't change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes i checked its changed

"bsStyle": "primary"
},
"glyph": ""
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/CreateNewMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ const CreateNewMap = React.createClass({
module.exports = {
CreateNewMapPlugin: connect((state) => ({
mapType: (state.maps && state.maps.mapType) || (state.home && state.home.mapType),
isLoggedIn: state && state.security && state.security.user
isLoggedIn: state && state.security && state.security.user && state.security.user.enabled && true || false
}))(CreateNewMap)
};
4 changes: 2 additions & 2 deletions web/client/plugins/containers/ToolsContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const ToolsContainer = React.createClass({
})(this.props.tool);
},
renderTools() {
return this.props.tools.map((tool) => {
return this.props.tools.map((tool, i) => {
if (tool.element) {
return tool.element;
}
Expand All @@ -110,7 +110,7 @@ const ToolsContainer = React.createClass({
const Tool = this.getTool(tool);

return this.addTooltip(
<Tool tooltip={tooltip} btnSize={this.props.toolSize} bsStyle={this.props.toolStyle} help={help} key={tool.name} mapType={this.props.mapType}
<Tool tooltip={tooltip} btnSize={this.props.toolSize} bsStyle={this.props.toolStyle} help={help} key={tool.name || ("tool" + i)} mapType={this.props.mapType}
{...tool.cfg} items={tool.items || []}>
{(tool.cfg && tool.cfg.glyph) ? <Glyphicon glyph={tool.cfg.glyph}/> : tool.icon}{help} {tool.text}
</Tool>,
Expand Down