correct diff % padding and fix Op price

ilyaeverex · ilyaeverex · commit 1667076cfe59 · 2018-04-25T13:56:49.000+07:00
diff --git a/css/ethplorer.css b/css/ethplorer.css
@@ -1391,7 +1391,7 @@ a.token-update {
     content: "";
     position: absolute;
     display: block;
-    left: 0px;
+    left: 0;
     width: 100%;
     height: 60px;
 }
@@ -1420,11 +1420,11 @@ a.token-update {
 }
 
 .diff-span {
-    padding-right: 10px;
+    padding-right: 20px;
     color: rgba(255, 255, 255, 0.6);
 }
 .diff-span span {
-    padding-left: 4px;
+    padding-left: 6px;
 }
 .diff-zero{
     color: rgba(255, 255, 255, 0.6);
diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -351,7 +351,6 @@ Ethplorer = {
         }
 
         var valFloat = parseFloat(Ethplorer.Utils.toBig(oOperation.value).toString());
-        valFloat =  valFloat / Math.pow(10, oToken.decimals)
         if('undefined' !== typeof(oOperation.formatted)){
             if(Ethplorer.Utils.isSafari()){
                 oOperation.value = valFloat;
@@ -693,7 +692,7 @@ Ethplorer = {
                 $('.multiop .blue').removeClass('blue');
                 el.addClass('blue');
                 el.removeClass('selectable');
-                Ethplorer.showOpDetails(txData.tx, el[0].operation);
+                Ethplorer.showOpDetails(oTx, el[0].operation);
             }
         }else if(multiop){
             Ethplorer.showOpDetails(oTx, txData.operations[0]);
@@ -1670,19 +1669,13 @@ Ethplorer = {
                     var hint = 'Updated at ' + Ethplorer.Utils.ts2date(rate.ts, true);
 
                     value = '<span title="' + hint + '">$ ' + Ethplorer.Utils.formatNum(rate.rate, true, 2, true) + '</span><br>';
-                    if('undefined' !== typeof rate.diff){
-                        value = value + '<span class="diff-span">24h<span class="' + getDiffClass(rate.diff) + '">'
-                            + getDiffString(rate.diff) +'</span></span>'
-                    }
-                    if('undefined' !== typeof rate.diff7d){
-                        value = value + '<span class="diff-span">7d<span class="' + getDiffClass(rate.diff7d) + '">'
-                            + getDiffString(rate.diff7d) +'</span></span>'
-                    }
-                    if('undefined' !== typeof rate.diff && 'undefined' !== typeof rate.diff7d || 'undefined' !== typeof rate.diff30d){
-                        var diff30d = rate.diff30d || 123456.789;
-                        value = value + '<span class="diff-span">30d<span class="' + getDiffClass(diff30d) + '">'
-                            + getDiffString(diff30d) +'</span></span>'
-                    }
+
+                    value = value + '<span class="diff-span">24h<span class="' + getDiffClass(rate.diff) + '">'
+                        + getDiffString(rate.diff) +'</span></span>'
+                    value = value + '<span class="diff-span">7d<span class="' + getDiffClass(rate.diff7d) + '">'
+                        + getDiffString(rate.diff7d) +'</span></span>'
+                    value = value + '<span class="diff-span">30d<span class="' + getDiffClass(rate.diff30d) + '">'
+                        + getDiffString(rate.diff30d) +'</span></span>'
                 }else{
                     value = '';
                 }
@@ -1979,10 +1972,10 @@ Ethplorer = {
             var postfix = '';
             if(withPostfix){
                 if(!numLimitPostfix) numLimitPostfix = 999999;
-                if(num > 999 && num <= numLimitPostfix){
+                if(Math.abs(num) > 999 && Math.abs(num) <= numLimitPostfix){
                     num = num / 1000;
                     postfix = ' K';
-                }else if(num > numLimitPostfix){
+                } else if(Math.abs(num) > numLimitPostfix){
                     num = num / 1000000;
                     postfix = ' M';
                 }
@@ -2249,21 +2242,14 @@ Ethplorer = {
         initScrollable: function () {
             function checkPosition(el){
                 var $el = $(el);
-                var $child = $el.children()
+                var $child = $el.children();
 
-                $el
-                    .removeClass('hide-bottom-gr')
-                    .removeClass('hide-top-gr');
+                $el.removeClass('hide-bottom-gr');
 
-                console.log($child.outerHeight(true) , $el.outerHeight(true) )
                 if ($child.outerHeight(true) < $el.outerHeight(true) || $child.outerHeight(true) - $el.outerHeight(true) + $child.position().top === 0){
                     //bottom
                     $el.addClass('hide-bottom-gr')
                 }
-                /*if ($child.position().top === 0){
-                    //top
-                    $el.addClass('hide-top-gr')
-                }*/
 
             }
             $('.scrollwrapper').one("DOMSubtreeModified", function(event){
@@ -2282,17 +2268,17 @@ Ethplorer = {
 };
 
 function getDiffClass(value) {
-    if (value === 0) {
+    if (value === 0 || 'undefined' === typeof value) {
         return 'diff-zero'
     }
     return value > 0 ? 'diff-up' : 'diff-down';
 }
 
 function getDiffString(diff){
-    if (diff === 0) {
+    if ('undefined' === typeof diff) {
         return '--';
     }
-    var str = (diff > 0 ? '+' : '');
-    str +=  Ethplorer.Utils.formatNumWidget(diff, true, 2, true, true) + '%';
+    var str = ''; //(diff > 0 ? '+' : '');
+    str +=  Ethplorer.Utils.formatNumWidget(diff, true, 2, true, true) + ' %';
     return str;
 }

Original file line number	Diff line number	Diff line change
`@@ -1391,7 +1391,7 @@ a.token-update {`
`1391`	`1391`	`content: "";`
`1392`	`1392`	`position: absolute;`
`1393`	`1393`	`display: block;`
`1394`		`- left: 0px;`
	`1394`	`+ left: 0;`
`1395`	`1395`	`width: 100%;`
`1396`	`1396`	`height: 60px;`
`1397`	`1397`	`}`
`@@ -1420,11 +1420,11 @@ a.token-update {`
`1420`	`1420`	`}`
`1421`	`1421`
`1422`	`1422`	`.diff-span {`
`1423`		`- padding-right: 10px;`
	`1423`	`+ padding-right: 20px;`
`1424`	`1424`	`color: rgba(255, 255, 255, 0.6);`
`1425`	`1425`	`}`
`1426`	`1426`	`.diff-span span {`
`1427`		`- padding-left: 4px;`
	`1427`	`+ padding-left: 6px;`
`1428`	`1428`	`}`
`1429`	`1429`	`.diff-zero{`
`1430`	`1430`	`color: rgba(255, 255, 255, 0.6);`