From 04f4bed66566a75c0c1a34bc9dea2db5535bb115 Mon Sep 17 00:00:00 2001 From: MEUNIER Thibaud Date: Sat, 4 Dec 2021 20:35:54 +0100 Subject: [PATCH] nft phase 2 b --- js/blockexplorer.js | 29 ++++++++++++++++++++++------- nft.php | 15 ++++++--------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/js/blockexplorer.js b/js/blockexplorer.js index a207d8a..be4eedb 100644 --- a/js/blockexplorer.js +++ b/js/blockexplorer.js @@ -2,7 +2,7 @@ blockchainExplorer = function(){ // Init array var _known_blocks = null; - var _liste_blocks = null; + var _liste_blocks = []; var _classes = ['bg-grey-even','bg-grey-odd']; var _cur_class = 0; var _cur_methode = 'hasard'; @@ -329,13 +329,27 @@ blockchainExplorer = function(){ function _initBlockSelector() { - // Init the selector - var select = $('#blockSelector'); + if (_known_blocks == null) + { + $.getJSON('data/getKnownBlocksList.php', function( data ) { + // Init the selector + var select = $('#blockSelector'); - if (select !== null) { - select.append(new Option('LAST', 'LAST')); - $.each(_known_blocks, function (key, bloc) { - select.append(new Option(bloc.name, bloc.name)); + _known_blocks = data; + _known_blocks.sort(function(a,b){ + // sort desc ... + if (parseInt(a.height) < parseInt(b.height)) return 1; + if (parseInt(a.height) > parseInt(b.height)) return -1; + return 0; + }); + + if (select !== null) { + $.each(_known_blocks, function (key, bloc) { + select.append(new Option(bloc.name, bloc.name)); + }); + } + + return true; }); } } @@ -461,6 +475,7 @@ blockchainExplorer = function(){ getblocHashFromName: _getblocHashFromName, initOneBlock : _initOneBlock, + initBlockSelector : _initBlockSelector, toggleInfos: _toggleInfos, getLength: _getLength, diff --git a/nft.php b/nft.php index dbe4b0b..b09f73e 100644 --- a/nft.php +++ b/nft.php @@ -48,28 +48,25 @@ } }); - showInfos(); + blockchainExplorer.initBlockSelector(); + selectBlock(); }); function showInfos() { - lastScroll = 0; - blockchainExplorer.init(0, false); + selectBlock(); } function toggleInfos() { - blockchainExplorer.toggleInfos(); + c.toggleInfos(); } function selectBlock() { lastScroll = 0; - if ($('#blockSelector').val() == 'FULL') - blockchainExplorer.init(0, false); - else - blockchainExplorer.initOneBlock($('#blockSelector').val()); + blockchainExplorer.initOneBlock($('#blockSelector').val()); } @@ -105,7 +102,7 @@