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

Commit

Permalink
Merge pull request #144 from atom/ns-mb-localization
Browse files Browse the repository at this point in the history
Improve support for international keyboards
  • Loading branch information
Nathan Sobo authored Sep 15, 2016
2 parents c1e12fe + 83a451b commit e037bc4
Show file tree
Hide file tree
Showing 13 changed files with 2,749 additions and 395 deletions.
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "atom-keymap",
"version": "6.3.2",
"version": "6.3.3-beta1",
"description": "Atom's DOM-aware keymap module",
"main": "./lib/keymap-manager",
"scripts": {
"prepublish": "npm run clean && npm run compile && npm run lint && npm run atomdoc",
"clean": "rm -rf lib && rm -rf api.json",
"clean": "rimraf lib && rimraf api.json",
"compile": "coffee --no-header --output lib --compile src && babel src --out-dir lib",
"lint": "coffeelint -r src spec && eslint src spec",
"test": "devtool --quit --console node_modules/mocha/bin/_mocha --colors spec/helpers/setup.js spec/*",
Expand All @@ -27,7 +27,7 @@
"event-kit": "^1.0.0",
"fs-plus": "^2.0.4",
"grim": "^1.2.1",
"keyboard-layout": "^1.0",
"keyboard-layout": "^1.2.0",
"pathwatcher": "^6.2",
"property-accessors": "^1",
"season": "^5.0.2"
Expand All @@ -39,12 +39,11 @@
"babel-preset-stage-0": "6.5.0",
"babel-register": "6.5.2",
"chai": "3.5.0",
"coffee-cache": "0.2.0",
"coffee-script": "1.7.0",
"coffeelint": "1.14.2",
"debounce": "1.0.0",
"devtool": "1.9.1",
"electron-rebuild": "1.1.3",
"devtool": "2.2.0",
"electron-rebuild": "1.2.1",
"eslint": "2.2.0",
"eslint-config-standard": "5.1.0",
"eslint-plugin-promise": "1.0.8",
Expand All @@ -55,7 +54,6 @@
"grunt-coffeelint": "0.0.6",
"grunt-contrib-coffee": "0.9.0",
"grunt-shell": "0.2.2",
"jasmine-focused": "1.0.4",
"lolex": "1.4.0",
"mocha": "2.4.5",
"rimraf": "2.2.2",
Expand Down
11 changes: 10 additions & 1 deletion spec/helpers/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
import lolex from 'lolex'
import sinon from 'sinon'

let sinonSandbox, fakeClock
let sinonSandbox, fakeClock, processPlatform, originalProcessPlatform

originalProcessPlatform = process.platform
processPlatform = process.platform
Object.defineProperty(process, 'platform', {get: () => processPlatform})

beforeEach(function () {
document.body.innerHTML = ''
Expand All @@ -16,6 +20,7 @@ beforeEach(function () {
afterEach(function () {
fakeClock.uninstall()
sinonSandbox.restore()
processPlatform = originalProcessPlatform
})

export function appendContent (element) {
Expand All @@ -30,3 +35,7 @@ export function stub () {
export function getFakeClock () {
return fakeClock
}

export function mockProcessPlatform (platform) {
processPlatform = platform
}
Loading

0 comments on commit e037bc4

Please sign in to comment.