ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-26 15:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6-circleci-config

Browse Source 
Conflicts:
	package-lock.json
	src/components/inputs/AutocompleteInput.jsx
This commit is contained in:
orangemug
2018-01-22 09:57:54 +00:00
parent e64ca3eb93 2d2f9744e2
commit 4215b5808f
9 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/App.jsx
+2 -1
View File
@@ -266,7 +266,8 @@ export default class App extends React.Component {
} else {
return <MapboxGlMap {...mapProps}
inspectModeEnabled={this.state.inspectModeEnabled}
highlightedLayer={this.state.mapStyle.layers[this.state.selectedLayerIndex]} />
highlightedLayer={this.state.mapStyle.layers[this.state.selectedLayerIndex]}
onLayerSelect={this.onLayerSelect.bind(this)} />
}
}