From 5cecd533ef9f46df0657bcb9b813ada1608a16c3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 25 Sep 2013 17:35:52 -0700 Subject: [PATCH 1/5] Add back durations to spec reporter --- spec/atom-reporter.coffee | 2 +- spec/time-reporter.coffee | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/atom-reporter.coffee b/spec/atom-reporter.coffee index 7c2203c51..099a78f1f 100644 --- a/spec/atom-reporter.coffee +++ b/spec/atom-reporter.coffee @@ -92,7 +92,7 @@ class AtomReporter extends View clearTimeout @timeoutId if @timeoutId? @specPopup.show() - spec = _.find(window.timedSpecs, (spec) -> description is spec.name) + spec = _.find(window.timedSpecs, ({fullName}) -> description is fullName) description = "#{description} #{spec.time}ms" if spec @specPopup.text description {left, top} = element.offset() diff --git a/spec/time-reporter.coffee b/spec/time-reporter.coffee index 49ef984c0..f5555f392 100644 --- a/spec/time-reporter.coffee +++ b/spec/time-reporter.coffee @@ -53,6 +53,7 @@ class TimeReporter extends jasmine.Reporter window.timedSpecs.push description: @description time: duration + fullName: spec.getFullName() if timedSuites[@suite] window.timedSuites[@suite] += duration From 025cee96c2f4f83e3c352dae37216da376921241 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 25 Sep 2013 17:50:47 -0700 Subject: [PATCH 2/5] Update find and replace + themes to have coloring for the find matches --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 488101c53..cd598f5a4 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,11 @@ "underscore": "1.4.4", "atom-light-ui": "0.3.0", - "atom-light-syntax": "0.2.0", + "atom-light-syntax": "0.3.0", "atom-dark-ui": "0.3.0", - "atom-dark-syntax": "0.2.0", + "atom-dark-syntax": "0.3.0", "base16-tomorrow-dark-theme": "0.1.0", - "solarized-dark-syntax": "0.1.0", + "solarized-dark-syntax": "0.2.0", "archive-view": "0.7.0", "autocomplete": "0.5.0", @@ -55,7 +55,7 @@ "command-palette": "0.3.0", "editor-stats": "0.2.0", "exception-reporting": "0.1.0", - "find-and-replace": "0.14.1", + "find-and-replace": "0.15.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0", From c938c1c064302942244301276dc5e65eddd509df Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 25 Sep 2013 18:43:00 -0700 Subject: [PATCH 3/5] Only schedule atom.setFullScreen() when set in state --- src/root-view.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/root-view.coffee b/src/root-view.coffee index a4b2a202f..28fd64b6b 100644 --- a/src/root-view.coffee +++ b/src/root-view.coffee @@ -126,7 +126,8 @@ class RootView extends View @command 'pane:reopen-closed-item', => @panes.reopenItem() - _.nextTick => atom.setFullScreen(@state.get('fullScreen')) + if @state.get('fullScreen') + _.nextTick => atom.setFullScreen(true) # Private: serialize: -> From fbb778b96cb9abc6a00bb7192640b7d61e5a080e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 25 Sep 2013 18:56:02 -0700 Subject: [PATCH 4/5] Upgrade to find-and-replace@0.16.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd598f5a4..2d2f5e210 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "command-palette": "0.3.0", "editor-stats": "0.2.0", "exception-reporting": "0.1.0", - "find-and-replace": "0.15.0", + "find-and-replace": "0.16.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0", From 554b85153c5b8e89311647995a437a9e626d7d0c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 26 Sep 2013 11:50:48 +0800 Subject: [PATCH 5/5] Update to atom-shell v0.5.1. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2d2f5e210..b1c29e43f 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "bugs": { "url": "https://github.com/atom/atom/issues" }, - "atomShellVersion": "0.5.0", + "atomShellVersion": "0.5.1", "dependencies": { "async": "0.2.6", "bootstrap": "git://github.com/twbs/bootstrap.git#v3.0.0",