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

Hotfix/remove focus when changedir #10

Merged
merged 5 commits into from
Dec 14, 2017
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ elm-stuff
node_modules
dist/bundle.js
qian-darwin-x64
qian-darwin-x64.zip
.tool-versions
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ install:
npm install

app: install build
rm -rf qian-darwin-x64.zip
./node_modules/.bin/electron-packager . qian --overwrite --icon=icon.icns
zip -r qian-darwin-x64.zip qian-darwin-x64

clean:
rm -rf qian-darwin-x64.zip
rm -rf node_modules
rm -rf elm-stuff
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,9 @@ In addition, if a feature seems interesting to implement, let's talk about it in
- `Tab` : toggle the focus on the searchbar
- `Cmd + Alt + Enter` : Open the current folder in finder
- `Cmd + Enter` : Open the current folder in a terminal

> those shortcuts works only if the search bar does not have the focus

- `Cmd + Left` : Go on the pred view (if it exists)
- `Cmd + Right` : Go on the next view (if it exists)
- `Cmd + Up` : Go to the parent (if it exists)
- `Cmd + <` : Go on the pred view (if it exists)
- `Cmd + >` : Go on the next view (if it exists)
- `Cmd + Shift + Space` : Go to the parent (if it exists)

## About the search bar

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qian",
"version": "1.2.0",
"version": "1.2.1",
"description": "A small experience",
"main": "main.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions static/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const template =
submenu: [
{
label: 'Pred',
accelerator: 'CmdOrCtrl+Left',
accelerator: 'CmdOrCtrl+<',
click: function(item, focusedWindow) {
if (focusedWindow) {
elmApp.ports.historyNavigation.send(true)
Expand All @@ -93,7 +93,7 @@ const template =
},
{
label: 'Next',
accelerator: 'CmdOrCtrl+Right',
accelerator: 'CmdOrCtrl+>',
click: function(item, focusedWindow) {
if (focusedWindow) {
elmApp.ports.historyNavigation.send(false)
Expand All @@ -102,7 +102,7 @@ const template =
},
{
label: 'Parent',
accelerator: 'CmdOrCtrl+Up',
accelerator: 'CmdOrCtrl+Shift+Space',
click: function(item, focusedWindow) {
if (focusedWindow) {
elmApp.ports.jumpToParent.send(true)
Expand Down