Embed boot.min.js and boot.min.css into index.html for fast response

This commit is contained in:
djmaze 2020-09-06 11:13:43 +02:00
parent 45aaa17219
commit e1f1a3aa12
8 changed files with 57 additions and 74 deletions

View file

@ -234,15 +234,17 @@ class Service
list($sLanguage, $sTheme) = $this->oActions->GetLanguageAndTheme($bAdmin, $bMobile);
$bAppJsDebug = !!$this->oActions->Config()->Get('labs', 'use_app_debug_js', false);
$bAppCssDebug = !!$this->oActions->Config()->Get('labs', 'use_app_debug_css', false);
$oConfig = $this->oActions->Config();
$sFaviconUrl = (string) $this->oActions->Config()->Get('webmail', 'favicon_url', '');
$bAppJsDebug = !!$oConfig->Get('labs', 'use_app_debug_js', false);
$bAppCssDebug = !!$oConfig->Get('labs', 'use_app_debug_css', false);
$sFaviconUrl = (string) $oConfig->Get('webmail', 'favicon_url', '');
$sFaviconPngLink = $sFaviconUrl ? $sFaviconUrl : $this->staticPath('apple-touch-icon.png');
$sAppleTouchLink = $sFaviconUrl ? '' : $this->staticPath('apple-touch-icon.png');
$LoadingDescription = $this->oActions->Config()->Get('webmail', 'loading_description', 'RainLoop');
$LoadingDescription = $oConfig->Get('webmail', 'loading_description', 'RainLoop');
$aTemplateParameters = array(
'{{BaseAppHeadScriptLink}}' => '',
@ -253,11 +255,12 @@ class Service
'{{BaseAppThemeCssLink}}' => $this->oActions->ThemeLink($sTheme, $bAdmin),
'{{BaseAppPolyfillsScriptLink}}' => '',
'{{BaseAppBootScriptLink}}' => $this->staticPath('js/'.($bAppJsDebug ? '' : 'min/').'boot'.($bAppJsDebug ? '' : '.min').'.js'),
'{{BaseAppBootScript}}' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/js/min/boot.min.js'),
'{{BaseViewport}}' => $bMobile ? 'width=device-width,initial-scale=1,user-scalable=no' : 'width=950,maximum-scale=2',
'{{BaseContentSecurityPolicy}}' => '',
'{{BaseDir}}' => false && \in_array($sLanguage, array('ar', 'he', 'ur')) ? 'rtl' : 'ltr',
'{{BaseAppManifestLink}}' => $this->staticPath('manifest.json'),
'{{BaseAppBootCss}}' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.($bAppCssDebug ? '' : '.min').'.css'),
'{{BaseAppBootCss}}' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot.min.css'),
'{{LoadingDescriptionEsc}}' => \htmlspecialchars($LoadingDescription, ENT_QUOTES|ENT_IGNORE, 'UTF-8')
);
@ -272,7 +275,7 @@ class Service
$aTemplateParameters['{{BaseHash}}'] = \md5(
\implode('~', array(
$bAdmin ? '1' : '0',
\md5($this->oActions->Config()->Get('cache', 'index', '')),
\md5($oConfig->Get('cache', 'index', '')),
$this->oActions->Plugins()->Hash(),
Utils::WebVersionPath(),
APP_VERSION,

View file

@ -13,7 +13,7 @@
<title></title>
{{BaseAppFaviconPngLinkTag}}
{{BaseAppFaviconTouchLinkTag}}
<style>{{BaseAppBootCss}}</style>
<style id="app-boot-css">{{BaseAppBootCss}}</style>
<link type="text/css" rel="stylesheet" data-href="{{BaseAppMainCssLink}}" id="app-css" />
<link type="text/css" rel="stylesheet" data-href="{{BaseAppThemeCssLink}}" id="app-theme-link" />
<link rel="manifest" href="{{BaseAppManifestLink}}" />
@ -29,8 +29,8 @@
<div class="e-bounce bounce3"></div>
</div>
</div>
<div id="rl-loading-error" class="thm-loading">An error occurred.<br/>Please refresh the page and try again.</div>
<div id="rl-content">
<div id="rl-loading-error" class="thm-loading" hidden="">An error occurred.<br/>Please refresh the page and try again.</div>
<div id="rl-content" hidden="">
<div id="rl-popups"></div>
<div id="rl-center">
<div id="rl-top"></div>
@ -43,7 +43,7 @@
</div>
<div id="rl-check"></div>
<div class="progressjs"><div class="progressjs-inner"><div class="progressjs-percent"></div></div></div>
<script type="text/javascript" data-cfasync="false" src="{{BaseAppBootScriptLink}}"></script>
<script type="text/javascript">{{BaseAppBootScript}}</script>
</body>
</html>