From ee270db7accc1252a6c50eb0f8204f1699331316 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 30 Sep 2015 13:37:24 -0600
Subject: [PATCH] Move document mutation to startEditorWindow

---
 spec/jasmine-test-runner.coffee |  2 ++
 src/atom.coffee                 | 11 +++--------
 src/menu-manager.coffee         |  5 ++++-
 src/package.coffee              |  3 ---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/spec/jasmine-test-runner.coffee b/spec/jasmine-test-runner.coffee
index 03e67bea3..ab7e9aae1 100644
--- a/spec/jasmine-test-runner.coffee
+++ b/spec/jasmine-test-runner.coffee
@@ -3,6 +3,7 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 path = require 'path'
 ipc = require 'ipc'
+StylesElement = require '../src/styles-element'
 
 module.exports = ({logFile, headless, testPaths}) ->
   window[key] = value for key, value of require '../vendor/jasmine'
@@ -22,6 +23,7 @@ module.exports = ({logFile, headless, testPaths}) ->
 
   jasmineContent = document.createElement('div')
   jasmineContent.setAttribute('id', 'jasmine-content')
+  document.head.appendChild(new StylesElement)
   document.body.appendChild(jasmineContent)
 
   jasmineEnv.execute()
diff --git a/src/atom.coffee b/src/atom.coffee
index 06c8e4bd2..8b4e7b4f6 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -247,14 +247,6 @@ class Atom extends Model
   #
   # Call after this instance has been assigned to the `atom` global.
   initialize: ->
-    @setBodyPlatformClass()
-
-    {devMode, safeMode, resourcePath} = @getLoadSettings()
-    configDirPath = @getConfigDirPath()
-
-
-    document.head.appendChild(new StylesElement)
-
     if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
       @grammars.grammarOverridesByPath = grammarOverridesByPath
 
@@ -577,6 +569,9 @@ class Atom extends Model
 
     @loadConfig()
     @themes.loadBaseStylesheets()
+
+    @setBodyPlatformClass()
+    document.head.appendChild(new StylesElement)
     @packages.loadPackages()
     @deserializeEditorWindow()
 
diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee
index 0de08cfa7..c8096441a 100644
--- a/src/menu-manager.coffee
+++ b/src/menu-manager.coffee
@@ -191,7 +191,10 @@ class MenuManager
 
   # Get an {Array} of {String} classes for the given element.
   classesForElement: (element) ->
-    element?.classList.toString().split(' ') ? []
+    if classList = element?.classList
+      Array::slice.apply(classList)
+    else
+      []
 
   sortPackagesMenu: ->
     packagesMenu = _.find @template, ({label}) -> MenuHelpers.normalizeLabel(label) is 'Packages'
diff --git a/src/package.coffee b/src/package.coffee
index 0163f8bcd..dcb188584 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -132,7 +132,6 @@ class Package
     @activationPromise ?=
       new Promise (resolve, reject) =>
         @resolveActivationPromise = resolve
-        @rejectActivationPromise = reject
         @measure 'activateTime', =>
           try
             @activateResources()
@@ -370,10 +369,8 @@ class Package
         console.error "Error serializing package '#{@name}'", e.stack
 
   deactivate: ->
-    @rejectActivationPromise?()
     @activationPromise = null
     @resolveActivationPromise = null
-    @rejectActivationPromise = null
     @activationCommandSubscriptions?.dispose()
     @deactivateResources()
     @deactivateConfig()