From 984581e01a5fe3dd2f3da3ca06c1eca17dc0704b Mon Sep 17 00:00:00 2001 From: Bojan Zivkovic Date: Thu, 15 Mar 2018 23:39:32 -0400 Subject: [PATCH 1/5] Adding mac keyboard bindings --- src/components/App.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/App.jsx b/src/components/App.jsx index ba10485b..da451527 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -76,12 +76,16 @@ export default class App extends React.Component { componentDidMount() { Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this)); + Mousetrap.bind(['command+z'], this.onUndo.bind(this)); Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this)); + Mousetrap.bind(['command+shift+z'], this.onRedo.bind(this)); } componentWillUnmount() { Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this)); + Mousetrap.unbind(['command+z'], this.onUndo.bind(this)); Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this)); + Mousetrap.unbind(['command+shift+z'], this.onRedo.bind(this)); } onReset() { From 7dfc5029a3a804f274c2eae0f1dfd0321752f74a Mon Sep 17 00:00:00 2001 From: Bojan Zivkovic Date: Fri, 16 Mar 2018 23:00:33 -0400 Subject: [PATCH 2/5] Improving keyboard bindings code --- src/components/App.jsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/App.jsx b/src/components/App.jsx index da451527..f1a359e4 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -75,17 +75,13 @@ export default class App extends React.Component { } componentDidMount() { - Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this)); - Mousetrap.bind(['command+z'], this.onUndo.bind(this)); - Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this)); - Mousetrap.bind(['command+shift+z'], this.onRedo.bind(this)); + Mousetrap.bind(['mod+z'], this.onUndo.bind(this)); + Mousetrap.bind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this)); } componentWillUnmount() { - Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this)); - Mousetrap.unbind(['command+z'], this.onUndo.bind(this)); - Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this)); - Mousetrap.unbind(['command+shift+z'], this.onRedo.bind(this)); + Mousetrap.unbind(['mod+z'], this.onUndo.bind(this)); + Mousetrap.unbind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this)); } onReset() { From 4d0456fd689a786777d25e74ee4ef5fe75b28e3b Mon Sep 17 00:00:00 2001 From: Colin Marquardt Date: Tue, 27 Mar 2018 00:45:42 +0200 Subject: [PATCH 3/5] Fix small typo. --- src/components/modals/SourcesModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modals/SourcesModal.jsx b/src/components/modals/SourcesModal.jsx index c1868e7c..b5db455b 100644 --- a/src/components/modals/SourcesModal.jsx +++ b/src/components/modals/SourcesModal.jsx @@ -234,7 +234,7 @@ class SourcesModal extends React.Component {

Choose Public Source

- Add one of the publicly availble sources to your style. + Add one of the publicly available sources to your style.

{tilesetOptions} From 11a59debdfb01e5c4f11f6f86284d0977be8ee3a Mon Sep 17 00:00:00 2001 From: orangemug Date: Mon, 9 Apr 2018 11:10:46 +0100 Subject: [PATCH 4/5] Update ol-mapbox-style ^2.10.1 -> ^2.11.2 --- package-lock.json | 61 +++-------------------------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f04a1a6..b8420242 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6725,13 +6725,6 @@ } } }, - "jsonlint": { - "version": "github:josdejong/jsonlint#85a19d77126771f3177582e3d09c6ffae185d391", - "requires": { - "JSV": "4.0.2", - "nomnom": "1.8.1" - } - }, "jsonparse": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", @@ -7610,52 +7603,6 @@ "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.1.0.tgz", "integrity": "sha512-hJ1cKkvdJ21qbBLxGk/IXQvvMIeHRSMatWIjc5UbpM4KTTOfl2V18UvqqxFd82VpA1fZ+IP7WSa2RvSwYRE02g==" }, - "mapbox-to-ol-style": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/mapbox-to-ol-style/-/mapbox-to-ol-style-3.4.0.tgz", - "integrity": "sha512-88N8kUt2Zs6MbstQdrfZV1YthTa/B5SIwTB2IgkeexdnT108CphTdz5gPCRYiKhEkoLmkw+vThjipl9rsBOwMA==", - "requires": { - "@mapbox/mapbox-gl-style-spec": "9.0.1", - "mapbox-to-css-font": "2.1.0", - "ol": "4.6.4" - }, - "dependencies": { - "@mapbox/mapbox-gl-style-spec": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-9.0.1.tgz", - "integrity": "sha512-j3qgGIk1LDYlDOo7VGEge5o/rHkhW4Z+w9fSdgbq8ZEg8KkXdxlDZeUbeaO14s4n0ML6Nz7hSF8JNlwYXl8R7A==", - "requires": { - "csscolorparser": "1.0.3", - "jsonlint-lines-primitives": "1.6.0", - "lodash.isequal": "3.0.4", - "minimist": "0.0.8", - "rw": "1.3.3", - "sort-object": "0.3.2" - } - }, - "jsonlint-lines-primitives": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/jsonlint-lines-primitives/-/jsonlint-lines-primitives-1.6.0.tgz", - "integrity": "sha1-u4n2DIubYS/ZE92qI2ZJuEDYZhE=", - "requires": { - "JSV": "4.0.2", - "nomnom": "1.8.1" - } - }, - "lodash.isequal": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-3.0.4.tgz", - "integrity": "sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q=", - "requires": { - "lodash._baseisequal": "3.0.7", - "lodash._bindcallback": "3.0.1" - } - } - } - }, - "maputnik-design": { - "version": "github:maputnik/design#afd4550db2a1562159092a858be181b5baa221f7" - }, "material-colors": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz", @@ -8687,14 +8634,12 @@ } }, "ol-mapbox-style": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-2.10.1.tgz", - "integrity": "sha512-lI2mY811TnWgdI7EO/nmzSMe/7oqjLnYK2QS4tVCD0+5hjMduc0HHdNbdGxam4L3TJp0firnu1nzgq94QJZD5g==", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-2.11.2.tgz", + "integrity": "sha512-5tmxuP2RapS1ntBWjtdYLYmktp+lPr89vZL1RAgPfkXgrT1mscwVzS9O+t2gTPmPvH1Q1nd42gLkgyBemPB2Qg==", "requires": { "@mapbox/mapbox-gl-style-spec": "9.0.1", "mapbox-to-css-font": "2.1.0", - "mapbox-to-ol-style": "3.4.0", - "ol": "4.6.4", "webfont-matcher": "1.1.0" }, "dependencies": { diff --git a/package.json b/package.json index 00775c84..b47aaf2c 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "mapbox-gl-inspect": "^1.3.0", "maputnik-design": "github:maputnik/design", "mousetrap": "^1.6.1", - "ol-mapbox-style": "^2.10.1", "ol": "^4.6.4", + "ol-mapbox-style": "^2.11.2", "prop-types": "^15.6.0", "react": "16.0.0", "react-addons-pure-render-mixin": "^15.6.2", From 4d427bcbc3b1be1444099de795efc3e98b80eb04 Mon Sep 17 00:00:00 2001 From: Orange Mug Date: Mon, 9 Apr 2018 13:53:25 +0100 Subject: [PATCH 5/5] Revert "Update ol-mapbox-style ^2.10.1 -> ^2.11.2" --- package-lock.json | 61 ++++++++++++++++++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8420242..4f04a1a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6725,6 +6725,13 @@ } } }, + "jsonlint": { + "version": "github:josdejong/jsonlint#85a19d77126771f3177582e3d09c6ffae185d391", + "requires": { + "JSV": "4.0.2", + "nomnom": "1.8.1" + } + }, "jsonparse": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", @@ -7603,6 +7610,52 @@ "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.1.0.tgz", "integrity": "sha512-hJ1cKkvdJ21qbBLxGk/IXQvvMIeHRSMatWIjc5UbpM4KTTOfl2V18UvqqxFd82VpA1fZ+IP7WSa2RvSwYRE02g==" }, + "mapbox-to-ol-style": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/mapbox-to-ol-style/-/mapbox-to-ol-style-3.4.0.tgz", + "integrity": "sha512-88N8kUt2Zs6MbstQdrfZV1YthTa/B5SIwTB2IgkeexdnT108CphTdz5gPCRYiKhEkoLmkw+vThjipl9rsBOwMA==", + "requires": { + "@mapbox/mapbox-gl-style-spec": "9.0.1", + "mapbox-to-css-font": "2.1.0", + "ol": "4.6.4" + }, + "dependencies": { + "@mapbox/mapbox-gl-style-spec": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-9.0.1.tgz", + "integrity": "sha512-j3qgGIk1LDYlDOo7VGEge5o/rHkhW4Z+w9fSdgbq8ZEg8KkXdxlDZeUbeaO14s4n0ML6Nz7hSF8JNlwYXl8R7A==", + "requires": { + "csscolorparser": "1.0.3", + "jsonlint-lines-primitives": "1.6.0", + "lodash.isequal": "3.0.4", + "minimist": "0.0.8", + "rw": "1.3.3", + "sort-object": "0.3.2" + } + }, + "jsonlint-lines-primitives": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/jsonlint-lines-primitives/-/jsonlint-lines-primitives-1.6.0.tgz", + "integrity": "sha1-u4n2DIubYS/ZE92qI2ZJuEDYZhE=", + "requires": { + "JSV": "4.0.2", + "nomnom": "1.8.1" + } + }, + "lodash.isequal": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-3.0.4.tgz", + "integrity": "sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q=", + "requires": { + "lodash._baseisequal": "3.0.7", + "lodash._bindcallback": "3.0.1" + } + } + } + }, + "maputnik-design": { + "version": "github:maputnik/design#afd4550db2a1562159092a858be181b5baa221f7" + }, "material-colors": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz", @@ -8634,12 +8687,14 @@ } }, "ol-mapbox-style": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-2.11.2.tgz", - "integrity": "sha512-5tmxuP2RapS1ntBWjtdYLYmktp+lPr89vZL1RAgPfkXgrT1mscwVzS9O+t2gTPmPvH1Q1nd42gLkgyBemPB2Qg==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-2.10.1.tgz", + "integrity": "sha512-lI2mY811TnWgdI7EO/nmzSMe/7oqjLnYK2QS4tVCD0+5hjMduc0HHdNbdGxam4L3TJp0firnu1nzgq94QJZD5g==", "requires": { "@mapbox/mapbox-gl-style-spec": "9.0.1", "mapbox-to-css-font": "2.1.0", + "mapbox-to-ol-style": "3.4.0", + "ol": "4.6.4", "webfont-matcher": "1.1.0" }, "dependencies": { diff --git a/package.json b/package.json index b47aaf2c..00775c84 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "mapbox-gl-inspect": "^1.3.0", "maputnik-design": "github:maputnik/design", "mousetrap": "^1.6.1", + "ol-mapbox-style": "^2.10.1", "ol": "^4.6.4", - "ol-mapbox-style": "^2.11.2", "prop-types": "^15.6.0", "react": "16.0.0", "react-addons-pure-render-mixin": "^15.6.2",