Merge remote-tracking branch 'origin/master' into cj-dev-mode-status

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",
@@ -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.16.0",
     "fuzzy-finder": "0.5.0",
     "gfm": "0.4.0",
     "git-diff": "0.3.0",

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()

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

src/root-view.coffee

@@ -128,7 +128,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: ->