Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 16:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert broken RainLoop merge for TemplatesLink

Browse source
This commit is contained in:
djmaze 2020-07-15 14:24:32 +02:00
parent a541123034
commit a6a337e5ce
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/bootstrap.js vendored
View file

@ -44,9 +44,7 @@ export default (App) => {
window.__APP_BOOT = (fErrorCallback) => { window.__APP_BOOT = (fErrorCallback) => {
domReady(() => { domReady(() => {
window.setTimeout(() => { window.setTimeout(() => {
if (window.document.getElementById('rainloop-templates-id')) { if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
start();
} else if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
window.document.getElementById('rl-templates').innerHTML = window.rainloopTEMPLATES[0]; window.document.getElementById('rl-templates').innerHTML = window.rainloopTEMPLATES[0];
start(); start();
} else { } else {

3
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1225,7 +1225,7 @@ class Actions
/* /*
required by Index.html and rl.js: required by Index.html and rl.js:
NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground PluginsLink AuthAccountHash NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBackground PluginsLink AuthAccountHash
*/ */
$aResult = array( $aResult = array(
@ -1593,6 +1593,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins
($bAdmin ? $aResult['LanguageAdmin'] : $aResult['Language']).'/'.$sStaticCache.'/'; ($bAdmin ? $aResult['LanguageAdmin'] : $aResult['Language']).'/'.$sStaticCache.'/';
// $aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/'; // $aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
$aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
$bAppJsDebug = !!$this->Config()->Get('labs', 'use_app_debug_js', false); $bAppJsDebug = !!$this->Config()->Get('labs', 'use_app_debug_js', false);