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.

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 the close query menu item for non-macOS #71

Merged
merged 2 commits into from
Jun 29, 2017
Merged

add the close query menu item for non-macOS #71

merged 2 commits into from
Jun 29, 2017

Conversation

shiftkey
Copy link
Contributor

@shiftkey shiftkey commented Jun 29, 2017

Fixes #70

  • add in the missing menu item and keybinding

@shiftkey
Copy link
Contributor Author

cc @gjtorikian

@shiftkey shiftkey changed the title use CmdOrCtrl to support non-macOS platforms [WIP] use CmdOrCtrl to support non-macOS platforms Jun 29, 2017
@gjtorikian
Copy link
Collaborator

menu is platform specific, should review this

I'm ready to merge, but as a not-Electron developer, what does this entail?

@shiftkey
Copy link
Contributor Author

@gjtorikian at the moment the menu is rendered differently per-platform (this is fine), but the File menu on Windows/Linux is incomplete: https://github.com/skevy/graphiql-app/blob/master/main.js#L190-L197

So the current change doesn't even fix that, and it'd be nice to reduce the duplication I think a bit of maintainability in here while I'm cleaning that up.

@gjtorikian gjtorikian self-assigned this Jun 29, 2017
@shiftkey
Copy link
Contributor Author

Ready for review

@shiftkey shiftkey changed the title [WIP] use CmdOrCtrl to support non-macOS platforms add the close query menu item for non-macOS Jun 29, 2017
@gjtorikian gjtorikian merged commit d544bc2 into skevy:master Jun 29, 2017
@gjtorikian
Copy link
Collaborator

Thank you!

madzhup added a commit to madzhup/graphiql-app that referenced this pull request Oct 16, 2017
* source:
  Ok npm wants me to commit this
  Revert "add package lock file (skevy#86)"
  take shell straight of electron and updated button/links (skevy#87)
  add package lock file (skevy#86)
  Update readme (skevy#85)
  add the close query menu item for non-macOS (skevy#71)
  Add Origin header for CORS support (skevy#66)
  Update productName
  Add release command
  Update .gitignore
  Package with Electron Builder, add windows + linux packages
  Fix bad JSON stringify in get requests (skevy#60)
  Update to Babel 6 + GraphiQL 0.10.2/GraphQL 0.10.1

# Conflicts:
#	package.json
Copy link

@kanamarukei kanamarukei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

あほ

Copy link

@kanamarukei kanamarukei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

浮気男

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants