diff options
| -rw-r--r-- | src/index.html | 2 | ||||
| -rw-r--r-- | src/js/arching-kaos-modules-comments.js | 21 | ||||
| -rw-r--r-- | src/js/arching-kaos-modules-references.js | 24 | ||||
| -rw-r--r-- | src/js/arching-kaos-tools.js | 54 |
4 files changed, 50 insertions, 51 deletions
diff --git a/src/index.html b/src/index.html index 2850c26..2bf3302 100644 --- a/src/index.html +++ b/src/index.html @@ -222,6 +222,8 @@ <script src="./js/arching-kaos-spa-router.js"></script> <script src="./js/arching-kaos-modules-files.js"></script> <script src="./js/arching-kaos-modules-news.js"></script> + <script src="./js/arching-kaos-modules-references.js"></script> + <script src="./js/arching-kaos-modules-comments.js"></script> <script src="./js/arching-kaos-tools.js"></script> <script src="./js/arching-kaos-stellar-network.js"></script> <script src="./js/arching-kaos-decentralized-radio.js"></script> diff --git a/src/js/arching-kaos-modules-comments.js b/src/js/arching-kaos-modules-comments.js new file mode 100644 index 0000000..7e13400 --- /dev/null +++ b/src/js/arching-kaos-modules-comments.js @@ -0,0 +1,21 @@ +function akModuleComments(zblockIPFSHash, blockObject, json){ + if (!document.querySelector('#comment-'+zblockIPFSHash)){ + var divs = document.querySelector('#comments-section'); + var art = document.createElement("article"); + art.id = 'comment-'+zblockIPFSHash; + if(json.datetime){ + var small = document.createElement("p"); + small.innerText="Published: " + new Date(json.datetime*1000); + art.appendChild(small); + } + var small = document.createElement("p"); + small.innerText="Contributor: " + getNicknameAssossiatedWithGPG(blockObject.gpg); + art.appendChild(small); + if(json.ipfs){ + getipfstext(json.ipfs,art.id); + } + if (document.querySelector("#comments-sec-not-found")) document.querySelector("#comments-sec-not-found").hidden=true; + divs.appendChild(art); + divs.appendChild(document.createElement("hr")); + } +} diff --git a/src/js/arching-kaos-modules-references.js b/src/js/arching-kaos-modules-references.js new file mode 100644 index 0000000..c13f299 --- /dev/null +++ b/src/js/arching-kaos-modules-references.js @@ -0,0 +1,24 @@ +function resolveReferences(references){ + for( entry in references ){ + var comment = document.querySelector('#comment-'+references[entry].dataExpansion.reference); + var article = document.querySelector('#news-'+references[entry].dataExpansion.refer_to); + article.appendChild(comment); + } +} + +function storeReference(zblockIPFSHash, zblockObject, blockObject, json, references){ + if ( references[zblockIPFSHash] === undefined ){ + references[zblockIPFSHash]={ + zblock:zblockIPFSHash, + block:zblockObject.block, + block_signature:zblockObject.block_signature, + action:blockObject.action, + previous:blockObject.previous, + data:blockObject.data, + dataExpansion:json, + detach:blockObject.detach, + gpg:blockObject.gpg, + timestamp:blockObject.timestamp + }; + } +} diff --git a/src/js/arching-kaos-tools.js b/src/js/arching-kaos-tools.js index 5e2de09..fc1fe23 100644 --- a/src/js/arching-kaos-tools.js +++ b/src/js/arching-kaos-tools.js @@ -131,11 +131,7 @@ function blockRenderAndProceed(json, params){ sortedMixtapes = mixtapes.sort(function(a,b){return a.timestamp - b.timestamp}); } } - for( entry in references ){ - var comment = document.querySelector('#comment-'+references[entry].dataExpansion.reference); - var article = document.querySelector('#news-'+references[entry].dataExpansion.refer_to); - article.appendChild(comment); - } + resolveReferences(references); } else { seekzblock(json.previous, zchainIPNSLink); } @@ -246,12 +242,6 @@ function seekblock(blockIPFSHash,zblockIPFSHash,zchainIPNSLink,zblockObject){ archingKaosFetchJSON(getIPFSURL(blockIPFSHash), blockRenderAndProceed, [zchainIPNSLink, zblockIPFSHash, blockIPFSHash, zblockObject]); } -/* - * Function that executes a specified block - * - * Returns the result of execution on the proper page in DOM - */ - function getNicknameAssossiatedWithGPG(gpgIPFSHash){ for (let i in participants){ if ( participants[i].gpg === gpgIPFSHash ){ @@ -381,48 +371,10 @@ function exe(action,dataIPFSHash,blockObject,zblockIPFSHash,zchainIPNSLink,zbloc akModuleNews(zblockIPFSHash, zblockObject, blockObject, json); } else if (action == "comments/add") { - if (!document.querySelector('#comment-'+zblockIPFSHash)){ - var divs = document.querySelector('#comments-section'); - var art = document.createElement("article"); - art.id = 'comment-'+zblockIPFSHash; - /* - if(json.title){ - var h3 = document.createElement("h3"); - h3.innerText = json.title; - art.appendChild(h3); - } - */ - if(json.datetime){ - var small = document.createElement("p"); - small.innerText="Published: " + new Date(json.datetime*1000); - art.appendChild(small); - } - var small = document.createElement("p"); - small.innerText="Contributor: " + getNicknameAssossiatedWithGPG(blockObject.gpg); - art.appendChild(small); - if(json.ipfs){ - getipfstext(json.ipfs,art.id); - } - if (document.querySelector("#comments-sec-not-found")) document.querySelector("#comments-sec-not-found").hidden=true; - divs.appendChild(art); - divs.appendChild(document.createElement("hr")); - } + akModuleComments(zblockIPFSHash,blockObject, json); } else if (action == "references/add"){ - if ( references[zblockIPFSHash] === undefined ){ - references[zblockIPFSHash]={ - zblock:zblockIPFSHash, - block:zblockObject.block, - block_signature:zblockObject.block_signature, - action:action, - previous:blockObject.previous, - data:blockObject.data, - dataExpansion:json, - detach:blockObject.detach, - gpg:blockObject.gpg, - timestamp:blockObject.timestamp - }; - } + storeReference(zblockIPFSHash, zblockObject, blockObject, json, references); } else if (action == "mixtape/add") { if(!document.querySelector('#mixtape-'+zblockIPFSHash)){ |