Skip to content

Reformat & Strip Eval, converted some strings to JS #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fosevv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reformat & Strip Eval, converted some strings to JS #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a0c6ea
refac: text-consts to obj, strip eval(), Prettier-reformat
fosevv Apr 5, 2021
0508a46
refac:convert some html strings to JS
fosevv Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
274 changes: 187 additions & 87 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,150 +3,250 @@ let histack = [];

// handle nav between levels via browser back arrow
$(() => {
if (history && history.pushState) {

history.pushState({level: 1}, '');
histack.push(1);

$(window).on('popstate', () => {
const prev = histack.pop();
if (prev == 2) { toggletab('hide', true); }
else if (prev == 3) { toggletab('hide2', true); }
else if (prev == 4) { togglefull('hide', true); }
});
}
})
history.pushState({ level: 1 }, "");
histack.push(1);

$(window).on("popstate", () => {
const prev = histack.pop();
if (prev === 2) {
toggletab("hide", true);
} else if (prev === 3) {
toggletab("hide2", true);
} else if (prev === 4) {
togglefull("hide", true);
}
});
});

// hide / show first-level folders
toggletab = (id, flag) => {
if (id == 'hide') {
$('#content').scrollTop(0);
$('#content')[0].innerHTML = '';
$('.overlay').css('display', 'none');
if (!flag) { history.back(); }
}
else if (id == 'hide2') {
$('.overlay2').remove();
if (!flag) { history.back(); }
}
else {
const selected = eval(id);
let two = '';
if (id === "hide") {
$("#content").scrollTop(0);
$("#content")[0].innerHTML = "";
$(".overlay").css("display", "none");
if (!flag) {
history.back();
}
} else if (id === "hide2") {
$(".overlay2").remove();
if (!flag) {
history.back();
}
} else {
const selected = TEXTS[id];
if (id == undefined) return;
let two = "";

if (id != 'Photography') {
history.pushState({level: 2}, '');
if (id !== "Photography") {
history.pushState({ level: 2 }, "");
histack.push(2);
}

if (id == 'Art') {
$('#content')[0].innerHTML += '<div class="subitem" class="item" onclick="toggletab(\'Photography\', false);"><img class="icon" src="icon/Folder.png"><span class="section">Photography</span></div>';
if (id === "Art") {
$("#content")[0].innerHTML +=
'<div class="subitem" class="item" onclick="toggletab(\'Photography\', false);"><img class="icon" src="icon/Folder.png"><span class="section">Photography</span></div>';
}
if (id == 'Photography') {
$('body').append('<div class="overlay2"><div class="overlay-content2"><div id="head"><img id="close" src="icon/Close.png" onclick="toggletab(\'hide2\', false)"><span class="title2"></span></div><div id="content2"></div></div></div>');
two = '2';
history.pushState({level: 3}, '');
if (id === "Photography") {
$("body").append(
'<div class="overlay2"><div class="overlay-content2"><div id="head"><img id="close" src="icon/Close.png" onclick="toggletab(\'hide2\', false)"><span class="title2"></span></div><div id="content2"></div></div></div>'
);
two = "2";
history.pushState({ level: 3 }, "");
histack.push(3);
}

if (id == 'Contact' || id == 'Statement') { $('#content')[0].innerHTML = selected; }
else {
if (id === "Contact" || id === "Statement") {
$("#content")[0].innerHTML = selected;
} else {
for (let i = 0; i < selected.length; i++) {
$('#content' + two)[0].innerHTML += '<div class="subitem" class="item" onclick="togglefull(' + id + ', false, ' + i + ');"><img class="icon" src="icon/' + id + '.png"><span class="section" id="folder">' + selected[i] + '</span></div>';
let div = document.createElement("div");
div.classList.add("subitem", "item");
//div.onclick = `togglefull('${id}', false, i)`;
//JEC: I'd recommend something like the above, but togglefull would need to
// return a function. You could/should, but you'll have to switch over
// all of these sections from evaluated text to JS.
div.setAttribute("onclick", `togglefull('${id}', false, ${i})`);

const img = document.createElement("img");
img.classList.add("icon");
img.src = `icon/${id}.png`;

const span = document.createElement("span");
span.classList.add("section");
span.id = "folder";
span.innerHTML = selected[i];
div.append(img, span);

$("#content" + two)[0].appendChild(div);
/*
'<div class="subitem" class="item" onclick="togglefull(\'' +
id +
"', false, " +
i +
');"><img class="icon" src="icon/' +
id +
'.png"><span class="section" id="folder">' +
selected[i] +
"</span></div>";
*/
}
}
$('.overlay' + two).css('display', 'block');
$('.title' + two)[0].innerHTML = id;
$(".overlay" + two).css("display", "block");
$(".title" + two)[0].innerHTML = id;
}
}
};

let blurb = false;
let pics = true;

// toggle top-level galleries
togglefull = (id, flag, n = null) => {
if (id == 'hide') {
if (id === "hide") {
if (pics) {
$('.pic-container').remove();
$(".pic-container").remove();
}
if (blurb) {
$('#blurb')[0].remove();
$("#blurb")[0].remove();
blurb = false;
}
if (!flag) { history.back(); }
if (!flag) {
history.back();
}

$('#content-full').scrollTop(0);
$('.overlay-full').css('display', 'none');
}
else {
const title = id[n];
let selected = title.replace(/\s/g, '');
if (selected == '120') { selected = '_120'; }
else if (selected == 'Tiana/Time') { selected = title.replace(/[\/]/, ''); }
const captblurb = eval(selected);
const l = sizes[selected];

history.pushState({level: 4}, '');
$("#content-full").scrollTop(0);
$(".overlay-full").css("display", "none");
} else {
console.log("trying " + id + " >n? " + id[n]);
const title = TEXTS[id][n];
let selected = title.replace(/\s/g, "");
if (selected === "120") {
selected = "_120";
} else if (selected === "Tiana/Time") {
selected = title.replace(/[\/]/, "");
}
console.log("full > selected: " + selected);
const captblurb = TEXTS[selected];
const l = TEXTS.sizes[selected];

history.pushState({ level: 4 }, "");
histack.push(4);

if (selected == '_120') { selected = '120'; }
if (selected === "_120") {
selected = "120";
}

pics = true;

$('#content-full').append('<div class="pic-container"></div>');
$("#content-full").append('<div class="pic-container"></div>');

if (Array.isArray(captblurb)) {
for (let i = 0; i < l; i++) {
$('.pic-container')[0].innerHTML += '<div class="work"><div class="piece"><img onclick="fullsize(this.src, ' + i + ')" class="gallery" src="img/' + selected + '/' + i + '.jpg"></div><span class="small">' + captblurb[i] + '</span></div>';
$(".pic-container")[0].innerHTML +=
'<div class="work"><div class="piece"><img onclick="fullsize(this.src, ' +
i +
')" class="gallery" src="img/' +
selected +
"/" +
i +
'.jpg"></div><span class="small">' +
captblurb[i] +
"</span></div>";
}
}
else {
} else {
if (captblurb.length > 0) {
$('#content-full').prepend('<div id="blurb">' + captblurb + '</div>');
$("#content-full").prepend('<div id="blurb">' + captblurb + "</div>");
blurb = true;
}
if (l) {
for (let i = 0; i < l; i++) {
$('.pic-container')[0].innerHTML += '<div class="work"><div class="piece"><img onclick="fullsize(this.src, ' + i + ')" class="gallery" src="img/' + selected + '/' + i + '.jpg"></div></div>';
$(".pic-container")[0].innerHTML +=
'<div class="work"><div class="piece"><img onclick="fullsize(this.src, ' +
i +
')" class="gallery" src="img/' +
selected +
"/" +
i +
'.jpg"></div></div>';
}
}
else {
$('.pic-container').remove();
} else {
$(".pic-container").remove();
pics = false;
}
}
$('.overlay-full').css('display', 'block');
$('.title-full')[0].innerHTML = title;
$(".overlay-full").css("display", "block");
$(".title-full")[0].innerHTML = title;
}
}
};

// display fullsize images with options for cycling thru images
fullsize = (i, ii) => {
const s = i.split('/');
const si = sizes[s[s.length - 2]];
$('body').append('<div class="fullscreen"><img src="icon/Close.png" onclick="this.parentElement.remove();" class="arrows" id="exit"><img src="icon/Left.png" onclick="move(\'left\', ' + si + ');" class="arrows" id="left"><img src="icon/Right.png" onclick="move(\'right\', ' + si + ');" class="arrows" id="right"><img src="' + i + '" id="fullimage"></div>');
}
//JEC: PS the double-ii here isn't used
const s = i.split("/");
const si = TEXTS.sizes[s[s.length - 2]];
const div = document.createElement("div");
div.classList.add("fullscreen");

const eimg = document.createElement("img");
eimg.id = "exit";
eimg.classList.add("arrows");
eimg.src = "icon/Close.png";
eimg.setAttribute("onclick", "this.parentElement.remove();");

const limg = document.createElement("img");
limg.id = "left";
limg.classList.add("arrows");
limg.src = "icon/Left.png";
limg.setAttribute("onclick", `move(\'left\', ${si})`);

const rimg = document.createElement("img");
rimg.id = "right";
rimg.classList.add("arrows");
rimg.src = "icon/Right.png";
rimg.setAttribute("onclick", `move(\'rightt\', ${si})`);

const fimg = document.createElement("img");
fimg.id = "fullimage";
fimg.src = i;

div.append(eimg, limg, rimg, fimg);

$("body").append(div);
/* '<div class="fullscreen"><img src="icon/Close.png" onclick="this.parentElement.remove();"
class="arrows" id="exit"><img src="icon/Left.png" onclick="move(\'left\', ' +
si +
');" class="arrows" id="left"><img src="icon/Right.png" onclick="move(\'right\', ' +
si +
');" class="arrows" id="right"><img src="' +
i +
'" id="fullimage"></div>'
); */
};

// move left or right through fullsize images
move = (d, s) => {
const p = $('#fullimage')[0].src.split('/');
let i = +p.pop().split('.')[0];

if (d == 'left') {
if (i > 0) { i -= 1; }
else { i = s + ((i % -s) - 1); }
const p = $("#fullimage")[0].src.split("/");
let i = +p.pop().split(".")[0];

if (d === "left") {
if (i > 0) {
i -= 1;
} else {
i = s + ((i % -s) - 1);
}
} else {
i = (i + 1) % s;
}
else { i = (i + 1) % s; }

$('#fullimage')[0].src = p.join('/') + '/' + i + '.jpg';
}
$("#fullimage")[0].src = p.join("/") + "/" + i + ".jpg";
};

let light = true;

// toggle light -> dark mode
mode = () => {
let f = (light) ? 'styles-dark.css' : 'styles-light.css';
let b = (light) ? 'icon/White-Bomb.png' : 'icon/Black-Bomb.png';
$('#css').attr('href', f);
$('#mode').attr('src', b);
let f = light ? "styles-dark.css" : "styles-light.css";
let b = light ? "icon/White-Bomb.png" : "icon/Black-Bomb.png";
$("#css").attr("href", f);
$("#mode").attr("src", b);
light = !light;
}
};
Loading