8000 Merge branch 'develop' of https://github.com/EverexIO/Ethplorer into … · etherscan-io/Ethplorer@416e395 · GitHub
[go: up one dir, main page]
Skip to content

Commit 416e395

Browse files
ArtemKo7vArtemKo7v
committed
Merge branch 'develop' of https://github.com/EverexIO/Ethplorer into develop
2 parents 35e5e29 + 643157c commit 416e395

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

‎api/controller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ public function getAddressPriceHistoryGrouped(){
510510
$this->sendError(104, 'Invalid address format');
511511
}
512512
}
513-
$withEth = (isset($_GET["withEth"]) && $_GET["withEth"]) ? TRUE : FALSE;
513+
$withEth = (isset($_GET["withEth"]) && (bool)$_GET["withEth"]) ? TRUE : FALSE;
514514
$result = array('history' => $this->db->getAddressPriceHistoryGrouped($address, FALSE, $withEth));
515515
if(isset($result['history']['cache'])) $this->cacheState = $result['history']['cache'];
516516
else $this->cacheState = '';

‎api/widget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ ethplorerWidget = {
161161
apiKey: 'ethplorer.widget',
162162
domain: document.location.href, 10000
163163
period: 730,
164-
withEth: preloadMethod.options.withEth ? preloadMethod.options.withEth : false,
164+
withEth: preloadMethod.options.withEth ? preloadMethod.options.withEth : '',
165165
};
166166

167167
$.getJSON(api, params, function(_address){

‎css/ethplorer.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,9 @@ a.dashed {
668668
white-space: nowrap;
669669
text-overflow: ellipsis;
670670
line-height: 1em;
671-
overflow-x: hidden;
671+
overflow: hidden;
672+
position: relative;
673+
top: 2px;
672674
}
673675

674676
.total-supply-usd {

‎index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
}
6969

7070
$withEth = false;
71-
if(isset($_GET['withEth']) && $_GET['withEth']){
72-
$withEth = $_GET['withEth'];
71+
if((isset($_GET['withEth']) && (bool)$_GET['withEth']) || (isset($_GET['witheth']) && (bool)$_GET['witheth'])){
72+
$withEth = true;
7373
}
7474

7575
$hasNotes = isset($aConfig['adv']) && count($aConfig['adv']);

‎js/ethplorer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,9 @@ Ethplorer = {
418418
// $('#ethplorer-path').html('<h1>Transaction hash: ' + txHash + '</h1>');
419419
$('#ethplorer-path').show();
420420
if (txData.pending && txData.tx && txData.tx.blockNumber) {
421-
$('#ethplorer-path').html($('#ethplorer-path').text() + '<br /><h4 class="text-danger tx-pending">Processing transation&nbsp;&nbsp;<i class="table-loading fa fa-spinner fa-spin"></i></h4>')
421+
$('#ethplorer-path').html($('#ethplorer-path').text() + '<br /><h4 class="text-danger tx-pending">Processing transaction&nbsp;&nbsp;<i class="table-loading fa fa-spinner fa-spin"></i></h4>')
422422
} else if (txData.pending) {
423-
$('#ethplorer-path').html($('#ethplorer-path').text() + '<br /><h4 class="text-danger tx-pending">Pending transation&nbsp;&nbsp;<i class="table-loading fa fa-spinner fa-spin"></i></h4>')
423+
$('#ethplorer-path').html($('#ethplorer-path').text() + '<br /><h4 class="text-danger tx-pending">Pending transaction&nbsp;&nbsp;<i class="table-loading fa fa-spinner fa-spin"></i></h4>')
424424
}
425425

426426
$('.list-field').empty();

‎service/lib/ethplorer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2771,7 +2771,6 @@ public function getTokenPriceHistoryGrouped($address, $period = 365, $type = 'da
27712771
}
27722772

27732773
public function getAddressPriceHistoryGrouped($address, $updateCache = FALSE, $withEth = FALSE){
2774-
$withEth = FALSE;
27752774
evxProfiler::checkpoint('getAddressPriceHistoryGrouped', 'START', 'address=' . $address . ', withEth=' . ($withEth ? 'TRUE' : 'FALSE'));
27762775

27772776
$cache = 'address_operations_history-' . $address . ($withEth ? '-eth' : '');

0 commit comments

Comments
 (0)
0