Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 1 addition & 20 deletions lib/features/sync/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
22 changes: 5 additions & 17 deletions lib/wrappers/settings-wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down