Fixed block height link bug

janoside · Nov 25, 2018 · 00227ed · 00227ed
1 parent 6b99213
commit 00227ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/public/js/index.js b/public/js/index.js
@@ -39,12 +39,12 @@ $(document).ready(function () {
                     }
 
                     if(data.miner !== '?') {
-                        data.miner = '<span data-toogle="tooltip" class="tag" title="Identified by: ' + data.miner.identifiedBy + '">' + data.miner.name + '</span>';
+                        data.miner = '<span class="tag" data-toogle="tooltip" title="Identified by: ' + data.miner.identifiedBy + '">' + data.miner.name + '</span>';
                     }
 
                     $('#block-list').prepend(
                         '<tr>' +
-                        '<td class="data-cell monospace"><a href="/block-height/' + data.height + '">' + data.height + '</a></td>' +
+                        '<td class="data-cell monospace"><a href="/block-height/' + data.height_number + '">' + data.height + '</a></td>' +
                         '<td class="data-cell monospace">' + data.time + '<span class="d-none block-timestamp">' + data.timeUTC + '</span>' +'</td>' +
                         '<td class="data-cell monospace text-right block-time-ago">' + data.timeAgo + '</td>' +
                         '<td class="data-cell monospace"><span>' + data.miner + '</span></td>' +
@@ -69,8 +69,10 @@ $(document).ready(function () {
                         '</tr>'
                     );
 
+                    $('[data-toggle="tooltip"]').tooltip('dispose');
                     $('[data-toggle="tooltip"]').tooltip();
-                    $('[data-toggle="popover"]').popover({html:true, container:"body"});
+                    //$('[data-toggle="popover"]').popover({html:true, container:"body"});
+                    //$("[data-toggle='toggle']").toggle();
 
                     latestBlock = latestBlock + 1;
                 }

diff --git a/routes/baseActionsRouter.js b/routes/baseActionsRouter.js
@@ -1047,6 +1047,7 @@ router.get('/newblocks', (req, res) => {
 			let formatExchangedCurrency = utils.formatExchangedCurrency(currencyValue);
 
 			let height = block.height.toLocaleString();
+			let height_number = block.height;
 			let timeUTC = new Date(parseInt(block.time) * 1000).getTime();
 			let time = moment.utc(new Date(parseInt(block.time) * 1000)).format("Y-MM-DD HH:mm:ss");
 			let timeAgo = moment.duration(moment.utc(new Date()).diff(moment.utc(new Date(parseInt(block.time) * 1000)))).format('m') + ' min';
@@ -1056,7 +1057,7 @@ router.get('/newblocks', (req, res) => {
 			let weight = block.weight.toLocaleString();
 			let radialProgressBarPercent = new Decimal(100 * block.weight / coinConfig.maxBlockWeight).toDecimalPlaces(2);
 
-			res.send({height: height, time: time, timeUTC: timeUTC, timeAgo: timeAgo, miner: miner, transactions: transactions,
+			res.send({height: height, height_number: height_number, time: time, timeUTC: timeUTC, timeAgo: timeAgo, miner: miner, transactions: transactions,
 				currencyValue: currencyValue, currencyValueFormatted: currencyValueFormatted, size: size, weight: weight, radialProgressBarPercent: radialProgressBarPercent
 				, currencyFormatType: currencyFormatType, exchangeRate: exchangeRate, formatExchangedCurrency: formatExchangedCurrency});
         } else {

diff --git a/views/includes/blocks-list.pug b/views/includes/blocks-list.pug
@@ -29,7 +29,7 @@ table(class="table table-striped table-responsive-sm mb-0")
 					- var timeAgo = moment.duration(moment.utc(new Date()).diff(moment.utc(new Date(parseInt(block.time) * 1000))));
 					td(class="data-cell monospace text-right block-time-ago") #{timeAgo.format("m") + " min"}
 					td(class="data-cell monospace")
-						if (block.miner && block.miner.name)
+						if (block.miner)
 							span(data-toggle="tooltip", title=("Identified by: " + block.miner.identifiedBy), class="tag") #{block.miner.name}
 						else
 							span ?