mirror of
https://github.com/TangentFoxy/memex.git
synced 2024-11-22 04:54:23 +00:00
Add promises to article building.
This commit is contained in:
kor
parent
82a728f8ca
commit
eea38f4cc1
@ -4554,4 +4554,16 @@ JS MAP IS DICTIONARY?
|
||||
- It's optimized for adding items to and removing items from the map.
|
||||
- The keys can by any type, not just strings.
|
||||
- You can't pollute it with custom methods.
|
||||
|
||||
JS REDUCE
|
||||
NOTE
|
||||
> "Whenever you need to transform a list into a single object, consider using reduce"
|
||||
|
||||
CSS LINK IN BODY
|
||||
LINK
|
||||
> https://stackoverflow.com/questions/6236097/is-link-not-rel-stylesheet-allowed-to-be-used-in-body
|
||||
> https://github.com/whatwg/html/commit/179983e9eb99efe417349a40ebb664bd11668ddd
|
||||
> http://w3c.github.io/html/document-metadata.html#the-link-element
|
||||
TAGS : code, web
|
||||
PROJ : Memex
|
||||
`
|
||||
@ -11,6 +11,9 @@ function Main()
|
||||
this.queryPrev = '';
|
||||
this.queryPrevAdd = '';
|
||||
|
||||
this.timeStore = Date.now();
|
||||
this.curTime = null;
|
||||
|
||||
var parent = this;
|
||||
|
||||
this.install = function()
|
||||
@ -39,35 +42,25 @@ function Main()
|
||||
}
|
||||
}
|
||||
|
||||
this.timediff = function(label)
|
||||
{
|
||||
this.curTime = Date.now();
|
||||
console.log((this.curTime - this.timeStore) + ' ms to ' + label);
|
||||
this.timeStore = this.curTime;
|
||||
}
|
||||
|
||||
this.start = function()
|
||||
{
|
||||
console.log(Date.now() + ' - start');
|
||||
let dbPromise = this.database.start(new Indental(DATABASE).parse());
|
||||
dbPromise.then((db) => {
|
||||
console.log(Date.now() + ' - db ready');
|
||||
// console.log(db);
|
||||
|
||||
|
||||
|
||||
setTimeout(() => {
|
||||
let dbKeys = Object.keys(db);
|
||||
let i = 0;
|
||||
|
||||
console.log(Date.now() + ' - start render');
|
||||
|
||||
while (i < 200)//dbKeys.length)
|
||||
{
|
||||
document.querySelector('main').innerHTML += this.grid.buildArticle(db[dbKeys[i]], dbKeys[i]);
|
||||
console.log(Date.now() + ' - did one! LAAAAAAG while reflowing');
|
||||
i++;
|
||||
}
|
||||
|
||||
console.log('COMPLETED ALL ARTICLES - lag stops')
|
||||
return 'done';
|
||||
}, 2000);
|
||||
|
||||
|
||||
|
||||
this.timediff('call start');
|
||||
this.database.start(new Indental(DATABASE).parse())
|
||||
.then((db) => {
|
||||
this.timediff('process db');
|
||||
return this.grid.buildAllArticles(db);
|
||||
})
|
||||
.then((html) => {
|
||||
this.timediff('build html');
|
||||
document.querySelector('main').innerHTML = html;
|
||||
this.timediff('render html');
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log('ERROR:', error);
|
||||
|
||||
@ -75,350 +75,366 @@ function Grid()
|
||||
}
|
||||
}
|
||||
|
||||
this.buildArticle = function(value, key)
|
||||
this.buildAllArticles = function(db)
|
||||
{
|
||||
// let value = db[key];
|
||||
let itemClass = "article";
|
||||
if (SETTINGS.WIDEARTICLE)
|
||||
return new Promise(function(resolve, reject)
|
||||
{
|
||||
if (main.util.isDefined(value.WIDE) && value.WIDE)
|
||||
this.buildArticle = function(value, key)
|
||||
{
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
else if (main.util.isDefined(value.QOTE))
|
||||
{
|
||||
if (Array.isArray(value.QOTE) && value.QOTE.length > SETTINGS.AUTOWIDETRIGGER)
|
||||
// let value = db[key];
|
||||
let itemClass = "article";
|
||||
if (SETTINGS.WIDEARTICLE)
|
||||
{
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let onclickImage = ``;
|
||||
let articleIsImageType = (SETTINGS.SHOWIMAG && main.util.isType(value.TYPE, 'image'));
|
||||
if (articleIsImageType)
|
||||
{
|
||||
onclickImage = `onclick="main.grid.handleImageClick(event, this, '${value.FILE}');"`;
|
||||
}
|
||||
|
||||
// ARTICLE
|
||||
let article = `<article class="${itemClass}" id="${SETTINGS.ARTICLEIDBASE + value.DIID}">`;
|
||||
|
||||
if (main.util.isDefined(value.LINK))
|
||||
{
|
||||
var idUrl = "url";
|
||||
if (main.util.isDefined(value.SEEN) && value.SEEN === "true")
|
||||
{
|
||||
idUrl = "urlseen";
|
||||
}
|
||||
|
||||
// LINK START
|
||||
if (SETTINGS.SHOWLINK && !main.util.isObject(value.LINK))
|
||||
{
|
||||
// If this item has only one link then make the whole title the link
|
||||
article += `<a class="article-link" href="${String(value.LINK)}" id="${idUrl}">`;
|
||||
}
|
||||
}
|
||||
|
||||
// UPPER CONTENT START
|
||||
if (SETTINGS.SHOWUPPER)
|
||||
{
|
||||
let upperClass = 'article-containerupper';
|
||||
if (articleIsImageType)
|
||||
{
|
||||
upperClass = 'article-containerupper-image';
|
||||
}
|
||||
article += `<div class="${upperClass}" ${onclickImage}>`;
|
||||
|
||||
// TITLE
|
||||
if (SETTINGS.SHOWTITLE)
|
||||
{
|
||||
article += `<header class="article-title">${key.to_properCase()}</header>`;
|
||||
}
|
||||
|
||||
// LINK END
|
||||
if (SETTINGS.SHOWLINK && main.util.isDefined(value.LINK))
|
||||
{
|
||||
if (main.util.isObject(value.LINK))
|
||||
{
|
||||
for (let l = 0; l < value.LINK.length; l++)
|
||||
if (main.util.isDefined(value.WIDE) && value.WIDE)
|
||||
{
|
||||
article += `<a class="article-link" href="${String(value.LINK[l])}" id="${idUrl}">`;
|
||||
article += `<div class="article-linkcontainer"><div class="article-linkicon">${main.util.buildIcon('link')}</div><div class="article-linktitle">${main.util.extractRootDomain(value.LINK[l])}</div></div></a>`;
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
article += `<div class="article-linkcontainer"><div class="article-linkicon">${main.util.buildIcon('link')}</div><div class="article-linktitle">${main.util.extractRootDomain(value.LINK)}</div></div></a>`;
|
||||
}
|
||||
}
|
||||
|
||||
// TYPE
|
||||
if (SETTINGS.SHOWTYPE || SETTINGS.SHOWDONE)
|
||||
{
|
||||
article += `<div class="article-typecontainer">`;
|
||||
|
||||
if (SETTINGS.SHOWTYPE && main.util.isDefined(value.TYPE))
|
||||
{
|
||||
for (let tc = 0; tc < value.TYPE.length; tc++)
|
||||
else if (main.util.isDefined(value.QOTE))
|
||||
{
|
||||
article += `<a class="article-type" href='#type-${value.TYPE[tc]}'>`;
|
||||
article += main.util.buildIcon(value.TYPE[tc], value.TYPE[tc], 'article-typeicon');
|
||||
article += `</a>`;
|
||||
}
|
||||
}
|
||||
|
||||
if (SETTINGS.SHOWDONE)
|
||||
{
|
||||
let done = main.util.isDefined(value.DONE) ? value.DONE : 'false';
|
||||
article += `<a class="article-type" href='#done-${done}'>`;
|
||||
article += main.util.buildIcon(done, done, 'article-typeicon');
|
||||
article += `</a>`;
|
||||
}
|
||||
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
// UPPER CONTENT END
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
// IMAGE - for image-type-article
|
||||
if (articleIsImageType
|
||||
&& main.util.isDefined(value.FILE)
|
||||
&& main.util.isImage(value.FILE))
|
||||
{
|
||||
// IMAGE ARTICLE
|
||||
|
||||
article += `<div class="article-imageType-imgContainer">`;
|
||||
if (SETTINGS.SHOWOVERLAY)
|
||||
{
|
||||
article += `<div class="image-overlay" ${onclickImage}></div>`;
|
||||
}
|
||||
article += `<img class="article-image-img" src="content/media/${value.FILE}">`;
|
||||
|
||||
article += this.doLower(value, articleIsImageType, onclickImage);
|
||||
|
||||
article += `</div>`;
|
||||
|
||||
article += `<div class="article-containerbelow">`;
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
{
|
||||
article += this.doRowMulti('term', value.TERM);
|
||||
}
|
||||
|
||||
// NOTE
|
||||
if (SETTINGS.SHOWNOTE && main.util.isDefined(value.NOTE))
|
||||
{
|
||||
article += this.doRowMulti('note', value.NOTE);
|
||||
}
|
||||
|
||||
// QUOTE
|
||||
if (SETTINGS.SHOWQOTE && main.util.isDefined(value.QOTE))
|
||||
{
|
||||
article += this.doRowMulti('quote', value.QOTE);
|
||||
}
|
||||
|
||||
// PROGRESS
|
||||
if (SETTINGS.SHOWPROG && main.util.isDefined(value.PROG))
|
||||
{
|
||||
article += this.doRowMulti('progress', value.PROG);
|
||||
}
|
||||
article += `</div>`;
|
||||
}
|
||||
else
|
||||
{
|
||||
// NORMAL ARTICLE (NON-IMAGE)
|
||||
article += this.doLower(value, articleIsImageType, onclickImage);
|
||||
}
|
||||
|
||||
article += `</article>`;
|
||||
return article;
|
||||
}
|
||||
|
||||
this.doLower = function(value, articleIsImageType, onclickImage)
|
||||
{
|
||||
let article = '';
|
||||
// LOWER CONTENT START
|
||||
if (SETTINGS.SHOWLOWER)
|
||||
{
|
||||
let lowerClass = 'article-containerlower';
|
||||
if (articleIsImageType)
|
||||
{
|
||||
lowerClass = 'article-containerlower-image';
|
||||
}
|
||||
article += `<div class="${lowerClass}" ${onclickImage}>`;
|
||||
|
||||
// TIME
|
||||
if (SETTINGS.SHOWDATE && main.util.isDefined(value.DATE))
|
||||
{
|
||||
article += this.doRow('date', value.DATE);
|
||||
}
|
||||
|
||||
// AUTHOR
|
||||
if (SETTINGS.SHOWAUTH && main.util.isDefined(value.AUTH))
|
||||
{
|
||||
for (var i = 0; i < value.AUTH.length; i++)
|
||||
{
|
||||
article += this.doRow('author', value.AUTH[i].to_properCase());
|
||||
}
|
||||
}
|
||||
|
||||
// TAGS
|
||||
if (SETTINGS.SHOWTAGS && main.util.isDefined(value.TAGS))
|
||||
{
|
||||
article += this.doRowArray('tags', value.TAGS, 'tag', false);
|
||||
}
|
||||
|
||||
// PROJECT
|
||||
if (SETTINGS.SHOWPROJ && main.util.isDefined(value.PROJ))
|
||||
{
|
||||
article += this.doRowArray('project', value.PROJ, 'proj', true);
|
||||
}
|
||||
|
||||
if (!articleIsImageType)
|
||||
{
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
{
|
||||
article += this.doRowMulti('term', value.TERM);
|
||||
}
|
||||
|
||||
// NOTE
|
||||
if (SETTINGS.SHOWNOTE && main.util.isDefined(value.NOTE))
|
||||
{
|
||||
article += this.doRowMulti('note', value.NOTE);
|
||||
}
|
||||
|
||||
// QUOTE
|
||||
if (SETTINGS.SHOWQOTE && main.util.isDefined(value.QOTE))
|
||||
{
|
||||
article += this.doRowMulti('quote', value.QOTE);
|
||||
}
|
||||
|
||||
// PROGRESS
|
||||
if (SETTINGS.SHOWPROG && main.util.isDefined(value.PROG))
|
||||
{
|
||||
article += this.doRowMulti('progress', value.PROG);
|
||||
}
|
||||
}
|
||||
|
||||
// IMAGE - for non-image-type-article
|
||||
if (SETTINGS.SHOWIMAG
|
||||
&& !main.util.isType(value.TYPE, 'image')
|
||||
&& main.util.isDefined(value.FILE)
|
||||
&& main.util.isImage(value.FILE))
|
||||
{
|
||||
article += `<div class="image">`;
|
||||
article += `<img class="article-img" src="content/media/${value.FILE}" onclick="lightbox.load('content/media/${value.FILE}')">`;
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
// FILE
|
||||
if (SETTINGS.SHOWFILE && main.util.isDefined(value.FILE))
|
||||
{
|
||||
if (main.util.isObject(value.FILE))
|
||||
{
|
||||
for (var i = 0; i < value.FILE.length; i++)
|
||||
{
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE[i]}">${value.FILE[i]}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// single
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE}">${value.FILE}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
|
||||
// LOWER CONTENT END
|
||||
article += `</div>`;
|
||||
}
|
||||
return article;
|
||||
}
|
||||
|
||||
this.doRow = function(type, content, extraClass)
|
||||
{
|
||||
return `<div class="article-row${extraClass != undefined ? ' '+extraClass : ''}">
|
||||
${type != undefined ? main.util.buildIcon(type) : ''}
|
||||
<div class="article-rowtext">${content}</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
this.doRowArray = function(type, data, query, propercase)
|
||||
{
|
||||
let content = '';
|
||||
for (var i = 0; i < data.length; i++)
|
||||
{
|
||||
content += `<a class="article-taglink" href="#${query}-${data[i]}">${propercase == true ? data[i].to_properCase() : data[i]}</a>`;
|
||||
if (i + 1 !== data.length)
|
||||
{
|
||||
content += `, `;
|
||||
}
|
||||
}
|
||||
return this.doRow(type, content);
|
||||
}
|
||||
|
||||
this.doRowMulti = function(type, data)
|
||||
{
|
||||
let result = '';
|
||||
if (Array.isArray(data))
|
||||
{
|
||||
for (var i in data)
|
||||
{
|
||||
if (data[i].substring(0, 2) == "> ")
|
||||
{
|
||||
// New item
|
||||
if (data[i].includes(": "))
|
||||
{
|
||||
let titleSplit = data[i].substring(2).split(': '); // .substring(2) removes the "> "
|
||||
for (var e = 0; e < titleSplit.length; e++)
|
||||
if (Array.isArray(value.QOTE) && value.QOTE.length > SETTINGS.AUTOWIDETRIGGER)
|
||||
{
|
||||
titleSplit[e] = titleSplit[e].trim();
|
||||
}
|
||||
result += this.doRow(type, `<b>${titleSplit[0]}</b>: ${titleSplit[1]}`);
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
let onclickImage = ``;
|
||||
let articleIsImageType = (SETTINGS.SHOWIMAG && main.util.isType(value.TYPE, 'image'));
|
||||
if (articleIsImageType)
|
||||
{
|
||||
onclickImage = `onclick="main.grid.handleImageClick(event, this, '${value.FILE}');"`;
|
||||
}
|
||||
|
||||
// ARTICLE
|
||||
let article = `<article class="${itemClass}" id="${SETTINGS.ARTICLEIDBASE + value.DIID}">`;
|
||||
|
||||
if (main.util.isDefined(value.LINK))
|
||||
{
|
||||
var idUrl = "url";
|
||||
if (main.util.isDefined(value.SEEN) && value.SEEN === "true")
|
||||
{
|
||||
result += this.doRow(type, data[i].substring(2));
|
||||
idUrl = "urlseen";
|
||||
}
|
||||
|
||||
// LINK START
|
||||
if (SETTINGS.SHOWLINK && !main.util.isObject(value.LINK))
|
||||
{
|
||||
// If this item has only one link then make the whole title the link
|
||||
article += `<a class="article-link" href="${String(value.LINK)}" id="${idUrl}">`;
|
||||
}
|
||||
}
|
||||
else if (data[i].substring(0, 2) === "& ")
|
||||
|
||||
// UPPER CONTENT START
|
||||
if (SETTINGS.SHOWUPPER)
|
||||
{
|
||||
// New line in current item
|
||||
result += this.doRow(null, data[i].substring(2));
|
||||
let upperClass = 'article-containerupper';
|
||||
if (articleIsImageType)
|
||||
{
|
||||
upperClass = 'article-containerupper-image';
|
||||
}
|
||||
article += `<div class="${upperClass}" ${onclickImage}>`;
|
||||
|
||||
// TITLE
|
||||
if (SETTINGS.SHOWTITLE)
|
||||
{
|
||||
article += `<header class="article-title">${key.to_properCase()}</header>`;
|
||||
}
|
||||
|
||||
// LINK END
|
||||
if (SETTINGS.SHOWLINK && main.util.isDefined(value.LINK))
|
||||
{
|
||||
if (main.util.isObject(value.LINK))
|
||||
{
|
||||
for (let l = 0; l < value.LINK.length; l++)
|
||||
{
|
||||
article += `<a class="article-link" href="${String(value.LINK[l])}" id="${idUrl}">`;
|
||||
article += `<div class="article-linkcontainer"><div class="article-linkicon">${main.util.buildIcon('link')}</div><div class="article-linktitle">${main.util.extractRootDomain(value.LINK[l])}</div></div></a>`;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
article += `<div class="article-linkcontainer"><div class="article-linkicon">${main.util.buildIcon('link')}</div><div class="article-linktitle">${main.util.extractRootDomain(value.LINK)}</div></div></a>`;
|
||||
}
|
||||
}
|
||||
|
||||
// TYPE
|
||||
if (SETTINGS.SHOWTYPE || SETTINGS.SHOWDONE)
|
||||
{
|
||||
article += `<div class="article-typecontainer">`;
|
||||
|
||||
if (SETTINGS.SHOWTYPE && main.util.isDefined(value.TYPE))
|
||||
{
|
||||
for (let tc = 0; tc < value.TYPE.length; tc++)
|
||||
{
|
||||
article += `<a class="article-type" href='#type-${value.TYPE[tc]}'>`;
|
||||
article += main.util.buildIcon(value.TYPE[tc], value.TYPE[tc], 'article-typeicon');
|
||||
article += `</a>`;
|
||||
}
|
||||
}
|
||||
|
||||
if (SETTINGS.SHOWDONE)
|
||||
{
|
||||
let done = main.util.isDefined(value.DONE) ? value.DONE : 'false';
|
||||
article += `<a class="article-type" href='#done-${done}'>`;
|
||||
article += main.util.buildIcon(done, done, 'article-typeicon');
|
||||
article += `</a>`;
|
||||
}
|
||||
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
// UPPER CONTENT END
|
||||
article += `</div>`;
|
||||
}
|
||||
else if (data[i].substring(0, 2) == "- ")
|
||||
|
||||
// IMAGE - for image-type-article
|
||||
if (articleIsImageType
|
||||
&& main.util.isDefined(value.FILE)
|
||||
&& main.util.isImage(value.FILE))
|
||||
{
|
||||
// Bullet point
|
||||
result += this.doRow('dash', data[i].substring(2));
|
||||
// IMAGE ARTICLE
|
||||
|
||||
article += `<div class="article-imageType-imgContainer">`;
|
||||
if (SETTINGS.SHOWOVERLAY)
|
||||
{
|
||||
article += `<div class="image-overlay" ${onclickImage}></div>`;
|
||||
}
|
||||
article += `<img class="article-image-img" src="content/media/${value.FILE}">`;
|
||||
|
||||
article += this.doLower(value, articleIsImageType, onclickImage);
|
||||
|
||||
article += `</div>`;
|
||||
|
||||
article += `<div class="article-containerbelow">`;
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
{
|
||||
article += this.doRowMulti('term', value.TERM);
|
||||
}
|
||||
|
||||
// NOTE
|
||||
if (SETTINGS.SHOWNOTE && main.util.isDefined(value.NOTE))
|
||||
{
|
||||
article += this.doRowMulti('note', value.NOTE);
|
||||
}
|
||||
|
||||
// QUOTE
|
||||
if (SETTINGS.SHOWQOTE && main.util.isDefined(value.QOTE))
|
||||
{
|
||||
article += this.doRowMulti('quote', value.QOTE);
|
||||
}
|
||||
|
||||
// PROGRESS
|
||||
if (SETTINGS.SHOWPROG && main.util.isDefined(value.PROG))
|
||||
{
|
||||
article += this.doRowMulti('progress', value.PROG);
|
||||
}
|
||||
article += `</div>`;
|
||||
}
|
||||
else
|
||||
{
|
||||
// NORMAL ARTICLE (NON-IMAGE)
|
||||
article += this.doLower(value, articleIsImageType, onclickImage);
|
||||
}
|
||||
|
||||
article += `</article>`;
|
||||
return article;
|
||||
}
|
||||
|
||||
this.doLower = function(value, articleIsImageType, onclickImage)
|
||||
{
|
||||
let article = '';
|
||||
// LOWER CONTENT START
|
||||
if (SETTINGS.SHOWLOWER)
|
||||
{
|
||||
let lowerClass = 'article-containerlower';
|
||||
if (articleIsImageType)
|
||||
{
|
||||
lowerClass = 'article-containerlower-image';
|
||||
}
|
||||
article += `<div class="${lowerClass}" ${onclickImage}>`;
|
||||
|
||||
// TIME
|
||||
if (SETTINGS.SHOWDATE && main.util.isDefined(value.DATE))
|
||||
{
|
||||
article += this.doRow('date', value.DATE);
|
||||
}
|
||||
|
||||
// AUTHOR
|
||||
if (SETTINGS.SHOWAUTH && main.util.isDefined(value.AUTH))
|
||||
{
|
||||
for (var i = 0; i < value.AUTH.length; i++)
|
||||
{
|
||||
article += this.doRow('author', value.AUTH[i].to_properCase());
|
||||
}
|
||||
}
|
||||
|
||||
// TAGS
|
||||
if (SETTINGS.SHOWTAGS && main.util.isDefined(value.TAGS))
|
||||
{
|
||||
article += this.doRowArray('tags', value.TAGS, 'tag', false);
|
||||
}
|
||||
|
||||
// PROJECT
|
||||
if (SETTINGS.SHOWPROJ && main.util.isDefined(value.PROJ))
|
||||
{
|
||||
article += this.doRowArray('project', value.PROJ, 'proj', true);
|
||||
}
|
||||
|
||||
if (!articleIsImageType)
|
||||
{
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
{
|
||||
article += this.doRowMulti('term', value.TERM);
|
||||
}
|
||||
|
||||
// NOTE
|
||||
if (SETTINGS.SHOWNOTE && main.util.isDefined(value.NOTE))
|
||||
{
|
||||
article += this.doRowMulti('note', value.NOTE);
|
||||
}
|
||||
|
||||
// QUOTE
|
||||
if (SETTINGS.SHOWQOTE && main.util.isDefined(value.QOTE))
|
||||
{
|
||||
article += this.doRowMulti('quote', value.QOTE);
|
||||
}
|
||||
|
||||
// PROGRESS
|
||||
if (SETTINGS.SHOWPROG && main.util.isDefined(value.PROG))
|
||||
{
|
||||
article += this.doRowMulti('progress', value.PROG);
|
||||
}
|
||||
}
|
||||
|
||||
// IMAGE - for non-image-type-article
|
||||
if (SETTINGS.SHOWIMAG
|
||||
&& !main.util.isType(value.TYPE, 'image')
|
||||
&& main.util.isDefined(value.FILE)
|
||||
&& main.util.isImage(value.FILE))
|
||||
{
|
||||
article += `<div class="image">`;
|
||||
article += `<img class="article-img" src="content/media/${value.FILE}" onclick="lightbox.load('content/media/${value.FILE}')">`;
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
// FILE
|
||||
if (SETTINGS.SHOWFILE && main.util.isDefined(value.FILE))
|
||||
{
|
||||
if (main.util.isObject(value.FILE))
|
||||
{
|
||||
for (var i = 0; i < value.FILE.length; i++)
|
||||
{
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE[i]}">${value.FILE[i]}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// single
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE}">${value.FILE}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
|
||||
// LOWER CONTENT END
|
||||
article += `</div>`;
|
||||
}
|
||||
return article;
|
||||
}
|
||||
|
||||
this.doRow = function(type, content, extraClass)
|
||||
{
|
||||
return `<div class="article-row${extraClass != undefined ? ' '+extraClass : ''}">
|
||||
${type != undefined ? main.util.buildIcon(type) : ''}
|
||||
<div class="article-rowtext">${content}</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
this.doRowArray = function(type, data, query, propercase)
|
||||
{
|
||||
let content = '';
|
||||
for (var i = 0; i < data.length; i++)
|
||||
{
|
||||
content += `<a class="article-taglink" href="#${query}-${data[i]}">${propercase == true ? data[i].to_properCase() : data[i]}</a>`;
|
||||
if (i + 1 !== data.length)
|
||||
{
|
||||
content += `, `;
|
||||
}
|
||||
}
|
||||
return this.doRow(type, content);
|
||||
}
|
||||
|
||||
this.doRowMulti = function(type, data)
|
||||
{
|
||||
let result = '';
|
||||
if (Array.isArray(data))
|
||||
{
|
||||
for (var i in data)
|
||||
{
|
||||
if (data[i].substring(0, 2) == "> ")
|
||||
{
|
||||
// New item
|
||||
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 += this.doRow(type, `<b>${titleSplit[0]}</b>: ${titleSplit[1]}`);
|
||||
}
|
||||
else
|
||||
{
|
||||
result += this.doRow(type, data[i].substring(2));
|
||||
}
|
||||
}
|
||||
else if (data[i].substring(0, 2) === "& ")
|
||||
{
|
||||
// New line in current item
|
||||
result += this.doRow(null, data[i].substring(2));
|
||||
}
|
||||
else if (data[i].substring(0, 2) == "- ")
|
||||
{
|
||||
// Bullet point
|
||||
result += this.doRow('dash', data[i].substring(2));
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handle unformatted
|
||||
result += this.doRow(type, data[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handle unformatted
|
||||
result += this.doRow(type, data[i]);
|
||||
// Handle not array
|
||||
result += this.doRow(type, data);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
this.handleImageClick = function(e, element, file)
|
||||
{
|
||||
e = e || window.event;
|
||||
var target = e.target || e.srcElement;
|
||||
if (target == element)
|
||||
{
|
||||
// If user is clicking given element, or element's background...
|
||||
// as opposed to an element's child content, then do lightbox.
|
||||
// This stops lightbox from happening when clicking on tags, file etc
|
||||
lightbox.load(`content/media/${file}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handle not array
|
||||
result += this.doRow(type, data);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
this.handleImageClick = function(e, element, file)
|
||||
{
|
||||
e = e || window.event;
|
||||
var target = e.target || e.srcElement;
|
||||
if (target == element)
|
||||
{
|
||||
// If user is clicking given element, or element's background...
|
||||
// as opposed to an element's child content, then do lightbox.
|
||||
// This stops lightbox from happening when clicking on tags, file etc
|
||||
lightbox.load(`content/media/${file}`);
|
||||
}
|
||||
let dbKeys = Object.keys(db);
|
||||
let i = 0;
|
||||
let html = '';
|
||||
while (i < dbKeys.length)
|
||||
{
|
||||
html += buildArticle(db[dbKeys[i]], dbKeys[i]);
|
||||
i++;
|
||||
}
|
||||
resolve(html);
|
||||
});
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user