major refactor cont'd

This commit is contained in:
Collin M. Barrett 2017-02-06 06:25:23 -06:00
parent e1f0302daa
commit d9ebad81fa
2 changed files with 16 additions and 9 deletions

View file

@ -89,7 +89,8 @@ function refreshPublic() {
columnDataTopCell.setValue("=ARRAYFORMULA(IF(Parsed!A2:A=\"\",\"\",\"<p>\"&Parsed!A2:A&Parsed!B2:B&Parsed!C2:C&Parsed!D2:D&Parsed!E2:E&Parsed!F2:F&Parsed!G2:G&\"</p>\"))");
break;
case "related":
columnDataTopCell.setValue("=ARRAYFORMULA(INDIRECT(\"Parsed!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"\")))");
columnDataTopCell.setValue("=createHtmlRelatedLinkArray(INDIRECT(\"Data!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"\")))");
//columnDataTopCell.setValue("=ARRAYFORMULA(INDIRECT(\"Parsed!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"\")))");
break;
default:
}

View file

@ -103,17 +103,23 @@ function createHtmlDonateLinkArray(url, listName) {
}
}
function createHtmlRelatedLinkArray(forkComboListName, filterListsPageSlug) {
if (forkComboListName instanceof Array) {
for (i in forkComboListName) {
forkComboListName[i] = createHtmlRelatedLinkArray(forkComboListName[i], filterListsPageSlug[i]);
function createHtmlRelatedLinkArray(related) {
if (related instanceof Array) {
for (i in related) {
related[i] = createHtmlRelatedLinkArray(related[i]);
}
return forkComboListName;
return related;
} else {
if (forkComboListName == null) {
return null;
if (!related) {
return "";
} else {
return "<a href=\"https://filterlists.com" + filterListsPageSlug + "#" + trimUrlSlugArray(forkComboListName) + "\"";
var relatedArray = related.split(',');
var relatedHtml = "<ul>";
for (var i = 0, relatedArrayLength = relatedArray.length; i < relatedArrayLength; i++) {
relatedHtml += "<li><a href=\"#" + trimUrlSlugArray(relatedArray[i]) + "\">" + relatedArray[i] + "</a></li>";
}
relatedHtml += "</ul>";
return relatedHtml;
}
}
}