Fix folder list for TB74+ due to change in API again...

This commit is contained in:
Ximi1970
2020-05-09 21:17:41 +02:00
parent 76a23cfd63
commit ce6ca7d450

View File

@@ -1,9 +1,13 @@
var SysTrayX = {};
var BrowserInfo = {};
SysTrayX.Accounts = {
initialized: false,
init: function () {
init: async function () {
BrowserInfo = await browser.runtime.getBrowserInfo().then((info) => info);
this.getAccounts().then(this.getAccountsCb);
},
@@ -34,7 +38,7 @@ SysTrayX.Accounts = {
name: folder.name,
accountId: folder.accountId,
path: folder.path,
children: r[name].result,
subFolders: r[name].result,
});
}
@@ -115,8 +119,15 @@ SysTrayX.Accounts = {
);
typeLi.appendChild(typeText);
// Create a usable folder tree
const folders = createFolderTree(accounts[prop][i].folders);
// Create a usable folder tree <TB74
let folders = [];
if (BrowserInfo.version.split(".")[0] < 74) {
folders = createFolderTree(accounts[prop][i].folders);
} else {
folders = accounts[prop][i].folders;
}
console.debug("Folders: " + JSON.stringify(folders));
// Recursive list creator
function createListLevel(level, parent) {
@@ -124,7 +135,7 @@ SysTrayX.Accounts = {
typeLevelUl.setAttribute("class", "nested");
if (parent) {
parent.children = [];
parent.subFolders = [];
parent.name = "^ Add base folder";
level.unshift(parent);
@@ -134,7 +145,7 @@ SysTrayX.Accounts = {
const typeEleLi = document.createElement("li");
const typeEleSpan = document.createElement("span");
if (element.children.length > 0) {
if (element.subFolders.length > 0) {
typeEleSpan.setAttribute("class", "caret");
} else {
typeEleSpan.setAttribute("class", "caretfiller");
@@ -150,7 +161,7 @@ SysTrayX.Accounts = {
path: element.path,
})
);
if (element.children.length > 0) {
if (element.subFolders.length > 0) {
typeEleInput.setAttribute("name", "parent-" + element.name);
} else {
typeEleInput.setAttribute("name", "child-" + element.name);
@@ -160,9 +171,9 @@ SysTrayX.Accounts = {
const typeEleText = document.createTextNode(" " + element.name);
typeEleLi.appendChild(typeEleText);
if (element.children.length > 0) {
if (element.subFolders.length > 0) {
typeEleLi.appendChild(
createListLevel(element.children, element)
createListLevel(element.subFolders, element)
);
}