tangent/memex
1
0
Fork 0
mirror of https://github.com/TangentFoxy/memex.git synced 2024-11-22 04:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Josh Avanier 2018-10-30 10:01:22 +07:00
parent 7653ebe1ea
commit b0844e22b1
3 changed files with 103 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/logic/main.js
View File

@ -29,7 +29,7 @@ function Main()
this.view = new View();
this.view.install();
if (window.showAdd != undefined && window.showAdd)
if (window.showAdd !== undefined && window.showAdd)
{
this.add = new Add();
this.add.install();
@ -55,12 +55,12 @@ function Main()
console.log('main.load: ' + target)
document.activeElement.blur();
if (this.queryCur != 'add')
if (this.queryCur !== 'add')
{
this.queryPrev = this.queryCur;
}
target = target.substr(0,1) == "#" ? target.substr(1,target.length-1) : target;
target = target.substr(0,1) === "#" ? target.substr(1,target.length-1) : target;
this.queryCur = target.trim();
if (window.location.hash != this.queryCur)
@ -68,7 +68,7 @@ function Main()
window.location.hash = this.queryCur;
}
if (this.queryCur == 'add')
if (this.queryCur === 'add')
{
if (window.showAdd != undefined && window.showAdd)
{

306
docs/logic/view.js
View File

@ -52,7 +52,7 @@ function View()
{
console.log('display ' + db)
if (window.showAdd != undefined && window.showAdd)
if (window.showAdd !== undefined && window.showAdd)
{
main.add.setOverlay(false);
}
@ -99,12 +99,12 @@ function View()
}
}
if (SETTINGS.SHOWIMAG)
if (
SETTINGS.SHOWIMAG
&& typeof value.TYPE !== 'undefined' && value.TYPE === 'image'
)
{
if (typeof value.TYPE !== 'undefined' && value.TYPE == 'image')
{
itemClass += " griditem-image";
}
itemClass += " griditem-image";
}
let entry = ``;
@ -115,12 +115,9 @@ function View()
if (typeof value.LINK !== 'undefined')
{
var idUrl = "url";
if (typeof value.SEEN !== 'undefined')
if (typeof value.SEEN !== 'undefined' && value.SEEN === "true")
{
if (value.SEEN == "true")
{
idUrl = "urlseen";
}
idUrl = "urlseen";
}
// LINK START
@ -142,76 +139,34 @@ function View()
}
// LINK END
if (SETTINGS.SHOWLINK)
if (SETTINGS.SHOWLINK && typeof value.LINK !== 'undefined')
{
if (typeof value.LINK !== 'undefined')
{
entry += `<div class="griditem-linkcontainer"><i class="griditem-linkicon fas fa-link"></i><div class="griditem-linktitle">${this.extractRootDomain(value.LINK)}</div></div></a>`;
}
entry += `<div class="griditem-linkcontainer"><i class="griditem-linkicon fas fa-link"></i><div class="griditem-linktitle">${this.extractRootDomain(value.LINK)}</div></div></a>`;
}
// TYPE
if (SETTINGS.SHOWTYPE)
if (SETTINGS.SHOWTYPE && typeof value.TYPE !== 'undefined')
{
if (typeof value.TYPE !== 'undefined')
{
entry += `<a class="griditem-type" href='#type-${String(value.TYPE)}'>`;
if (value.TYPE == 'article')
{
entry += `<i class="griditem-typeicon far fa-newspaper"></i>`;
}
else if (value.TYPE == 'podcast')
{
entry += `<i class="griditem-typeicon fas fa-podcast"></i>`;
}
else if (value.TYPE == 'video')
{
entry += `<i class="griditem-typeicon fas fa-tv"></i>`;
}
else if (value.TYPE == 'list')
{
entry += `<i class="griditem-typeicon fas fa-file-alt"></i>`;
}
else if (value.TYPE == 'book')
{
entry += `<i class="griditem-typeicon fas fa-book-open"></i>`;
}
else if (value.TYPE == 'game')
{
entry += `<i class="griditem-typeicon fas fa-gamepad"></i>`;
}
else if (value.TYPE == 'service')
{
entry += `<i class="griditem-typeicon fas fa-server"></i>`;
}
else if (value.TYPE == 'lecture')
{
entry += `<i class="griditem-typeicon fas fa-chalkboard-teacher"></i>`;
}
else if (value.TYPE == 'quote')
{
entry += `<i class="griditem-typeicon fas fa-comment"></i>`;
}
else if (value.TYPE == 'tool')
{
entry += `<i class="griditem-typeicon fas fa-wrench"></i>`;
}
else if (value.TYPE == 'music')
{
entry += `<i class="griditem-typeicon fas fa-music"></i>`;
}
else if (value.TYPE == 'image')
{
entry += `<i class="griditem-typeicon fas fa-image"></i>`;
}
else if (value.TYPE == 'encyclopedia')
{
entry += `<i class="griditem-typeicon fas fa-globe"></i>`;
}
entry += `</a>`;
let icon = '';
switch (value.TYPE) {
case 'article': icon = 'far fa-newspaper'; break;
case 'podcast': icon = 'fas fa-podcast'; break;
case 'video': icon = 'fas fa-tv'; break;
case 'list': icon = 'fas fa-file-alt'; break;
case 'book': icon = 'fas fa-book-open'; break;
case 'game': icon = 'fas fa-gamepad'; break;
case 'service': icon = 'fas fa-server'; break;
case 'lecture': icon = 'fas fa-chalkboard-teacher'; break;
case 'quote': icon = 'fas fa-comment'; break;
case 'tool': icon = 'fas fa-wrench'; break;
case 'music': icon = 'fas fa-music'; break;
case 'image': icon = 'fas fa-image'; break;
case 'encyclopedia': icon = 'fas fa-globe'; break;
}
entry += `<a class="griditem-type" href='#type-${value.TYPE}'>`;
entry += `<i class="griditem-typeicon ${icon}"></i>`;
entry += `</a>`;
}
// UPPER CONTENT END
@ -224,66 +179,48 @@ function View()
entry += `<div class="griditem-containerlower">`;
// AUTHOR
if (SETTINGS.SHOWAUTH)
if (SETTINGS.SHOWAUTH && typeof value.AUTH !== 'undefined')
{
if (typeof value.AUTH !== 'undefined')
{
entry += `<div class="griditem-auth"><i class="fas fa-user textIcon"></i>${value.AUTH}</div>`;
}
entry += `<div class="griditem-auth"><i class="fas fa-user textIcon"></i>${value.AUTH}</div>`;
}
// TAGS
if (SETTINGS.SHOWTAGS)
if (SETTINGS.SHOWTAGS && typeof value.TAGS !== 'undefined')
{
if (typeof value.TAGS !== 'undefined')
entry += `<div class="griditem-tags"><i class="fas fa-tag textIcon"></i>`;
for (var i = 0; i < value.TAGS.length; i++)
{
entry += `<div class="griditem-tags"><i class="fas fa-tag textIcon"></i>`;
for (var i = 0; i < value.TAGS.length; i++)
entry += `<a class="griditem-taglink" href="#tag-${value.TAGS[i]}">${value.TAGS[i]}</a>`;
if (i+1 !== value.TAGS.length)
{
entry += `<a class="griditem-taglink" href="#tag-${value.TAGS[i]}">${value.TAGS[i]}</a>`;
if (i+1 != value.TAGS.length)
{
entry += `, `;
}
};
entry += `</div>`;
}
entry += `, `;
}
};
entry += `</div>`;
}
// NOTE
if (SETTINGS.SHOWNOTE)
if (SETTINGS.SHOWNOTE && typeof value.NOTE !== 'undefined')
{
if (typeof value.NOTE !== 'undefined')
{
entry += this.buildArrayElement(value.NOTE, "griditem-note", "fas fa-sticky-note textIcon");
}
entry += this.buildArrayElement(value.NOTE, "griditem-note", "fas fa-sticky-note textIcon");
}
// QUOTE
if (SETTINGS.SHOWQOTE)
if (SETTINGS.SHOWQOTE && typeof value.QOTE !== 'undefined')
{
if (typeof value.QOTE !== 'undefined')
{
entry += this.buildArrayElement(value.QOTE, "griditem-quote", "fas fa-comment textIcon");
}
entry += this.buildArrayElement(value.QOTE, "griditem-quote", "fas fa-comment textIcon");
}
// TERM
if (SETTINGS.SHOWTERM)
if (SETTINGS.SHOWTERM && typeof value.TERM !== 'undefined')
{
if (typeof value.TERM !== 'undefined')
{
entry += this.buildArrayElement(value.TERM, "griditem-term", "fas fa-ribbon textIcon");
}
entry += this.buildArrayElement(value.TERM, "griditem-term", "fas fa-ribbon textIcon");
}
// PROGRESS
if (SETTINGS.SHOWPROG)
if (SETTINGS.SHOWPROG && typeof value.PROG !== 'undefined')
{
if (typeof value.PROG !== 'undefined')
{
entry += `<div class="griditem-prog"><i class="fas fa-clock textIcon"></i>${value.PROG}</div>`;
}
entry += `<div class="griditem-prog"><i class="fas fa-clock textIcon"></i>${value.PROG}</div>`;
}
// LOWER CONTENT END
@ -291,21 +228,19 @@ function View()
}
// IMAGE
if (SETTINGS.SHOWIMAG)
if (
SETTINGS.SHOWIMAG
&& typeof value.TYPE !== 'undefined' && value.TYPE === 'image'
&& typeof value.FILE !== 'undefined'
)
{
if (typeof value.TYPE !== 'undefined' && value.TYPE == 'image')
entry += `<div class="image">`;
if (SETTINGS.SHOWOVERLAY)
{
if (typeof value.FILE !== 'undefined')
{
entry += `<div class="image">`;
if (SETTINGS.SHOWOVERLAY)
{
entry += `<div class="image-overlay"></div>`;
}
entry += `<img class="griditem-image-img" src="content/media/${value.FILE}">`;
entry += `</div>`;
}
entry += `<div class="image-overlay"></div>`;
}
entry += `<img class="griditem-image-img" src="content/media/${value.FILE}">`;
entry += `</div>`;
}
entry += `</div>`;
@ -317,7 +252,7 @@ function View()
{
let menuContent = ``;
if (window.showAdd != undefined && window.showAdd)
if (window.showAdd !== undefined && window.showAdd)
{
// ADD
menuContent += `<div class="menu-itemgroup">`;
@ -352,97 +287,30 @@ function View()
menuContent += `<div class="menu-itemgroup">`;
for (var ty = 0; ty < Math.min(value.types.length, SETTINGS.STATSNUMTYPE); ty++)
{
if (value.types[ty][0] == 'article')
{
menuContent += `<a href='#type-article' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon far fa-newspaper"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'podcast')
{
menuContent += `<a href='#type-podcast' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-podcast"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'video')
{
menuContent += `<a href='#type-video' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-tv"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'list')
{
menuContent += `<a href='#type-list' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-file-alt"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'book')
{
menuContent += `<a href='#type-book' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-book-open"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'game')
{
menuContent += `<a href='#type-game' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-gamepad"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'service')
{
menuContent += `<a href='#type-service' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-server"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'lecture')
{
menuContent += `<a href='#type-lecture' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-chalkboard-teacher"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'quote')
{
menuContent += `<a href='#type-quote' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-comment"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'tool')
{
menuContent += `<a href='#type-tool' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-wrench"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'music')
{
menuContent += `<a href='#type-music' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-music"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'image')
{
menuContent += `<a href='#type-image' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-image"></i>`;
menuContent += `</a>`;
}
else if (value.types[ty][0] == 'encyclopedia')
{
menuContent += `<a href='#type-encyclopedia' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${value.types[ty][1]}</div>`;
menuContent += `<i class="menu-itemicon fas fa-globe"></i>`;
menuContent += `</a>`;
const type = value.types[ty][0];
const count = value.types[ty][1];
let icon = '';
switch (type) {
case 'article': icon = 'far fa-newspaper'; break;
case 'podcast': icon = 'fas fa-podcast'; break;
case 'video': icon = 'fas fa-tv'; break;
case 'list': icon = 'fas fa-file-alt'; break;
case 'book': icon = 'fas fa-book-open'; break;
case 'game': icon = 'fas fa-gamepad'; break;
case 'service': icon = 'fas fa-server'; break;
case 'lecture': icon = 'fas fa-chalkboard-teacher'; break;
case 'quote': icon = 'fas fa-comment'; break;
case 'tool': icon = 'fas fa-wrench'; break;
case 'music': icon = 'fas fa-music'; break;
case 'image': icon = 'fas fa-image'; break;
case 'encyclopedia': icon = 'fas fa-globe'; break;
}
menuContent += `<a href='#type-${type}' class="menu-item">`;
menuContent += `<div class="menu-itemcount">${count}</div>`;
menuContent += `<i class="menu-itemicon ${icon}"></i>`;
menuContent += `</a>`;
}
menuContent += `</div>`;
@ -488,11 +356,11 @@ function View()
{
for (var i in data)
{
if (data[i] == "& ")
if (data[i] === "& ")
{
// blank line, do nothing
}
else if (data[i].substring(0, 2) == "> ")
else if (data[i].substring(0, 2) === "> ")
{
// New item
if (data[i].includes(": "))
@ -509,7 +377,7 @@ function View()
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) === "& ")
{
// New line in current item
result += `<div class="${className}">${data[i].substring(2)}</div>`;
@ -548,7 +416,7 @@ function View()
{
domain = splitArr[arrLen - 2] + '.' + splitArr[arrLen - 1];
// check to see if it's using a Country Code Top Level Domain (ccTLD) (i.e. ".me.uk")
if (splitArr[arrLen - 2].length == 2 && splitArr[arrLen - 1].length == 2)
if (splitArr[arrLen - 2].length === 2 && splitArr[arrLen - 1].length === 2)
{
// this is using a ccTLD
domain = splitArr[arrLen - 3] + '.' + domain;

10
docs/logic/wrap.js
View File

@ -12,7 +12,7 @@ function Wrap()
this.process = function()
{
for (i = 0; i < this.keys.length; i++)
for (let i = 0; i < this.keys.length; i++)
{
let value = this.database[this.keys[i]];
@ -42,7 +42,7 @@ function Wrap()
}
else if (target == 'term')
{
for (i = 0; i < this.keys.length; i++)
for (let i = 0; i < this.keys.length; i++)
{
let value = this.database[this.keys[i]];
if (typeof value.TERM !== 'undefined')
@ -58,7 +58,7 @@ function Wrap()
{
// TAG
var tagDecoded = decodeURI(splitTarget[1]);
for (i = 0; i < this.keys.length; i++)
for (let i = 0; i < this.keys.length; i++)
{
let value = this.database[this.keys[i]];
if (typeof value.TAGS !== 'undefined')
@ -77,7 +77,7 @@ function Wrap()
{
// TYPE
var tagDecoded = decodeURI(splitTarget[1]);
for (i = 0; i < this.keys.length; i++)
for (let i = 0; i < this.keys.length; i++)
{
let value = this.database[this.keys[i]];
if (typeof value.TYPE !== 'undefined')
@ -93,7 +93,7 @@ function Wrap()
{
// DONE
var doneValue = decodeURI(splitTarget[1]);
for (i = 0; i < this.keys.length; i++)
for (let i = 0; i < this.keys.length; i++)
{
let value = this.database[this.keys[i]];
if (doneValue == 'true')