From c7ca50b2b685ea78881143ad09f3e15161aa4e38 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 13 Nov 2015 18:01:21 +0100 Subject: [PATCH 1/2] Set initialLoadComplete to true only in test mode --- src/atom-environment.coffee | 4 ++-- src/initialize-test-window.coffee | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index f98e1b835..77f8a6a2e 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -117,7 +117,7 @@ class AtomEnvironment extends Model # Call .loadOrCreate instead constructor: (params={}) -> - {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence} = params + {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence, loadBaseStylesheetsOnly} = params @state = {version: @constructor.version} @@ -183,7 +183,7 @@ class AtomEnvironment extends Model @themes.loadBaseStylesheets() @initialStyleElements = @styles.getSnapshot() - @themes.initialLoadComplete = true + @themes.initialLoadComplete = true if loadBaseStylesheetsOnly @setBodyPlatformClass() @stylesElement = @styles.buildStylesElement() diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee index d80bc11f4..f7704f2d8 100644 --- a/src/initialize-test-window.coffee +++ b/src/initialize-test-window.coffee @@ -70,6 +70,7 @@ module.exports = ({blobStore}) -> buildAtomEnvironment = (params) -> params = cloneObject(params) params.blobStore = blobStore unless params.hasOwnProperty("blobStore") + params.loadBaseStylesheetsOnly = true unless params.hasOwnProperty("loadBaseStylesheetsOnly") new AtomEnvironment(params) promise = testRunner({ From 967fca72140e16aaac6b17bb27934484cae1b5fa Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 13 Nov 2015 18:51:06 +0100 Subject: [PATCH 2/2] :art: --- src/atom-environment.coffee | 4 ++-- src/initialize-test-window.coffee | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index 77f8a6a2e..938010607 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -117,7 +117,7 @@ class AtomEnvironment extends Model # Call .loadOrCreate instead constructor: (params={}) -> - {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence, loadBaseStylesheetsOnly} = params + {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence, onlyLoadBaseStyleSheets} = params @state = {version: @constructor.version} @@ -183,7 +183,7 @@ class AtomEnvironment extends Model @themes.loadBaseStylesheets() @initialStyleElements = @styles.getSnapshot() - @themes.initialLoadComplete = true if loadBaseStylesheetsOnly + @themes.initialLoadComplete = true if onlyLoadBaseStyleSheets @setBodyPlatformClass() @stylesElement = @styles.buildStylesElement() diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee index f7704f2d8..375581a96 100644 --- a/src/initialize-test-window.coffee +++ b/src/initialize-test-window.coffee @@ -70,7 +70,7 @@ module.exports = ({blobStore}) -> buildAtomEnvironment = (params) -> params = cloneObject(params) params.blobStore = blobStore unless params.hasOwnProperty("blobStore") - params.loadBaseStylesheetsOnly = true unless params.hasOwnProperty("loadBaseStylesheetsOnly") + params.onlyLoadBaseStyleSheets = true unless params.hasOwnProperty("onlyLoadBaseStyleSheets") new AtomEnvironment(params) promise = testRunner({