Merge remote-tracking branch 'origin/master' into pass-original-event

package.json

@@ -86,7 +86,7 @@
     "gists": "0.9.0",
     "git-diff": "0.16.0",
     "github-sign-in": "0.11.0",
-    "go-to-line": "0.9.0",
+    "go-to-line": "0.10.0",
     "grammar-selector": "0.11.0",
     "image-view": "0.9.0",
     "keybinding-resolver": "0.5.0",

spec/keymap-spec.coffee

@@ -296,7 +296,7 @@ describe "Keymap", ->
         expect(keymap.keystrokeStringForEvent(keydownEvent('a', altKey: true))).toBe 'alt-a'
         expect(keymap.keystrokeStringForEvent(keydownEvent('[', metaKey: true))).toBe 'cmd-['
         expect(keymap.keystrokeStringForEvent(keydownEvent('*', ctrlKey: true))).toBe 'ctrl-*'
-        expect(keymap.keystrokeStringForEvent(keydownEvent('left', ctrlKey: true, metaKey: true, altKey: true))).toBe 'alt-ctrl-cmd-left'
+        expect(keymap.keystrokeStringForEvent(keydownEvent('left', ctrlKey: true, metaKey: true, altKey: true))).toBe 'alt-cmd-ctrl-left'
 
     describe "when shift is pressed when a non-modifer key", ->
       it "returns a string that identifies the key pressed", ->

src/atom.coffee

@@ -186,6 +186,16 @@ class Atom
   hide: ->
     @getCurrentWindow().hide()
 
+  # Private: Schedule the window to be shown and focused on the next tick.
+  #
+  # This is done in a next tick to prevent a white flicker from occurring
+  # if called synchronously.
+  displayWindow: ->
+    setImmediate =>
+      @show()
+      @focus()
+      @setFullScreen(true) if @rootView.getState().get('fullScreen')
+
   close: ->
     @getCurrentWindow().close()
 

src/root-view.coffee

@@ -127,9 +127,6 @@ class RootView extends View
     @command 'pane:reopen-closed-item', =>
       @panes.reopenItem()
 
-    if @state.get('fullScreen')
-      setImmediate => atom.setFullScreen(true)
-
   # Private:
   serialize: ->
     state = @state.clone()

src/window.coffee

@@ -8,15 +8,6 @@ WindowEventHandler = require './window-event-handler'
 
 windowEventHandler = null
 
-# Schedule the window to be shown and focused on the next tick
-#
-# This is done in a next tick to prevent a white flicker from occurring
-# if called synchronously.
-displayWindow = ->
-  setImmediate ->
-    atom.show()
-    atom.focus()
-
 # This method is called in any window needing a general environment, including specs
 window.setUpEnvironment = (windowMode) ->
   atom.windowMode = windowMode
@@ -58,7 +49,7 @@ window.startEditorWindow = ->
     unloadEditorWindow()
     false
 
-  displayWindow()
+  atom.displayWindow()
 
 window.unloadEditorWindow = ->
   return if not atom.project and not atom.rootView