merge

src/babel.coffee

@@ -32,11 +32,6 @@ defaultOptions =
     # Target a version of the regenerator runtime that
     # supports yield so the transpiled code is cleaner/smaller.
     'asyncToGenerator'
-
-    # Because Atom is currently packaged with a fork of React v0.11,
-    # it makes sense to use the reactCompat transform so the React
-    # JSX transformer produces pre-v0.12 code.
-    'reactCompat'
   ]
 
   # Includes support for es7 features listed at:

src/browser/main.coffee

@@ -133,7 +133,6 @@ parseCommandLine = ->
   safeMode = args['safe']
   apiPreviewMode = args['one']
   pathsToOpen = args._
-  pathsToOpen = [executedFrom] if executedFrom and pathsToOpen.length is 0
   test = args['test']
   specDirectory = args['spec-directory']
   newWindow = args['new-window']

src/display-buffer.coffee

@@ -886,7 +886,7 @@ class DisplayBuffer extends Model
   getDecorations: (propertyFilter) ->
     allDecorations = []
     for markerId, decorations of @decorationsByMarkerId
-      allDecorations = allDecorations.concat(decorations) if decorations?
+      allDecorations.push(decorations...) if decorations?
     if propertyFilter?
       allDecorations = allDecorations.filter (decoration) ->
         for key, value of propertyFilter

src/pane-resize-handle-element.coffee

@@ -12,6 +12,9 @@ class PaneResizeHandleElement extends HTMLElement
     @isHorizontal = @parentElement.classList.contains("horizontal")
     @classList.add if @isHorizontal then 'horizontal' else 'vertical'
 
+  detachedCallback: ->
+    @resizeStopped()
+
   resizeToFitContent: ->
     # clear flex-grow css style of both pane
     @previousSibling.model.setFlexScale(1)
@@ -43,6 +46,7 @@ class PaneResizeHandleElement extends HTMLElement
 
   resizePane: ({clientX, clientY, which}) ->
     return @resizeStopped() unless which is 1
+    return @resizeStopped() unless @previousSibling? and @nextSibling?
 
     if @isHorizontal
       totalWidth = @previousSibling.clientWidth + @nextSibling.clientWidth