Improve term rendering.

This commit is contained in:
kor 2018-08-13 02:48:17 +12:00
parent 90021ad3cc
commit 436a217087
2 changed files with 28 additions and 27 deletions

View File

@ -264,10 +264,7 @@ function View()
{ {
if (typeof value.TERM !== 'undefined') if (typeof value.TERM !== 'undefined')
{ {
for (var i = 0; i < value.TERM.length; i++) entry += this.buildArrayElement(value.TERM, "term", "fas fa-ribbon textIcon");
{
entry += `<div class="term"><i class="fas fa-ribbon textIcon"></i><b>${value.TERM[i][0]}</b>: ${value.TERM[i][1]}</div>`;
}
} }
} }
@ -502,7 +499,19 @@ function View()
else if (data[i].substring(0, 2) == "> ") else if (data[i].substring(0, 2) == "> ")
{ {
// New item // New item
result += `<div class="${className}"><i class="${iconName}"></i>${data[i].substring(2)}</div>`; if (data[i].includes(": "))
{
let titleSplit = data[i].substring(2).split(': '); // .substring(2) removes the "> "
for (var e = 0; e < titleSplit.length; e++)
{
titleSplit[e] = titleSplit[e].trim();
}
result += `<div class="term"><i class="fas fa-ribbon textIcon"></i><b>${titleSplit[0]}</b>: ${titleSplit[1]}</div>`;
}
else
{
result += `<div class="${className}"><i class="${iconName}"></i>${data[i].substring(2)}</div>`;
}
} }
else if (data[i].substring(0, 2) == "& ") else if (data[i].substring(0, 2) == "& ")
{ {
@ -558,10 +567,12 @@ function View()
var hostname; var hostname;
// find & remove protocol (http, ftp, etc.) and get hostname // find & remove protocol (http, ftp, etc.) and get hostname
if (url.indexOf("://") > -1) { if (url.indexOf("://") > -1)
{
hostname = url.split('/')[2]; hostname = url.split('/')[2];
} }
else { else
{
hostname = url.split('/')[0]; hostname = url.split('/')[0];
} }

View File

@ -29,25 +29,6 @@ function Wrap()
this.database[this.keys[i]].TAGS = tags; this.database[this.keys[i]].TAGS = tags;
} }
// TERMS
if (typeof value.TERM !== 'undefined')
{
let termRunic = new Runic(value.TERM).raw;
let formattedTerms = [];
for (var t = 0; t < termRunic.length; t++)
{
term = termRunic[t].substr(2).split(':');
for (var e = 0; e < term.length; e++)
{
term[e] = term[e].trim();
}
formattedTerms.push(term);
}
this.database[this.keys[i]].TERM = formattedTerms;
}
this.database[this.keys[i]].DIID = i; this.database[this.keys[i]].DIID = i;
} }
} }
@ -159,7 +140,16 @@ function Wrap()
// TERM // TERM
if (typeof db[dbKeys[i]].TERM !== 'undefined') if (typeof db[dbKeys[i]].TERM !== 'undefined')
{ {
stats.terms += db[dbKeys[i]].TERM.length; let count = 0;
for (var t = 0; t < db[dbKeys[i]].TERM.length; t++)
{
if (db[dbKeys[i]].TERM[t].substr(0,2) == '> ')
{
count++;
}
}
stats.terms += count;
} }
} }