malhuda/fictioneer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 112 Wiki Activity

Refactor style (among other things) #24

Merged
Tetrakern merged 94 commits from refactor_colors into main 2024-03-03 02:47:35 +08:00
Conversation 0 Commits 94 Files Changed 145 +14 -14
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f97ed65050 - Show all commits

28
src/js/ajax-bookshelf.js
View File

@ -45,7 +45,7 @@ function fcn_getBookshelfContent() {
function fcn_updateBookshelfView(action = null, page = null, order = null, scroll = false) { function fcn_updateBookshelfView(action = null, page = null, order = null, scroll = false) {
// Setup // Setup
let fcn_bookshelfStorage = fcn_getBookshelfContent(); let storage = fcn_getBookshelfContent();
action = action ?? fcn_bookshelfTarget.dataset.action, action = action ?? fcn_bookshelfTarget.dataset.action,
page = page ?? fcn_bookshelfTarget.dataset.page, page = page ?? fcn_bookshelfTarget.dataset.page,
@ -55,24 +55,24 @@ function fcn_updateBookshelfView(action = null, page = null, order = null, scrol
// Storage item valid for 60 seconds // Storage item valid for 60 seconds
if ( if (
! fcn_bookshelfStorage.hasOwnProperty('timestamp') || ! storage.hasOwnProperty('timestamp') ||
fcn_bookshelfStorage['timestamp'] + 60000 < Date.now() storage['timestamp'] + 60000 < Date.now()
) { ) {
localStorage.removeItem('fcnBookshelfContent'); localStorage.removeItem('fcnBookshelfContent');
fcn_bookshelfStorage = { html: {}, count: {} }; storage = { html: {}, count: {} };
fcn_fetchBookshelfPart(action, page, order, scroll); fcn_fetchBookshelfPart(action, page, order, scroll);
return; return;
} }
// Check if content already cached // Check if content already cached
if ( if (
fcn_bookshelfStorage.hasOwnProperty('html') && storage.hasOwnProperty('html') &&
fcn_bookshelfStorage['html'].hasOwnProperty(htmlKey) storage['html'].hasOwnProperty(htmlKey)
) { ) {
fcn_bookshelfTarget.innerHTML = fcn_bookshelfStorage['html'][htmlKey]; fcn_bookshelfTarget.innerHTML = storage['html'][htmlKey];
fcn_bookshelfTarget.classList.remove('ajax-in-progress'); fcn_bookshelfTarget.classList.remove('ajax-in-progress');
fcn_bookshelfTarget.dataset.page = page; fcn_bookshelfTarget.dataset.page = page;
_$('.item-number').innerHTML = `(${fcn_bookshelfStorage['count'][action]})`; _$('.item-number').innerHTML = `(${storage['count'][action]})`;
if (scroll) { if (scroll) {
_$$$('main').scrollIntoView({ behavior: 'smooth' }); _$$$('main').scrollIntoView({ behavior: 'smooth' });
@ -128,8 +128,8 @@ function fcn_browseBookshelfPage(page) {
function fcn_fetchBookshelfPart(action, page, order, scroll = false) { function fcn_fetchBookshelfPart(action, page, order, scroll = false) {
// Setup // Setup
const htmlKey = action + page + order, const htmlKey = action + page + order;
fcn_bookshelfStorage = fcn_getBookshelfContent(); const storage = fcn_getBookshelfContent();
// Request // Request
fcn_ajaxGet({ fcn_ajaxGet({
@ -142,10 +142,10 @@ function fcn_fetchBookshelfPart(action, page, order, scroll = false) {
// Check for success // Check for success
if (response.success) { if (response.success) {
// Temporary remember in web storage // Temporary remember in web storage
fcn_bookshelfStorage['timestamp'] = Date.now(); storage['timestamp'] = Date.now();
fcn_bookshelfStorage['html'][htmlKey] = response.data.html; storage['html'][htmlKey] = response.data.html;
fcn_bookshelfStorage['count'][action] = response.data.count; storage['count'][action] = response.data.count;
localStorage.setItem('fcnBookshelfContent', JSON.stringify(fcn_bookshelfStorage)); localStorage.setItem('fcnBookshelfContent', JSON.stringify(storage));
// Render in view // Render in view
fcn_bookshelfTarget.innerHTML = response.data.html; fcn_bookshelfTarget.innerHTML = response.data.html;