diff --git a/data/emu-main.js b/data/emu-main.js index b705877..f8fb3c7 100644 --- a/data/emu-main.js +++ b/data/emu-main.js @@ -423,7 +423,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) { 'isIE': !!document.documentMode, 'isWebkit': 'WebkitAppearance' in document.documentElement.style && !/Edge/ .test(navigator.userAgent), 'isIPhone': /(iPhone|iPod)/gi .test(navigator.platform), - 'isIos': /(iPad|iPhone|iPod)/gi .test(navigator.platform), + 'isIos': (/(iPad|iPhone|iPod)/gi .test(navigator.userAgent) || (/Macintosh/i.test(navigator.userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 1)), 'info': function() { let _0xa88a13 = /(MSIE|(?!Gecko.+)Firefox|(?!AppleWebKit.+Chrome.+)Safari|(?!AppleWebKit.+)Chrome|AppleWebKit(?!.+Chrome|.+Safari)|Gecko(?!.+Firefox))(?: |\/)([\d\.apre]+)/ .exec(navigator.userAgent); return { diff --git a/data/loader.js b/data/loader.js index 55cbb54..6750ae8 100644 --- a/data/loader.js +++ b/data/loader.js @@ -13,7 +13,6 @@ } }) } - let scriptTag = document.getElementsByTagName('script')[0]; function loadStyle(file) { return new Promise(function(resolve, reject) { let css = document.createElement('link'); @@ -45,13 +44,13 @@ return file+'?v='+VERSION; } }(); - scriptTag.parentNode.insertBefore(script, scriptTag); script.onload = resolve; + document.head.appendChild(script); }) } const isIpad = /Macintosh/i.test(navigator.userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 1; if (('undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) || - /(iPad|iPhone|iPod)/gi.test(navigator.platform) || isIpad) { + /(iPad|iPhone|iPod)/gi.test(navigator.userAgent) || isIpad) { await loadStyle('emu-css.css'); await loadScript('emu-main.js'); await loadScript('emulator.js');