From a935f3552a08c26e95037b1813760b2d3e5c66ef Mon Sep 17 00:00:00 2001 From: Jay Won Date: Sat, 5 Apr 2014 01:45:33 -1000 Subject: [PATCH 1/2] Added parsing logic for new RELOAD_SAFETYBELT token added in latest version of meteor. First implemented in commit: https://github.com/meteor/meteor/commit/276034617afea0ca7d65a31113a871e7b29b59f3 --- server.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/server.js b/server.js index 1f61923..e9b03af 100644 --- a/server.js +++ b/server.js @@ -29,14 +29,22 @@ WebApp.connectHandlers code = new String(code); // console.log((new String(angular)).join()); code = code.replace("",new String(angular)); - code = code.replace("",''); - if (typeof __meteor_runtime_config__ !== 'undefined') { - code = code.replace( - "// ##RUNTIME_CONFIG##", - "__meteor_runtime_config__ = " + - JSON.stringify(__meteor_runtime_config__) + ";"); - } - + code = code.replace("",''); + if (typeof __meteor_runtime_config__ !== 'undefined') { + code = code.replace( + "// ##RUNTIME_CONFIG##", + "__meteor_runtime_config__ = " + + JSON.stringify(__meteor_runtime_config__) + ";"); + } + + if (WebAppInternals.inlineScriptsAllowed()) { + code = code.replace(/##RELOAD_SAFETYBELT##/, + ""); + }else{ + code = code.replace(/##RELOAD_SAFETYBELT##/, + ""); + } + res.writeHead(200, {'Content-Type': 'text/html'}); res.write(code); res.end(); From 8aafc2c7c4f7c3b0752f71dbf53cd5f56ccfb60e Mon Sep 17 00:00:00 2001 From: Jay Won Date: Sun, 6 Apr 2014 02:13:07 -1000 Subject: [PATCH 2/2] Missed RELOAD_SAFETYBELT var declaration on last commit. --- server.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server.js b/server.js index e9b03af..87d0ea9 100644 --- a/server.js +++ b/server.js @@ -25,6 +25,12 @@ WebApp.connectHandlers } } + var RELOAD_SAFETYBELT = "\n" + + "if (typeof Package === 'undefined' || \n" + + " ! Package.webapp || \n" + + " ! Package.webapp.WebApp || \n" + + " ! Package.webapp.WebApp._isCssLoaded()) \n" + + " document.location.reload(); \n"; code = new String(code); // console.log((new String(angular)).join());