From fff546a1e5abeeda2542cba4cbbd6463903d31fe Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 13 May 2015 09:47:10 -0700 Subject: [PATCH] Don't set background of spec windows --- static/index.js | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/static/index.js b/static/index.js index c00fe4c14..a656ac501 100644 --- a/static/index.js +++ b/static/index.js @@ -1,6 +1,9 @@ var fs = require('fs'); var path = require('path'); +var loadSettings = null; +var loadSettingsError = null; + window.onload = function() { try { var startTime = Date.now(); @@ -18,18 +21,13 @@ window.onload = function() { cacheDir = path.join(cacheDir, 'root'); } - var rawLoadSettings = decodeURIComponent(location.hash.substr(1)); - var loadSettings; - try { - loadSettings = JSON.parse(rawLoadSettings); - } catch (error) { - console.error("Failed to parse load settings: " + rawLoadSettings); - throw error; - } - // Normalize to make sure drive letter case is consistent on Windows process.resourcesPath = path.normalize(process.resourcesPath); + if (loadSettingsError) { + throw loadSettingsError; + } + var devMode = loadSettings.devMode || !loadSettings.resourcePath.startsWith(process.resourcesPath + path.sep); if (loadSettings.profileStartup) { @@ -163,7 +161,24 @@ var profileStartup = function(cacheDir, loadSettings, initialTime) { } } +var parseLoadSettings = function() { + var rawLoadSettings = decodeURIComponent(location.hash.substr(1)); + try { + loadSettings = JSON.parse(rawLoadSettings); + } catch (error) { + loadSettingsError = error; + } + + if (!loadSettings || typeof loadSettings !== 'object') { + loadSettings = {}; + } +} + var setupWindowBackground = function() { + if (loadSettings.isSpec) { + return; + } + var backgroundColor = window.localStorage.getItem('atom:window-background-color'); if (!backgroundColor) { return; @@ -184,4 +199,5 @@ var setupWindowBackground = function() { }, false); } +parseLoadSettings(); setupWindowBackground();