From 42649d1b9a7420da3730087f71c638548cdd0b66 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 3 Apr 2019 11:31:49 -0700 Subject: [PATCH] Improve output HTML5 script wrapper for better Haxe 3.2 support --- templates/html5/output.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/html5/output.js b/templates/html5/output.js index c065ebbdd..ad0ac51b2 100644 --- a/templates/html5/output.js +++ b/templates/html5/output.js @@ -4,9 +4,12 @@ $hx_exports.lime = $hx_exports.lime || {}; $hx_exports.lime.$scripts = $hx_exports.lime.$scripts || {}; $hx_exports.lime.$scripts["::APP_FILE::"] = $hx_script; $hx_exports.lime.embed = function(projectName) { var exports = {}; - $hx_exports.lime.$scripts[projectName](exports, $global); + var script = $hx_exports.lime.$scripts[projectName]; + if (!script) throw Error("Cannot find project name \"" + projectName + "\""); + script(exports, $global); for (var key in exports) $hx_exports[key] = $hx_exports[key] || exports[key]; - exports.lime.embed.apply(exports.lime, arguments); + var lime = exports.lime || window.lime; + if (lime && lime.embed && this != lime.embed) lime.embed.apply(lime, arguments); return exports; }; })(typeof exports != "undefined" ? exports : typeof window != "undefined" ? window : typeof self != "undefined" ? self : this, typeof window != "undefined" ? window : typeof global != "undefined" ? global : typeof self != "undefined" ? self : this);