Merge remote-tracking branch 'origin/master'

This commit is contained in:
zadam
2021-03-18 22:11:45 +01:00
5 changed files with 36 additions and 9 deletions

View File

@@ -53,9 +53,14 @@ function getBundlesWithLabel(label, value) {
return bundles;
}
function getStartupBundles() {
function getStartupBundles(req) {
if (!process.env.TRILIUM_SAFE_MODE) {
return getBundlesWithLabel("run", "frontendStartup");
if (req.query.mobile === "true") {
return getBundlesWithLabel("run", "mobileStartup");
}
else {
return getBundlesWithLabel("run", "frontendStartup");
}
}
else {
return [];