Merge branch 'develop' of https://github.com/everexio/ethplorer into …

…develop
ekyang · Feb 7, 2017 · 9c58ab3 · 9c58ab3
2 parents b7f5de3 + 17aacf3
commit 9c58ab3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/api/widget.js b/api/widget.js
@@ -73,7 +73,7 @@ ethplorerWidget = {
         if(document.location.host !== host){
             obj.el.append('<div style="text-align:center;font-size:11px;padding-top:12px;"><a class="tx-link" href="https://ethplorer.io/widgets" target="_blank">Ethplorer.io</a></a>');
         }else{
-            obj.el.append('<div style="text-align:center;font-size:11px;"><a class="tx-link" href="javascript:void(0)" onclick="ethplorerWidget.getWidgetCode(this);">Get widget code</a></a>');
+            obj.el.append('<div id="get-widget" style="text-align:center;font-size:11px;display:none;"><a class="tx-link" href="javascript:void(0)" onclick="ethplorerWidget.getWidgetCode(this);">Get widget code</a></div>');
             obj.el.find('.tx-link').data("widget", obj);
         }
     },
@@ -593,18 +593,16 @@ ethplorerWidget.Type['dailyTX'] = function(element, options, templates){
 
         var data = google.visualization.arrayToDataTable(aData);
         var def = {
-            title: 'Ethereum Tokens Pulse',
-            titleTextStyle: {
-                color: '#FFF',
-            },
+            title: '',
+            //titleTextStyle: {color: '#FFF'},
             //curveType: 'function',
             legend: { position: 'none' },
             tooltip: {
                 format: 'MMM d',
             },
             hAxis : {
-                title: '90 days token operations chart',
-                titleTextStyle: {color: '#B0B0B0', italic: false},
+                title: '',
+                //titleTextStyle: {color: '#B0B0B0', italic: false},
                 textPosition: 'out',
                 textStyle: {color: '#FFF'},
                 slantedText: false,
@@ -618,8 +616,8 @@ ethplorerWidget.Type['dailyTX'] = function(element, options, templates){
                 baselineColor: '#FFF'
             },
             vAxis: {
-                title: 'Token operations',
-                titleTextStyle: {color: '#B0B0B0', italic: false},
+                title: '',
+                //titleTextStyle: {color: '#B0B0B0', italic: false},
                 textStyle: {color: '#FFF'},
                 minValue: 0,
                 gridlines: {

diff --git a/css/ethplorer.css b/css/ethplorer.css
@@ -391,6 +391,10 @@ a.dashed {
     overflow: hidden;
 }
 
+#get-widget {
+	display: none;
+}
+
 .same-address {
     opacity: 0.4;
 }

diff --git a/index.htm b/index.htm
@@ -147,7 +147,7 @@ <h1 class="t269__title t-title t-title_lg" style="" field="title">
                                                     $('.txs-header').html('<a href="/last" class="underline-onhover">Recent token transactions</a>')
                                                 }
                                             });
-                                            ethplorerWidget.init('#ethplorer-daily', 'dailyTX', {'period': 90, 'type': 'area', options: {'title': '', 'pointSize': 3}});
+                                            ethplorerWidget.init('#ethplorer-daily', 'dailyTX', {'period': 90, 'type': 'area', options: {'title': '', 'pointSize': 0, 'hAxis': {'title': '90 days token operations chart', 'titleTextStyle': {'color': '#B0B0B0', 'italic': false}}, 'vAxis': {'title': 'Token operations', 'titleTextStyle': {'color': '#B0B0B0', 'italic': false}}}});
                                         });
                                     </script>
                                     <div class="t269__hint t-descr t-descr_xxs" field="text" style="margin-top:50px;opacity:0.6;">

diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -790,12 +790,7 @@ Ethplorer = {
         $("table").find("tr:visible:last").addClass("last");
 
         $('#ethplorer-daily-token').show();
-        var options = {
-            title: '',
-            hAxis: {title: ''},
-            vAxis: {title: ''}
-        };
-        ethplorerWidget.init('#ethplorer-daily-token', 'dailyTX', {type:'area', token: address, options: options});
+        ethplorerWidget.init('#ethplorer-daily-token', 'dailyTX', {onLoad: function(){$('#get-widget').show();}, type:'area', token: address});
         ethplorerWidget.loadScript("https://www.gstatic.com/charts/loader.js", ethplorerWidget.loadGoogleCharts);
     },