Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings option to menu and use Ruby 2.1.10 in Travis #1899

Merged
merged 3 commits into from
Oct 29, 2017
Merged

Add settings option to menu and use Ruby 2.1.10 in Travis #1899

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4522232
Add Settings option to Atom Beautify menu to access package settings
Oct 18, 2017
bd31036
Use Ruby 2.1.10 in Travis for Rubocop install error
Oct 19, 2017
c3aaf89
Remove rvm update and comment out rubocop install
stevenzeck Oct 29, 2017
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ matrix:
- os: osx
env:
- ATOM_CHANNEL=stable
rvm: 2.1.10
# - os: osx
# env:
# - ATOM_CHANNEL=beta
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Next
- See [#881](https://github.com/Glavin001/atom-beautify/issues/881). Update to Prettydiff version 2!
- Fix for [#1888](https://github.com/Glavin001/atom-beautify/issues/1888). Allow 0 for minor and patch versions of Docker
- Add Settings to atom-beautify in Packages menu [#1869](https://github.com/Glavin001/atom-beautify/issues/1869)
- ...

# v0.30.5 (2017-08-11)
Expand Down
4 changes: 4 additions & 0 deletions menus/atom-beautify.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
'label': 'Debug'
'command': 'atom-beautify:help-debug-editor'
}
{
'label': 'Settings'
'command': 'atom-beautify:open-settings'
}
]
]
}
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
"atom-workspace": [
"atom-beautify:help-debug-editor",
"atom-beautify:beautify-editor",
"atom-beautify:open-settings",
"atom-beautify:migrate-settings",
"core:save",
"core:save-as",
Expand Down
4 changes: 4 additions & 0 deletions src/beautify.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,9 @@ handleSaveEvent = ->
)
plugin.subscriptions.add disposable

openSettings = ->
atom.workspace.open('atom://config/packages/atom-beautify')

getUnsupportedOptions = ->
settings = atom.config.get('atom-beautify')
schema = atom.config.getSchema('atom-beautify')
Expand Down Expand Up @@ -622,6 +625,7 @@ plugin.activate = ->
@subscriptions.add handleSaveEvent()
@subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:beautify-editor", beautify
@subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:help-debug-editor", debug
@subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:open-settings", openSettings
@subscriptions.add atom.commands.add ".tree-view .file .name", "atom-beautify:beautify-file", beautifyFile
@subscriptions.add atom.commands.add ".tree-view .directory .name", "atom-beautify:beautify-directory", beautifyDirectory
@subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:migrate-settings", plugin.migrateSettings
Expand Down