From 5593ebe96535ff29851da9dc09a8336dbabdff5a Mon Sep 17 00:00:00 2001
From: Collin Green <collin@collingreen.com>
Date: Fri, 16 Oct 2015 17:21:20 -0700
Subject: [PATCH 1/2] respect manifest splash settings when simulating

Change simulator splash config from hardcoded autoHide: true to use the
splash config from the manifest if it exists (falls back to autoHide:
true) if no splash config is found.
---
 src/build/jsConfig.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/build/jsConfig.js b/src/build/jsConfig.js
index cc95d55..c4d15b9 100644
--- a/src/build/jsConfig.js
+++ b/src/build/jsConfig.js
@@ -27,9 +27,7 @@ exports.JSConfig = Class(function () {
       version: config.version || '',
       simulator: config.isSimulated && config.simulator,
       sdkVersion: config.sdkVersion || 'unknown',
-      splash: {
-        autoHide: true
-      },
+      splash: manifest.splash || { autoHide: true },
       useWebGL: manifest.browser && manifest.browser.canvas && manifest.browser.canvas.useWebGL || false
     };
 

From 154ab5ebac3bf551d6b310e155f98d1f08b6c55f Mon Sep 17 00:00:00 2001
From: Collin Green <collin@collingreen.com>
Date: Fri, 16 Oct 2015 17:22:57 -0700
Subject: [PATCH 2/2] include splash in simulator builds

---
 src/build/streams/html.js          | 2 +-
 src/build/targets/browser/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/build/streams/html.js b/src/build/streams/html.js
index d477503..f169e18 100644
--- a/src/build/streams/html.js
+++ b/src/build/streams/html.js
@@ -255,7 +255,7 @@ exports.GameHTML = Class(function () {
       ])
       .bind(this)
       .spread(function (css, js, splashExists, appCacheEvents) {
-        if (!splashExists && !config.isSimulated) {
+        if (!splashExists) {
           var splashPaths = {
             'portrait': ['portrait2048', 'portrait1136',
                           'portrait1024', 'portrait960', 'portrait480'],
diff --git a/src/build/targets/browser/index.js b/src/build/targets/browser/index.js
index 16f692f..aec7e41 100644
--- a/src/build/targets/browser/index.js
+++ b/src/build/targets/browser/index.js
@@ -46,7 +46,7 @@ exports.init = function (api, app, config) {
 
   if (config.isSimulated) {
     config.browser = {
-      embedSplash: false,
+      embedSplash: true,
       embedFonts: false,
       appleTouchIcon: false,
       appleTouchStartupImage: false,