Merge

ArtemKo7v · ArtemKo7v · commit d62224cc5e51 · 2018-07-09T23:02:24.000+07:00
diff --git a/api/widget.js b/api/widget.js
@@ -1406,7 +1406,7 @@ ethplorerWidget.Type['tokenHistoryGrouped'] = function(element, options, templat
                     title: 'Token operations',
                     format: '#,### K',
                     viewWindow: {
-                        max: 1000
+                        max: 1250
                     },
                 },
                 1: {
@@ -1714,7 +1714,7 @@ ethplorerWidget.Type['tokenPriceHistoryGrouped'] = function(element, options, te
             rangeStart = new Date(strFirstDate);
         var date = stDate.getDate();
         fnDate.setDate(date - this.options.period + 1);
-        rangeStart.setDate(date - (this.options.period > 60 ? 60 : this.options.period) + 1);
+        rangeStart.setDate(date - (this.options.period > 90 ? 90 : this.options.period) + 1);
 
         // prepare data
         var aCountData = {};
@@ -1750,7 +1750,7 @@ ethplorerWidget.Type['tokenPriceHistoryGrouped'] = function(element, options, te
             if(!priceNotFound){
                 noPrice = false;
                 aData.push(['Day', 'Low', 'Open', 'Close', 'High', {type: 'string', role: 'tooltip', 'p': {'html': true}}, 'Token operations', {role: 'style'}, {type: 'string', role: 'tooltip', 'p': {'html': true}}, 'Volume', {role: 'style'}, {type: 'string', role: 'tooltip', 'p': {'html': true}}]);
-                if(this.options.period > 60){
+                if(this.options.period > 90){
                     fnDate = startPriceDate;
                 }
             }
diff --git a/index.php b/index.php
@@ -18,7 +18,7 @@
 require dirname(__FILE__) . '/service/lib/ethplorer.php';
 $es = Ethplorer::db(array());
 
-$codeVersion = isset($aConfig['codeVersion']) ? $aConfig['codeVersion'] : "216";
+$codeVersion = isset($aConfig['codeVersion']) ? $aConfig['codeVersion'] : "217";
 
 $error = TRUE;
 $header = "";
diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -94,6 +94,14 @@ Ethplorer = {
         });
         $(document).on('click', '[data-toggle="tab"]', function(){
             Ethplorer.Nav.set('tab', $(this).parent().attr('id'));
+            var activeTab = Ethplorer.getActiveTab();
+            if(activeTab){
+                if(activeTab != 'transfers'){
+                    $('#showTxChecks').hide();
+                }else{
+                    $('#showTxChecks').show();
+                }
+            }
             if(Ethplorer.data) Ethplorer.showFilter(Ethplorer.data);
         });
         $('.download').click(function(){
@@ -983,6 +991,8 @@ Ethplorer = {
 
             if(data.contract && data.contract.txsCount && (data.contract.txsCount > data.token.txsCount)){
                 data.token.txsCount = data.contract.txsCount;
+            }
+            if(data.token && data.token.txsCount){
                 if(data.token.txsCount > Ethplorer.maxListSize) Ethplorer.maxListSize = data.token.txsCount;
             }
 
@@ -1162,6 +1172,11 @@ Ethplorer = {
     showFilter: function(data){
         var activeTab = Ethplorer.getActiveTab();
         if(activeTab && data.pager && data.pager[activeTab]){
+            if(activeTab != 'transfers'){
+                $('#showTxChecks').hide();
+            }else{
+                $('#showTxChecks').show();
+            }
             if(data.pager[activeTab].records > 100000 || Ethplorer.maxListSize > 100000){
                 $('#filter_list').hide();
             }else{
@@ -1252,7 +1267,7 @@ Ethplorer = {
         var tableId = data.token ? 'address-token-transfers' : 'address-transfers';
         $('#' + tableId).find('.table').empty();
         if(Ethplorer.showTx && !$('#showTxEth').length){
-            var showTxChecks = '<span style="color: white;vertical-align:middle;"><label for="showTxEth">ETH <sup class="diff-down">new</sup></label></span> <input onClick="Ethplorer.showTransfers(this, \'eth\');" id="showTxEth" type="checkbox" ' + ((Ethplorer.showTx == 'all' || Ethplorer.showTx == 'eth') ? 'checked="checked"' : '') + ' name="showTxEth" value="1" style="vertical-align: text-bottom;margin-right:5px;">' + ' <span style="color: white;vertical-align:middle;"><label for="showTxTokens">Tokens <sup class="diff-down">new</sup></label></span> <input onClick="Ethplorer.showTransfers(this, \'tokens\');" id="showTxTokens" type="checkbox" ' + ((Ethplorer.showTx == 'all' || Ethplorer.showTx == 'tokens') ? 'checked="checked"' : '') + ' name="showTxTokens" value="1" style="vertical-align: text-bottom;margin-right:5px;">';
+            var showTxChecks = '<span id="showTxChecks"><span style="color: white;vertical-align:middle;"><label for="showTxEth">ETH <sup class="diff-down">new</sup></label></span> <input onClick="Ethplorer.showTransfers(this, \'eth\');" id="showTxEth" type="checkbox" ' + ((Ethplorer.showTx == 'all' || Ethplorer.showTx == 'eth') ? 'checked="checked"' : '') + ' name="showTxEth" value="1" style="vertical-align: text-bottom;margin-right:5px;">' + ' <span style="color: white;vertical-align:middle;"><label for="showTxTokens">Tokens <sup class="diff-down">new</sup></label></span> <input onClick="Ethplorer.showTransfers(this, \'tokens\');" id="showTxTokens" type="checkbox" ' + ((Ethplorer.showTx == 'all' || Ethplorer.showTx == 'tokens') ? 'checked="checked"' : '') + ' name="showTxTokens" value="1" style="vertical-align: text-bottom;margin-right:5px;"></span>';
 
             if(!data.token){
                 $('.filter-form').prepend('<style>@media screen and (max-width: 501px) {.filter-box.out-of-tabs{height: 35px !important;}}</style>' + showTxChecks);
