From fbbf3d177ad97d87662ec8e62e08428adcdb0cef Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 Nov 2013 16:33:46 -0800 Subject: [PATCH 1/7] Upgrade to whitespace@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d598941c..3004cd347 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "to-the-hubs": "0.11.0", "tree-view": "0.31.0", "visual-bell": "0.3.0", - "whitespace": "0.8.0", + "whitespace": "0.9.0", "wrap-guide": "0.5.0", "language-c": "0.2.0", "language-clojure": "0.1.0", From 233d819e0431e50d7f305b3a0b77d6ce9e47d283 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 Nov 2013 16:37:50 -0800 Subject: [PATCH 2/7] Add atom prefix to syntax global --- spec/atom-spec.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee index 1e8c5dda8..6b9d200d8 100644 --- a/spec/atom-spec.coffee +++ b/spec/atom-spec.coffee @@ -262,12 +262,13 @@ describe "the `atom` global", -> describe "when the package has no grammars but does have preferences", -> it "loads the package's preferences as scoped properties", -> jasmine.unspy(window, 'setTimeout') - spyOn(syntax, 'addProperties').andCallThrough() + spyOn(atom.syntax, 'addProperties').andCallThrough() atom.activatePackage('package-with-preferences-tmbundle') waitsFor -> atom.syntax.addProperties.callCount > 0 + runs -> expect(atom.syntax.getProperty(['.source.pref'], 'editor.increaseIndentPattern')).toBe '^abc$' From ce098e587ffa9cc43ae0eb16c80907d9431dd8de Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 19 Nov 2013 16:46:46 -0800 Subject: [PATCH 3/7] Reduce specificity of platform keybindings --- keymaps/darwin.cson | 2 +- keymaps/win32.cson | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson index d962866a9..eb198332d 100644 --- a/keymaps/darwin.cson +++ b/keymaps/darwin.cson @@ -87,7 +87,7 @@ 'meta-8': 'pane:show-item-8' 'meta-9': 'pane:show-item-9' -'body.platform-darwin .editor': +'.platform-darwin .editor': # Apple Specific 'meta-backspace': 'editor:backspace-to-beginning-of-line' 'meta-delete': 'editor:backspace-to-beginning-of-line' diff --git a/keymaps/win32.cson b/keymaps/win32.cson index 67326a9c1..2f7866a26 100644 --- a/keymaps/win32.cson +++ b/keymaps/win32.cson @@ -50,6 +50,6 @@ 'ctrl-k meta-left': 'window:focus-previous-pane' 'ctrl-k meta-right': 'window:focus-next-pane' -'body.platform-win32 .editor': +'.platform-win32 .editor': # Windows specific - 'ctrl-delete': 'editor:backspace-to-beginning-of-word' \ No newline at end of file + 'ctrl-delete': 'editor:backspace-to-beginning-of-word' From aae85cd7c125a1d535f6b38d2dfb2119b0ab98aa Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 19 Nov 2013 16:56:22 -0800 Subject: [PATCH 4/7] Upgrade to find-and-replace@0.43.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3004cd347..16e1ae4a2 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "dev-live-reload": "0.15.0", "editor-stats": "0.5.0", "exception-reporting": "0.7.0", - "find-and-replace": "0.42.0", + "find-and-replace": "0.43.0", "fuzzy-finder": "0.20.0", "gists": "0.8.0", "git-diff": "0.13.0", From 33538a5ed74f4ee032d158acaead3a156e5bbfee Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 19 Nov 2013 16:57:10 -0800 Subject: [PATCH 5/7] Use `.workspace` rather than `body` for keybindings --- keymaps/darwin.cson | 4 ++-- keymaps/win32.cson | 4 ++-- src/atom.coffee | 2 +- static/index.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson index eb198332d..359a3456a 100644 --- a/keymaps/darwin.cson +++ b/keymaps/darwin.cson @@ -1,4 +1,4 @@ -'body.platform-darwin': +'.workspace-darwin': # Apple specific 'meta-q': 'application:quit' 'meta-h': 'application:hide' @@ -87,7 +87,7 @@ 'meta-8': 'pane:show-item-8' 'meta-9': 'pane:show-item-9' -'.platform-darwin .editor': +'.workspace-darwin .editor': # Apple Specific 'meta-backspace': 'editor:backspace-to-beginning-of-line' 'meta-delete': 'editor:backspace-to-beginning-of-line' diff --git a/keymaps/win32.cson b/keymaps/win32.cson index 2f7866a26..8eb06fb03 100644 --- a/keymaps/win32.cson +++ b/keymaps/win32.cson @@ -1,4 +1,4 @@ -'body.platform-win32': +'.workspace-win32': # Atom Specific 'enter': 'core:confirm' 'escape': 'core:cancel' @@ -50,6 +50,6 @@ 'ctrl-k meta-left': 'window:focus-previous-pane' 'ctrl-k meta-right': 'window:focus-next-pane' -'.platform-win32 .editor': +'.workspace-win32 .editor': # Windows specific 'ctrl-delete': 'editor:backspace-to-beginning-of-word' diff --git a/src/atom.coffee b/src/atom.coffee index 73756a1e6..3af78503d 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -65,7 +65,7 @@ class Atom # Private: setBodyPlatformClass: -> - document.body.classList.add("platform-#{process.platform}") + document.body.classList.add("workspace-#{process.platform}") getCurrentWindow: -> remote.getCurrentWindow() diff --git a/static/index.html b/static/index.html index d8df334f5..9db5e2271 100644 --- a/static/index.html +++ b/static/index.html @@ -22,6 +22,6 @@ } - + From ccafda6f7f15d09b5699d7ac058434de5b93fa07 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Tue, 19 Nov 2013 17:03:16 -0800 Subject: [PATCH 6/7] Keep .platform- rather than .workspace- --- keymaps/darwin.cson | 4 ++-- keymaps/win32.cson | 4 ++-- src/atom.coffee | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson index 359a3456a..fb42c3b9b 100644 --- a/keymaps/darwin.cson +++ b/keymaps/darwin.cson @@ -1,4 +1,4 @@ -'.workspace-darwin': +'.platform-darwin': # Apple specific 'meta-q': 'application:quit' 'meta-h': 'application:hide' @@ -87,7 +87,7 @@ 'meta-8': 'pane:show-item-8' 'meta-9': 'pane:show-item-9' -'.workspace-darwin .editor': +'.platform-darwin .editor': # Apple Specific 'meta-backspace': 'editor:backspace-to-beginning-of-line' 'meta-delete': 'editor:backspace-to-beginning-of-line' diff --git a/keymaps/win32.cson b/keymaps/win32.cson index 8eb06fb03..8a7286037 100644 --- a/keymaps/win32.cson +++ b/keymaps/win32.cson @@ -1,4 +1,4 @@ -'.workspace-win32': +'.platform-win32': # Atom Specific 'enter': 'core:confirm' 'escape': 'core:cancel' @@ -50,6 +50,6 @@ 'ctrl-k meta-left': 'window:focus-previous-pane' 'ctrl-k meta-right': 'window:focus-next-pane' -'.workspace-win32 .editor': +'.platform-win32 .editor': # Windows specific 'ctrl-delete': 'editor:backspace-to-beginning-of-word' diff --git a/src/atom.coffee b/src/atom.coffee index 3af78503d..73756a1e6 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -65,7 +65,7 @@ class Atom # Private: setBodyPlatformClass: -> - document.body.classList.add("workspace-#{process.platform}") + document.body.classList.add("platform-#{process.platform}") getCurrentWindow: -> remote.getCurrentWindow() From 9a01b5a6bf6596343292999654548f4b961a7d98 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 Nov 2013 17:15:25 -0800 Subject: [PATCH 7/7] Use Date.now() --- src/window.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/window.coffee b/src/window.coffee index 34a0d80ee..8b5e001f0 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -123,9 +123,9 @@ window.requireWithGlobals = (args...) -> # # Returns the value returned by the given function. window.measure = (description, fn) -> - start = new Date().getTime() + start = Date.now() value = fn() - result = new Date().getTime() - start + result = Date.now() - start console.log description, result value