🐛 Fix filepaths after moving to subfolders #46

master
ra100 2019-11-17 23:39:31 +01:00
parent da1d4d768c
commit dc0e3823b5
No known key found for this signature in database
GPG Key ID: 18F9740D64C08249
2 changed files with 8 additions and 8 deletions

View File

@ -10,7 +10,7 @@ var AppInfo = {
if (storageFile.content) if (storageFile.content)
return Promise.resolve(storageFile); return Promise.resolve(storageFile);
else if (storageFile.url) else if (storageFile.url)
return fileGetter("apps/"+storageFile.url).then(content => { return fileGetter(`apps/${app.id}/${storageFile.url}`).then(content => {
return { return {
name : storageFile.name, name : storageFile.name,
content : content, content : content,

View File

@ -73,7 +73,7 @@ function handleCustomApp(app) {
</div> </div>
<div class="modal-body" style="height:100%"> <div class="modal-body" style="height:100%">
<div class="content" style="height:100%"> <div class="content" style="height:100%">
<iframe src="apps/${app.custom}" style="width:100%;height:100%;border:0px;"> <iframe src="apps/${app.id}/${app.custom}" style="width:100%;height:100%;border:0px;">
</div> </div>
</div> </div>
</div> </div>
@ -133,7 +133,7 @@ function refreshLibrary() {
icon = "icon-delete"; icon = "icon-delete";
return `<div class="tile column col-6 col-sm-12 col-xs-12"> return `<div class="tile column col-6 col-sm-12 col-xs-12">
<div class="tile-icon"> <div class="tile-icon">
<figure class="avatar"><img src="apps/${app.icon?app.icon:"apps/unknown.png"}" alt="${escapeHtml(app.name)}"></figure> <figure class="avatar"><img src="apps/${app.icon?`${app.id}/${app.icon}`:"unknown.png"}" alt="${escapeHtml(app.name)}"></figure>
</div> </div>
<div class="tile-content"> <div class="tile-content">
<p class="tile-title text-bold">${escapeHtml(app.name)}</p> <p class="tile-title text-bold">${escapeHtml(app.name)}</p>
@ -217,7 +217,7 @@ function appNameToApp(appName) {
the menu but may not get rid of all files. */ the menu but may not get rid of all files. */
return { id: appName, return { id: appName,
name: "Unknown app "+appName, name: "Unknown app "+appName,
icon: "unknown.png", icon: "../unknown.png",
description: "Unknown app", description: "Unknown app",
storage: [ {name:"+"+appName}], storage: [ {name:"+"+appName}],
unknown: true, unknown: true,
@ -240,7 +240,7 @@ function refreshMyApps() {
tab.setAttribute("data-badge", appsInstalled.length); tab.setAttribute("data-badge", appsInstalled.length);
panelbody.innerHTML = appsInstalled.map(appNameToApp).sort(appSorter).map(app => `<div class="tile column col-6 col-sm-12 col-xs-12"> panelbody.innerHTML = appsInstalled.map(appNameToApp).sort(appSorter).map(app => `<div class="tile column col-6 col-sm-12 col-xs-12">
<div class="tile-icon"> <div class="tile-icon">
<figure class="avatar"><img src="apps/${app.icon}" alt="${escapeHtml(app.name)}"></figure> <figure class="avatar"><img src="apps/${app.icon?`${app.id}/${app.icon}`:"unknown.png"}" alt="${escapeHtml(app.name)}"></figure>
</div> </div>
<div class="tile-content"> <div class="tile-content">
<p class="tile-title text-bold">${escapeHtml(app.name)}</p> <p class="tile-title text-bold">${escapeHtml(app.name)}</p>