Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit e037bc4

Browse files
author
Nathan Sobo
authored
Merge pull request #144 from atom/ns-mb-localization
Improve support for international keyboards
2 parents c1e12fe + 83a451b commit e037bc4

13 files changed

+2749
-395
lines changed

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "atom-keymap",
3-
"version": "6.3.2",
3+
"version": "6.3.3-beta1",
44
"description": "Atom's DOM-aware keymap module",
55
"main": "./lib/keymap-manager",
66
"scripts": {
77
"prepublish": "npm run clean && npm run compile && npm run lint && npm run atomdoc",
8-
"clean": "rm -rf lib && rm -rf api.json",
8+
"clean": "rimraf lib && rimraf api.json",
99
"compile": "coffee --no-header --output lib --compile src && babel src --out-dir lib",
1010
"lint": "coffeelint -r src spec && eslint src spec",
1111
"test": "devtool --quit --console node_modules/mocha/bin/_mocha --colors spec/helpers/setup.js spec/*",
@@ -27,7 +27,7 @@
2727
"event-kit": "^1.0.0",
2828
"fs-plus": "^2.0.4",
2929
"grim": "^1.2.1",
30-
"keyboard-layout": "^1.0",
30+
"keyboard-layout": "^1.2.0",
3131
"pathwatcher": "^6.2",
3232
"property-accessors": "^1",
3333
"season": "^5.0.2"
@@ -39,12 +39,11 @@
3939
"babel-preset-stage-0": "6.5.0",
4040
"babel-register": "6.5.2",
4141
"chai": "3.5.0",
42-
"coffee-cache": "0.2.0",
4342
"coffee-script": "1.7.0",
4443
"coffeelint": "1.14.2",
4544
"debounce": "1.0.0",
46-
"devtool": "1.9.1",
47-
"electron-rebuild": "1.1.3",
45+
"devtool": "2.2.0",
46+
"electron-rebuild": "1.2.1",
4847
"eslint": "2.2.0",
4948
"eslint-config-standard": "5.1.0",
5049
"eslint-plugin-promise": "1.0.8",
@@ -55,7 +54,6 @@
5554
"grunt-coffeelint": "0.0.6",
5655
"grunt-contrib-coffee": "0.9.0",
5756
"grunt-shell": "0.2.2",
58-
"jasmine-focused": "1.0.4",
5957
"lolex": "1.4.0",
6058
"mocha": "2.4.5",
6159
"rimraf": "2.2.2",

spec/helpers/helpers.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
import lolex from 'lolex'
66
import sinon from 'sinon'
77

8-
let sinonSandbox, fakeClock
8+
let sinonSandbox, fakeClock, processPlatform, originalProcessPlatform
9+
10+
originalProcessPlatform = process.platform
11+
processPlatform = process.platform
12+
Object.defineProperty(process, 'platform', {get: () => processPlatform})
913

1014
beforeEach(function () {
1115
document.body.innerHTML = ''
@@ -16,6 +20,7 @@ beforeEach(function () {
1620
afterEach(function () {
1721
fakeClock.uninstall()
1822
sinonSandbox.restore()
23+
processPlatform = originalProcessPlatform
1924
})
2025

2126
export function appendContent (element) {
@@ -30,3 +35,7 @@ export function stub () {
3035
export function getFakeClock () {
3136
return fakeClock
3237
}
38+
39+
export function mockProcessPlatform (platform) {
40+
processPlatform = platform
41+
}

0 commit comments

Comments
 (0)