schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-28 16:41:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8

Browse source
This commit is contained in:
orangemug 2018-04-10 12:56:43 +01:00
commit 3e97d8a5f1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/App.jsx
View file

@ -88,14 +88,13 @@ export default class App extends React.Component {
} }
componentDidMount() { componentDidMount() {
this.fetchSources(); Mousetrap.bind(['mod+z'], this.onUndo.bind(this));
Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this)); Mousetrap.bind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this));
Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this));
} }
componentWillUnmount() { componentWillUnmount() {
Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this)); Mousetrap.unbind(['mod+z'], this.onUndo.bind(this));
Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this)); Mousetrap.unbind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this));
} }
saveStyle(snapshotStyle) { saveStyle(snapshotStyle) {

2
src/components/modals/SourcesModal.jsx
View file

@ -234,7 +234,7 @@ class SourcesModal extends React.Component {
<div className="maputnik-modal-section"> <div className="maputnik-modal-section">
<h4>Choose Public Source</h4> <h4>Choose Public Source</h4>
<p> <p>
Add one of the publicly availble sources to your style. Add one of the publicly available sources to your style.
</p> </p>
<div style={{maxwidth: 500}}> <div style={{maxwidth: 500}}>
{tilesetOptions} {tilesetOptions}