diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25297d0..5136814 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,6 +23,8 @@ jobs: - name: Setup node uses: actions/setup-node@v1.2.0 + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' with: node-version: "10" diff --git a/CHANGELOG.md b/CHANGELOG.md index 09786db..9d37dd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.1.9] - 15.01.2021 +### Fixed +* confirmation dialog issue + ## [2.1.8] - 30.11.2020 ### Added * Add support for Cypress Semiconductor used in PyGo cradle diff --git a/lib/features/sync/sync.js b/lib/features/sync/sync.js index c4def83..258d7f6 100644 --- a/lib/features/sync/sync.js +++ b/lib/features/sync/sync.js @@ -379,26 +379,7 @@ export default class Sync { _this.progress( '(Use the confirmation box at the top of the screen)', ); - atom.confirm({ - title: 'Downloading files', - message: mssg, - buttons: ['Cancel', 'Yes', 'Only new files'] - }).then( (result)=> { - switch (result.response) { - case 0: - cancel(); - break; - case 1: - override(); - break; - case 2: - onlyNew(); - break; - default: - cancel() - break; - } - }); + _this.api.confirm('Downloading files', mssg, options) return true; }, 100); }); diff --git a/lib/wrappers/settings-wrapper.js b/lib/wrappers/settings-wrapper.js index ccd26c3..be67e87 100644 --- a/lib/wrappers/settings-wrapper.js +++ b/lib/wrappers/settings-wrapper.js @@ -284,23 +284,11 @@ export default class SettingsWrapper extends EventEmitter { Cancel: no, Yes: yes, }; - atom.confirm({ - title:'Create new Project file?', - message:"This project doesn't have a project config file. Do you want to create one, overwriting the global settings for this project?", - buttons: ['Cancel', 'Yes'] - }).then((results)=>{ - switch (results.response) { - case 0: - no(); - break; - case 1: - yes(); - break; - default: - no(); - break; - } - }); + _this.api.confirm( + 'Create new Project file?', + "This project doesn't have a project config file. Do you want to create one, overwriting the global settings for this project?", + options + ) } else { atom.workspace.open(configFile); } diff --git a/package-lock.json b/package-lock.json index eb068df..5f60aea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pymakr", - "version": "2.1.8", + "version": "2.1.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b67cf9a..eb92cc8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pymakr", "main": "./lib/main.js", - "version": "2.1.8", + "version": "2.1.9", "description": "Adds a REPL console to Atom that connects to your Pycom board. It can run code on the board or synchronize your project files to it.", "keywords": [ "Pycom",