Merge remote-tracking branch 'upstream/master' into feature/make-layer-visibility-always-shown

Conflicts:
	src/components/layers/LayerListItem.jsx
This commit is contained in:
orangemug
2018-09-23 09:07:02 +01:00
15 changed files with 77 additions and 104 deletions
+1 -1
View File
@@ -122,7 +122,7 @@ class LayerListItem extends React.Component {
/>
<IconAction
wdKey={"layer-list-item:"+this.props.layerId+":toggle-visibility"}
action={this.props.visibility === 'visible' ? 'hide' : 'show'}
action={this.props.visibility === 'visible' ? 'show' : 'hide'}
classBlockName="visibility"
onClick={e => this.props.onLayerVisibilityToggle(this.props.layerId)}
/>