mirror of
https://github.com/TangentFoxy/memex.git
synced 2024-11-22 04:54:23 +00:00
Remove all promises.
This commit is contained in:
kor
parent
0a3d0f794b
commit
90375587ac
@ -44,45 +44,42 @@ function Main()
|
||||
|
||||
this.start = function()
|
||||
{
|
||||
this.wrap.start(DATABASE)
|
||||
.then((db) =>
|
||||
{
|
||||
this.articles = db;
|
||||
seer.note('process db');
|
||||
this.articles = this.wrap.start(DATABASE);
|
||||
seer.note('process db');
|
||||
|
||||
let stats = this.wrap.stats(this.articles);
|
||||
seer.note('calc stats');
|
||||
this.nav.display(stats);
|
||||
seer.note('render stats');
|
||||
let stats = this.wrap.stats(this.articles);
|
||||
seer.note('calc stats');
|
||||
this.nav.display(stats);
|
||||
seer.note('render stats');
|
||||
|
||||
return this.load();
|
||||
})
|
||||
.catch((error) =>
|
||||
{
|
||||
console.log('ERROR: ' + error, error);
|
||||
});
|
||||
this.load();
|
||||
}
|
||||
|
||||
this.test = function()
|
||||
{
|
||||
this.grid.clear();
|
||||
document.querySelector('.loading-wave').style.display = 'inline-block';
|
||||
setTimeout(this.load(), 1000);
|
||||
}
|
||||
|
||||
this.load = function()
|
||||
{
|
||||
// this.grid.clear();
|
||||
// document.querySelector('.loading-wave').style.display = 'inline-block';
|
||||
|
||||
this.resetPage();
|
||||
this.updateQuery();
|
||||
|
||||
let filtered = this.wrap.filter(this.queryCur, this.articles);
|
||||
seer.note('filter db');
|
||||
|
||||
this.grid.buildAllArticles(filtered)
|
||||
.then((html) =>
|
||||
{
|
||||
seer.note('build html');
|
||||
let html = this.grid.buildAllArticles(filtered)
|
||||
seer.note('build html');
|
||||
|
||||
this.grid.newDisplay(html);
|
||||
document.querySelector('.loading-wave').style.display = 'none';
|
||||
return seer.report();
|
||||
}).catch((error) =>
|
||||
{
|
||||
console.log('ERROR: ' + error, error);
|
||||
});
|
||||
this.grid.display(html);
|
||||
seer.report();
|
||||
|
||||
document.querySelector('.loading-wave').style.display = 'none';
|
||||
}
|
||||
|
||||
this.resetPage = function()
|
||||
@ -107,4 +104,4 @@ function Main()
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener("hashchange", function() { main.load(); });
|
||||
window.addEventListener("hashchange", function() { main.test(); });
|
||||
@ -24,15 +24,19 @@ function Grid()
|
||||
}
|
||||
}
|
||||
|
||||
this.newDisplay = function(html)
|
||||
this.clear = function()
|
||||
{
|
||||
this.container.innerHTML = '';
|
||||
}
|
||||
|
||||
this.display = function(html)
|
||||
{
|
||||
if (window.showAdd !== undefined && window.showAdd)
|
||||
{
|
||||
main.add.setOverlay(false);
|
||||
}
|
||||
|
||||
document.querySelector('main').innerHTML = html;
|
||||
|
||||
this.container.innerHTML = html;
|
||||
seer.note('render html');
|
||||
|
||||
// LAYOUT
|
||||
@ -55,412 +59,364 @@ function Grid()
|
||||
imgLoad.on( 'progress', function() { parent.msnry.layout(); } );
|
||||
}
|
||||
}
|
||||
|
||||
seer.note('masonry layout');
|
||||
}
|
||||
}
|
||||
|
||||
this.display = function(db)
|
||||
{
|
||||
if (window.showAdd !== undefined && window.showAdd)
|
||||
{
|
||||
main.add.setOverlay(false);
|
||||
}
|
||||
|
||||
// BUILD
|
||||
let dbKeys = Object.keys(db);
|
||||
let i = 0;
|
||||
let contentHtml = '';
|
||||
while (i < dbKeys.length)
|
||||
{
|
||||
contentHtml += this.buildArticle(db[dbKeys[i]], dbKeys[i]);
|
||||
i++;
|
||||
}
|
||||
this.container.innerHTML = contentHtml;
|
||||
|
||||
// LAYOUT
|
||||
if (SETTINGS.USEMASONRY)
|
||||
{
|
||||
this.msnry.reloadItems();
|
||||
this.msnry.layout();
|
||||
|
||||
if (SETTINGS.MASONRYCOMPLETE || SETTINGS.MASONRYPROGRESS)
|
||||
{
|
||||
let imgLoad = imagesLoaded( this.container );
|
||||
if (!SETTINGS.MASONRYPROGRESS)
|
||||
{
|
||||
// When all images finish: redo mansonry layout
|
||||
imgLoad.on( 'always', function() { parent.msnry.layout(); } );
|
||||
}
|
||||
else
|
||||
{
|
||||
// As images load one by one: redo masonry layout
|
||||
imgLoad.on( 'progress', function() { parent.msnry.layout(); } );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.buildAllArticles = function(db)
|
||||
{
|
||||
return new Promise(function(resolve, reject)
|
||||
let dbKeys = Object.keys(db);
|
||||
let html = '';
|
||||
for (var i = 0; i < dbKeys.length; i++)
|
||||
{
|
||||
this.buildArticle = function(value, key)
|
||||
html += this.buildArticle(db[dbKeys[i]], dbKeys[i]);
|
||||
}
|
||||
return html;
|
||||
}
|
||||
|
||||
this.buildArticle = function(value, key)
|
||||
{
|
||||
let itemClass = "article";
|
||||
if (SETTINGS.WIDEARTICLE)
|
||||
{
|
||||
// let value = db[key];
|
||||
let itemClass = "article";
|
||||
if (SETTINGS.WIDEARTICLE)
|
||||
if (main.util.isDefined(value.WIDE) && value.WIDE)
|
||||
{
|
||||
if (main.util.isDefined(value.WIDE) && value.WIDE)
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
else if (main.util.isDefined(value.QOTE))
|
||||
{
|
||||
if (Array.isArray(value.QOTE) && value.QOTE.length > SETTINGS.AUTOWIDETRIGGER)
|
||||
{
|
||||
itemClass += " article-wide";
|
||||
}
|
||||
else if (main.util.isDefined(value.QOTE))
|
||||
{
|
||||
if (Array.isArray(value.QOTE) && value.QOTE.length > SETTINGS.AUTOWIDETRIGGER)
|
||||
{
|
||||
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";
|
||||
}
|
||||
|
||||
let onclickImage = ``;
|
||||
let articleIsImageType = (SETTINGS.SHOWIMAG && main.util.isType(value.TYPE, 'image'));
|
||||
// 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)
|
||||
{
|
||||
onclickImage = `onclick="main.grid.handleImageClick(event, this, '${value.FILE}');"`;
|
||||
upperClass = 'article-containerupper-image';
|
||||
}
|
||||
article += `<div class="${upperClass}" ${onclickImage}>`;
|
||||
|
||||
// TITLE
|
||||
if (SETTINGS.SHOWTITLE)
|
||||
{
|
||||
article += `<header class="article-title">${key.to_properCase()}</header>`;
|
||||
}
|
||||
|
||||
// ARTICLE
|
||||
let article = `<article class="${itemClass}" id="${SETTINGS.ARTICLEIDBASE + value.DIID}">`;
|
||||
|
||||
if (main.util.isDefined(value.LINK))
|
||||
// LINK END
|
||||
if (SETTINGS.SHOWLINK && main.util.isDefined(value.LINK))
|
||||
{
|
||||
var idUrl = "url";
|
||||
if (main.util.isDefined(value.SEEN) && value.SEEN === "true")
|
||||
if (main.util.isObject(value.LINK))
|
||||
{
|
||||
idUrl = "urlseen";
|
||||
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>`;
|
||||
}
|
||||
}
|
||||
|
||||
// LINK START
|
||||
if (SETTINGS.SHOWLINK && !main.util.isObject(value.LINK))
|
||||
else
|
||||
{
|
||||
// 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}">`;
|
||||
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>`;
|
||||
}
|
||||
}
|
||||
|
||||
// UPPER CONTENT START
|
||||
if (SETTINGS.SHOWUPPER)
|
||||
// TYPE
|
||||
if (SETTINGS.SHOWTYPE || SETTINGS.SHOWDONE)
|
||||
{
|
||||
let upperClass = 'article-containerupper';
|
||||
if (articleIsImageType)
|
||||
article += `<div class="article-typecontainer">`;
|
||||
|
||||
if (SETTINGS.SHOWTYPE && main.util.isDefined(value.TYPE))
|
||||
{
|
||||
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 tc = 0; tc < value.TYPE.length; tc++)
|
||||
{
|
||||
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 class="article-type" href='#type-${value.TYPE[tc]}'>`;
|
||||
article += main.util.buildIcon(value.TYPE[tc], value.TYPE[tc], '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)
|
||||
if (SETTINGS.SHOWDONE)
|
||||
{
|
||||
article += `<div class="image-overlay" ${onclickImage}></div>`;
|
||||
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 += `<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;
|
||||
// UPPER CONTENT END
|
||||
article += `</div>`;
|
||||
}
|
||||
|
||||
this.doLower = function(value, articleIsImageType, onclickImage)
|
||||
// IMAGE - for image-type-article
|
||||
if (articleIsImageType
|
||||
&& main.util.isDefined(value.FILE)
|
||||
&& main.util.isImage(value.FILE))
|
||||
{
|
||||
let article = '';
|
||||
// LOWER CONTENT START
|
||||
if (SETTINGS.SHOWLOWER)
|
||||
// IMAGE ARTICLE
|
||||
|
||||
article += `<div class="article-imageType-imgContainer">`;
|
||||
if (SETTINGS.SHOWOVERLAY)
|
||||
{
|
||||
let lowerClass = 'article-containerlower';
|
||||
if (articleIsImageType)
|
||||
{
|
||||
lowerClass = 'article-containerlower-image';
|
||||
}
|
||||
article += `<div class="${lowerClass}" ${onclickImage}>`;
|
||||
article += `<div class="image-overlay" ${onclickImage}></div>`;
|
||||
}
|
||||
article += `<img class="article-image-img" src="content/media/${value.FILE}">`;
|
||||
|
||||
// TIME
|
||||
if (SETTINGS.SHOWDATE && main.util.isDefined(value.DATE))
|
||||
article += this.doLower(value, articleIsImageType, onclickImage);
|
||||
|
||||
article += `</div>`;
|
||||
|
||||
article += `<div class="article-containerbelow">`;
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
{
|
||||
article += this.doRow('date', value.DATE);
|
||||
article += this.doRowMulti('term', value.TERM);
|
||||
}
|
||||
|
||||
// AUTHOR
|
||||
if (SETTINGS.SHOWAUTH && main.util.isDefined(value.AUTH))
|
||||
// NOTE
|
||||
if (SETTINGS.SHOWNOTE && main.util.isDefined(value.NOTE))
|
||||
{
|
||||
for (var i = 0; i < value.AUTH.length; i++)
|
||||
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('author', value.AUTH[i].to_properCase());
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE[i]}">${value.FILE[i]}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
|
||||
// TAGS
|
||||
if (SETTINGS.SHOWTAGS && main.util.isDefined(value.TAGS))
|
||||
else
|
||||
{
|
||||
article += this.doRowArray('tags', value.TAGS, 'tag', false);
|
||||
// single
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE}">${value.FILE}</a>`, 'article-file');
|
||||
}
|
||||
}
|
||||
|
||||
// PROJECT
|
||||
if (SETTINGS.SHOWPROJ && main.util.isDefined(value.PROJ))
|
||||
// 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) == "> ")
|
||||
{
|
||||
article += this.doRowArray('project', value.PROJ, 'proj', true);
|
||||
}
|
||||
|
||||
if (!articleIsImageType)
|
||||
{
|
||||
// TERM
|
||||
if (SETTINGS.SHOWTERM && main.util.isDefined(value.TERM))
|
||||
// New item
|
||||
if (data[i].includes(": "))
|
||||
{
|
||||
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++)
|
||||
let titleSplit = data[i].substring(2).split(': '); // .substring(2) removes the "> "
|
||||
for (var e = 0; e < titleSplit.length; e++)
|
||||
{
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE[i]}">${value.FILE[i]}</a>`, 'article-file');
|
||||
titleSplit[e] = titleSplit[e].trim();
|
||||
}
|
||||
result += this.doRow(type, `<b>${titleSplit[0]}</b>: ${titleSplit[1]}`);
|
||||
}
|
||||
else
|
||||
{
|
||||
// single
|
||||
article += this.doRow('file', `<a class="article-file-link" href="content/media/${value.FILE}">${value.FILE}</a>`, 'article-file');
|
||||
result += this.doRow(type, data[i].substring(2));
|
||||
}
|
||||
}
|
||||
|
||||
// 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)
|
||||
else if (data[i].substring(0, 2) === "& ")
|
||||
{
|
||||
content += `, `;
|
||||
// New line in current item
|
||||
result += this.doRow(null, data[i].substring(2));
|
||||
}
|
||||
}
|
||||
return this.doRow(type, content);
|
||||
}
|
||||
|
||||
this.doRowMulti = function(type, data)
|
||||
{
|
||||
let result = '';
|
||||
if (Array.isArray(data))
|
||||
{
|
||||
for (var i in data)
|
||||
else if (data[i].substring(0, 2) == "- ")
|
||||
{
|
||||
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]);
|
||||
}
|
||||
// Bullet point
|
||||
result += this.doRow('dash', data[i].substring(2));
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handle unformatted
|
||||
result += this.doRow(type, data[i]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handle not array
|
||||
result += this.doRow(type, data);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
this.handleImageClick = function(e, element, file)
|
||||
else
|
||||
{
|
||||
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}`);
|
||||
}
|
||||
// Handle not array
|
||||
result += this.doRow(type, data);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
let dbKeys = Object.keys(db);
|
||||
let i = 0;
|
||||
let html = '';
|
||||
while (i < dbKeys.length)
|
||||
this.handleImageClick = function(e, element, file)
|
||||
{
|
||||
e = e || window.event;
|
||||
var target = e.target || e.srcElement;
|
||||
if (target == element)
|
||||
{
|
||||
html += buildArticle(db[dbKeys[i]], dbKeys[i]);
|
||||
i++;
|
||||
// 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}`);
|
||||
}
|
||||
resolve(html);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2,56 +2,53 @@ function Wrap()
|
||||
{
|
||||
this.start = function(data)
|
||||
{
|
||||
return new Promise(function(resolve, reject)
|
||||
this.commaSplit = function(data)
|
||||
{
|
||||
this.commaSplit = function(data)
|
||||
if (data !== undefined)
|
||||
{
|
||||
if (data !== undefined)
|
||||
var result = data.split(",");
|
||||
for (var c = 0; c < result.length; c++)
|
||||
{
|
||||
var result = data.split(",");
|
||||
for (var c = 0; c < result.length; c++)
|
||||
{
|
||||
result[c] = result[c].trim().toLowerCase();
|
||||
}
|
||||
return result;
|
||||
result[c] = result[c].trim().toLowerCase();
|
||||
}
|
||||
return data;
|
||||
return result;
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
this.objectSplit = function(data)
|
||||
this.objectSplit = function(data)
|
||||
{
|
||||
if (typeof data == 'object')
|
||||
{
|
||||
if (typeof data == 'object')
|
||||
for (let o = 0; o < data.length; o++)
|
||||
{
|
||||
for (let o = 0; o < data.length; o++)
|
||||
if (data[o].substr(0,2) == '> ')
|
||||
{
|
||||
if (data[o].substr(0,2) == '> ')
|
||||
{
|
||||
data[o] = data[o].substr(2,data[o].length-1);
|
||||
}
|
||||
data[o] = data[o].substr(2,data[o].length-1);
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
let database = new Indental(data).parse();
|
||||
let keys = Object.keys(database);
|
||||
for (let i = 0; i < keys.length; i++)
|
||||
{
|
||||
let entry = database[keys[i]];
|
||||
let database = new Indental(data).parse();
|
||||
let keys = Object.keys(database);
|
||||
for (let i = 0; i < keys.length; i++)
|
||||
{
|
||||
let entry = database[keys[i]];
|
||||
|
||||
entry.AUTH = this.commaSplit(entry.AUTH);
|
||||
entry.TAGS = this.commaSplit(entry.TAGS);
|
||||
entry.TYPE = this.commaSplit(entry.TYPE);
|
||||
entry.PROJ = this.commaSplit(entry.PROJ);
|
||||
entry.AUTH = this.commaSplit(entry.AUTH);
|
||||
entry.TAGS = this.commaSplit(entry.TAGS);
|
||||
entry.TYPE = this.commaSplit(entry.TYPE);
|
||||
entry.PROJ = this.commaSplit(entry.PROJ);
|
||||
|
||||
entry.LINK = this.objectSplit(entry.LINK);
|
||||
entry.FILE = this.objectSplit(entry.FILE);
|
||||
entry.LINK = this.objectSplit(entry.LINK);
|
||||
entry.FILE = this.objectSplit(entry.FILE);
|
||||
|
||||
database[keys[i]].DIID = i;
|
||||
}
|
||||
database[keys[i]].DIID = i;
|
||||
}
|
||||
|
||||
resolve(database);
|
||||
});
|
||||
return database;
|
||||
}
|
||||
|
||||
this.filter = function(target, db)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user