From eb53eec5ed0758ccee8829c9beb1f5f7c9c0256e Mon Sep 17 00:00:00 2001 From: kor Date: Mon, 16 Jul 2018 14:58:03 +1200 Subject: [PATCH] Fixed page loading. --- content/Memex.ndtl | 42 ++++++++++++++++++--------- logic/main.js | 71 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 82 insertions(+), 31 deletions(-) diff --git a/content/Memex.ndtl b/content/Memex.ndtl index 36ce007..c39c2f1 100644 --- a/content/Memex.ndtl +++ b/content/Memex.ndtl @@ -130,13 +130,13 @@ DECIDE TO MAKE NOTE : Deciding what to make. SEEN : false -ALT WAD +ALT WAD EXPLAINED PERS : Phil James LINK : https://unwinnable.com/2013/10/24/lost-worlds-a-l-t/ TYPE : article DATE : 12018-07-03 - TAGS : gamedev - NOTE : ALT explained. + TAGS : gamedev, game + NOTE : 'ALT' an original Doom level pack collab SEEN : true PROG : Finish playing it. Level 7? @@ -166,15 +166,17 @@ CYCLIC DUNGEON LINK : http://ctrl500.com/tech/handcrafted-feel-dungeon-generation-unexplored-explores-cyclic-dungeon-generation/ TYPE : article DATE : 12018-07-03 - TAGS : gamedev + TAGS : gamedev, game SEEN : false + NOTE : 'Unexplored' game GENERATE GREAT DUNGEONS LINK : https://www.rockpapershotgun.com/2017/03/10/how-unexplored-generates-great-roguelike-dungeons/ TYPE : article DATE : 12018-07-03 - TAGS : gamedev + TAGS : gamedev, game SEEN : false + NOTE : 'Unexplored' game TECHNOLOGIST CLIMATE LINK : http://worrydream.com/ClimateChange/ @@ -230,9 +232,10 @@ SIGNAL TOLVA LINK : https://killscreen.com/articles/quick-look-landscape-art-signal-tolva/ TYPE : article DATE : 12018-07-03 - TAGS : gamedev + TAGS : gamedev, game QOTE : 'I would have been even more cryptic if I thought I could get away with it' SEEN : false + NOTE : 'Signal From Tolva' FOLDED LEVEL DESIGN LINK : http://critical-gaming.com/blog/2008/8/5/folded-level-design.html @@ -267,8 +270,9 @@ HYPER LIGHT DIFFICULTY LINK : https://www.gamasutra.com/view/news/269957/How_Hyper_Light_Drifter_balances_difficulty_with_fairness.php TYPE : article DATE : 12018-07-03 - TAGS : gamedev + TAGS : gamedev, game SEEN : false + NOTE : 'Hyper Light Drifter' CAVE ALLEGORY LINK : http://www.historyguide.org/intellect/allegory.html @@ -509,6 +513,7 @@ OVERWHELM DATE : 12018-07-06 SEEN : true NOTE : Stylish pixel platformer + NOTE : 'Overwhelm' COMPASS PERS : faun @@ -945,12 +950,12 @@ HELLO 5till L1 Complex PERS : Phil James LINK : https://www.doomworld.com/idgames/levels/doom2/Ports/0-9/5l1c - NOTE : Doom level - FILE : 12018-07-14_5l1c.zip TYPE : game - TAGS : gamedev + FILE : 12018-07-14_5l1c.zip + TAGS : gamedev, game SEEN : false DATE : 12018-07-14 + NOTE : '5till L1 Complex' a large custom Doom level. BLADE RUNNER 2049 DESIGN LINK : https://www.engadget.com/2017/10/20/designing-the-technology-of-blade-runner-2049/ @@ -1117,15 +1122,16 @@ JIM CRAWFORD INTERVIEW TYPE : article DATE : 12018-07-15 SEEN : false - TAGS : gamedev + TAGS : gamedev, game + NOTE : 'Frog Fractions 2' TARN ADAMS INTERVIEW LINK : https://www.pcgamer.com/dwarf-fortress-creator-tarn-adams-talks-about-simulating-the-most-complex-magic-system-ever/ TYPE : article DATE : 12018-07-15 SEEN : false - TAGS : gamedev - NOTE : Dwarf Fortress + TAGS : gamedev, game + NOTE : 'Dwarf Fortress' WHISTLE BLOWING LINK : https://theintercept.com/2016/05/03/edward-snowden-whistleblowing-is-not-just-leaking-its-an-act-of-political-resistance/ @@ -1255,11 +1261,19 @@ PRODUCTIVE DISTORTIONS SEEN : false TAGS : psychology -PRODUCTIVE DISTORTIONS +KILLED GREEN SCREEN PERS : goldbuick SRCE : Merveilles LINK : https://vimeo.com/264282403 TYPE : video DATE : 12018-07-15 SEEN : false + +CLIENT SIDE ROUTING + LINK : https://blog.risingstack.com/writing-a-javascript-framework-client-side-routing/ + TYPE : article + DATE : 12018-07-16 + SEEN : false + NOTE : Research for memex + TAGS : web, code ` \ No newline at end of file diff --git a/logic/main.js b/logic/main.js index fad4549..1723907 100644 --- a/logic/main.js +++ b/logic/main.js @@ -1,13 +1,18 @@ function Main() { + // REFERENCE this.database = null; this.keys = null; - this.page = 0; + // this.page = 0; this.lastEntry = -1; - this.postPerPage = 1000; this.msnry = null; this.grid = null; + // SETTINGS + this.useMasonry = true; + this.postPerPage = 1000; + + // MAIN this.install = function() { this.database = new Indental(DATABASE).parse(); @@ -15,13 +20,17 @@ function Main() this.processDatabase(); this.grid = document.getElementById("grid"); - this.msnry = new Masonry( '.grid', { + + if (this.useMasonry) + { + this.msnry = new Masonry( '.grid', { itemSelector: '.grid-item', columnWidth: 350, gutter: 20, fitWidth: true, transitionDuration: 0, }); + } } this.start = function() @@ -46,21 +55,23 @@ function Main() if (target == 'home') { - console.log('home'); + console.log('Display \'home\''); this.grid.innerHTML = ''; this.displayEntries(this.database); - this.msnry.reloadItems(); - this.msnry.layout(); - console.log(this.database); + if (this.useMasonry) + { + this.msnry.reloadItems(); + this.msnry.layout(); + } } else { var splitTarget = target.split("-"); if (splitTarget[0] == 'tag') { - console.log('tag-'+splitTarget[1]); + console.log('Display tag \'' + splitTarget[1] + '\''); var tempDatabase = {} for (i = 0; i < this.keys.length; i++) @@ -77,12 +88,15 @@ function Main() } } } - console.log(tempDatabase); this.grid.innerHTML = ''; this.displayEntries(tempDatabase); - this.msnry.reloadItems(); - this.msnry.layout(); + + if (this.useMasonry) + { + this.msnry.reloadItems(); + this.msnry.layout(); + } } else if (splitTarget[0] == 'type') { @@ -111,6 +125,7 @@ function Main() this.database[dbKeys[i]].TAGS = tags; } } + console.log(this.database); } this.missing = function(target) @@ -121,6 +136,8 @@ function Main() this.touch = function(target) { + console.log('touch'); + var link = target.getAttribute("href") ? target.getAttribute("href") : target.parentNode.getAttribute("href") if(!link){ return; } @@ -129,15 +146,17 @@ function Main() this.load(link.substr(1,link.length-1)); } - document.addEventListener('mouseup', (e)=>{ this.touch(e.target); e.preventDefault(); }); + //document.addEventListener('mouseup', (e)=>{ this.touch(e.target); e.preventDefault(); }); this.displayEntries = function(db) { var dbKeys = Object.keys(db); - this.page += this.postPerPage; - var i = this.lastEntry + 1; - while (i < Math.min(dbKeys.length, this.page)) + //this.page += this.postPerPage; + //var i = this.lastEntry + 1; + var i = 0; + while (i < dbKeys.length) + // while (i < Math.min(dbKeys.length, this.page)) { this.buildEntry(db, dbKeys[i]); this.lastEntry = i; @@ -262,7 +281,11 @@ function Main() entry += ``; this.grid.innerHTML += entry; - // this.msnry.appended( entry ); + + // if (this.useMasonry) + // { + // this.msnry.appended( entry ); + // } } // this.doPagination = function() @@ -360,4 +383,18 @@ function Main() // window.addEventListener("hashchange", detectBackOrForward( // function() { console.log("back"); main.load(); }, // function() { console.log("forward"); main.load(); } -// )); \ No newline at end of file +// )); + +// var doThing = function() +// { +// console.log('do thing'); +// } + +// window.addEventListener("hashchange", doThing()); + +window.addEventListener("hashchange", navigate ); + +function navigate() +{ + main.load(window.document.location.hash); +} \ No newline at end of file