diff --git a/dev/Common/Booter.js b/dev/Common/Booter.js index 13bdf02b6..dae66e9a4 100644 --- a/dev/Common/Booter.js +++ b/dev/Common/Booter.js @@ -12,41 +12,6 @@ window.__rlah_set = () => setHash(); window.__rlah_clear = () => clearHash(); window.__rlah_data = () => RL_APP_DATA_STORAGE; -const useJsNextBundle = (function() { - // try { - // - // (function() { - // eval(` - // // let + const - //const x = 5; let y = 4; var z = 4; - // - // // Arrow Function - //const f = () => 'rainloop'; - // - // // Default + Rest + Spread - //const d = (test = 1, ...t) => 'rainloop'; - //d(...[1, 2, 3]); - // - //// Destructuring - //let [a, b] = [1, 2]; - //({a, b} = {a: 1, b: 2}); - // - //// Class - //class Q1 { constructor() {} } - // - //// Class extends + super - //class Q2 extends Q1 { constructor() { super() } } - // - //`); - // }()); - // - // return true; - // } - // catch (e) {} - return false; -})(); -/* eslint-enable */ - /** * @param {string} styles * @returns {void} @@ -202,7 +167,6 @@ function runApp() { appData.LangLink && appData.StaticLibJsLink && appData.StaticAppJsLink && - appData.StaticAppJsNextLink && appData.StaticEditorJsLink ) { const p = progressJs; @@ -227,10 +191,6 @@ function runApp() { p.set(20); return window.Promise.all([jassl(appData.TemplatesLink), jassl(appData.LangLink)]); }) - .then(() => { - p.set(30); - return jassl(useJsNextBundle ? appData.StaticAppJsNextLink : appData.StaticAppJsLink); - }) .then(() => { p.set(50); return appData.PluginsLink ? jassl(appData.PluginsLink) : window.Promise.resolve(); @@ -287,12 +247,6 @@ window.__runBoot = function() { window.document.location.replace('./?/NoCookie'); } - const root = window.document.documentElement; - - if (useJsNextBundle) { - root.className += ' js-next'; - } - if (includeLayout()) { includeAppScr(getRainloopBootData()); } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 9593e0d87..91d5c7905 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1602,7 +1602,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack $aResult['StaticAppJsLink'] = $this->StaticPath('js/'.($bAppJsDebug ? '' : 'min/'). ($bAdmin ? 'admin' : 'app').($bAppJsDebug ? '' : '.min').'.js'); - $aResult['StaticAppJsNextLink'] = $this->StaticPath('js/'.($bAdmin ? 'admin' : 'app').'.next.js'); $aResult['StaticEditorJsLink'] = $this->StaticPath('ckeditor/ckeditor.js'); $aResult['EditorDefaultType'] = \in_array($aResult['EditorDefaultType'], array('Plain', 'Html', 'HtmlForced', 'PlainForced')) ?