Skip to content

Commit

Permalink
Merge branch 'master' into xterm-linted
Browse files Browse the repository at this point in the history 
* master:
  Fix yarn.lock (#2194)
  Fix for keymapping bug on Linux and Windows (#2189)
  Set session CWD only if there is an active session (#2191)
  Upgrade Electron to v1.7.6 (#2193)
  Fix plugin path in dev mode (#2192)
  • Loading branch information
@chabou
chabou committed Sep 11, 2017
2 parents 1155bb5 + 48f5b6e commit 3e63257
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 36 deletions.
26 changes: 13 additions & 13 deletions app/config/paths.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ const devDir = resolve(__dirname, '../..');
const devCfg = join(devDir, cfgFile);
const defaultCfg = resolve(__dirname, defaultCfgFile);

if (isDev) {
// if a local config file exists, use it
try {
statSync(devCfg);
cfgPath = devCfg;
cfgDir = devDir;
//eslint-disable-next-line no-console
console.log('using config file:', cfgPath);
} catch (err) {
// ignore
}
}

const plugins = resolve(cfgDir, '.hyper_plugins');
const plugs = {
base: plugins,
Expand Down Expand Up @@ -43,19 +56,6 @@ const defaultPlatformKeyPath = () => {
}
};

if (isDev) {
// if a local config file exists, use it
try {
statSync(devCfg);
cfgPath = devCfg;
cfgDir = devDir;
//eslint-disable-next-line no-console
console.log('using config file:', cfgPath);
} catch (err) {
// ignore
}
}

module.exports = {
cfgDir,
cfgPath,
Expand Down
4 changes: 2 additions & 2 deletions app/keymaps/linux.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"window:minimize": "ctrl+shift+m",
"window:zoom": "ctrl+shift+alt+m",
"window:toggleFullScreen": "f11",
"window:close": "ctrl+shift+w",
"window:close": "ctrl+shift+q",
"tab:new": "ctrl+shift+t",
"tab:next": "ctrl+tab",
"tab:prev": "ctrl+shift+tab",
"pane:next": "ctrl+pageup",
"pane:prev": "ctrl+pagedown",
"pane:splitVertical": "ctrl+shift+d",
"pane:splitHorizontal": "ctrl+shift+e",
"pane:close": "ctrl+alt+w",
"pane:close": "ctrl+shift+w",
"editor:undo": "ctrl+shift+z",
"editor:redo": "ctrl+shift+y",
"editor:cut": "ctrl+shift+x",
Expand Down
4 changes: 2 additions & 2 deletions app/keymaps/win32.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"window:minimize": "ctrl+m",
"window:zoom": "ctrl+shift+alt+m",
"window:toggleFullScreen": "f11",
"window:close": "ctrl+shift+w",
"window:close": "ctrl+shift+q",
"tab:new": "ctrl+shift+t",
"tab:next": "ctrl+tab",
"tab:prev": "ctrl+shift+tab",
"pane:next": "ctrl+pageup",
"pane:prev": "ctrl+pagedown",
"pane:splitVertical": "ctrl+shift+d",
"pane:splitHorizontal": "ctrl+shift+e",
"pane:close": "ctrl+alt+w",
"pane:close": "ctrl+shift+w",
"editor:undo": "ctrl+shift+z",
"editor:redo": "ctrl+shift+y",
"editor:cut": "ctrl+shift+x",
Expand Down
25 changes: 19 additions & 6 deletions app/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,14 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"

conf@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/conf/-/conf-1.1.2.tgz#a164003022dd1643cd5abd9653071bd3b0a19f50"
version "1.2.0"
resolved "https://registry.yarnpkg.com/conf/-/conf-1.2.0.tgz#149af7408f0af6abd62c3e24cff747e41a0bc54f"
dependencies:
dot-prop "^4.1.0"
env-paths "^1.0.0"
make-dir "^1.0.0"
pkg-up "^2.0.0"
write-file-atomic "^2.3.0"

console-control-strings@^1.0.0, console-control-strings@~1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -513,7 +514,7 @@ glob@^7.0.5, glob@~7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"

graceful-fs@^4.1.2:
graceful-fs@^4.1.11, graceful-fs@^4.1.2:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"

Expand Down Expand Up @@ -560,8 +561,12 @@ http-signature@~1.1.0:
sshpk "^1.7.0"

iconv-lite@~0.4.13:
version "0.4.18"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"

imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"

inflight@^1.0.4:
version "1.0.6"
Expand Down Expand Up @@ -1144,7 +1149,7 @@ shell-env@0.3.0:
execa "^0.5.0"
strip-ansi "^3.0.0"

signal-exit@^3.0.0:
signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"

Expand Down Expand Up @@ -1313,6 +1318,14 @@ wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

write-file-atomic@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
dependencies:
graceful-fs "^4.1.11"
imurmurhash "^0.1.4"
signal-exit "^3.0.2"

yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
5 changes: 4 additions & 1 deletion lib/reducers/sessions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ const reducer = (state = initialState, action) => {
);

case SESSION_SET_CWD:
return state.setIn(['sessions', state.activeUid, 'cwd'], action.cwd);
if (state.activeUid) {
return state.setIn(['sessions', state.activeUid, 'cwd'], action.cwd);
}
return state;

default:
return state;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"babel-preset-react": "6.24.1",
"copy-webpack-plugin": "4.0.1",
"cross-env": "5.0.5",
"electron": "1.7.5",
"electron": "1.7.6",
"electron-builder": "19.27.3",
"electron-builder-squirrel-windows": "19.27.3",
"electron-devtools-installer": "2.2.0",
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1334,8 +1334,8 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"

caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000726"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7"
version "1.0.30000727"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000727.tgz#4e22593089b0f35c1b2adcfc28234493a21a4b2e"

capture-stack-trace@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -2222,9 +2222,9 @@ electron-to-chromium@^1.2.7:
version "1.3.21"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2"

electron@1.7.5:
version "1.7.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.5.tgz#065a3102bf8b87102df50c50985fefe6c569045b"
electron@1.7.6:
version "1.7.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.6.tgz#fb69ea31bd03df0eff247f26f0b538bd29b6ee72"
dependencies:
"@types/node" "^7.0.18"
electron-download "^3.0.1"
Expand Down Expand Up @@ -3505,8 +3505,8 @@ jest-docblock@^20.0.1:
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"

js-base64@^2.1.9:
version "2.2.0"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.2.0.tgz#5e8a8d193a908198dd23d1704826d207b0e5a8f6"
version "2.3.1"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.1.tgz#3705897c35fce0e202132630e750d8a17cd220ec"

js-string-escape@^1.0.1:
version "1.0.1"
Expand All @@ -3517,8 +3517,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

js-yaml@^3.5.1, js-yaml@^3.8.2, js-yaml@^3.9.1:
version "3.9.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
version "3.10.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
Expand Down Expand Up @@ -5238,8 +5238,8 @@ right-align@^0.1.1:
align-text "^0.1.1"

rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
version "2.6.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
glob "^7.0.5"

Expand Down

0 comments on commit 3e63257

Please sign in to comment.