small improvments

hivewallet · Oct 21, 2013 · bd5adef · bd5adef
1 parent 61abeca
commit bd5adef
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/css/hive_support.css b/css/hive_support.css
@@ -3,13 +3,14 @@ body {
     color: #fadf68; /* gold */
     margin: 0px;
     font-family:"Aleo-Regular", Aleo, serif;
+    letter-spacing: 1px;
 }
 
 #background_hive{
     overflow: hidden;
     min-width:2000px;
     min-height:2100px;
-    background: url('./images/background.png') center center no-repeat;
+    background: url('images/background.png') center center no-repeat;
     font-family:"Aleo-Regular", Aleo, serif;
 }
 
@@ -59,7 +60,7 @@ div#border_radius{
 }
 
 div.back_img{
-    background: url('./images/hive_small.png') no-repeat;
+    background: url('images/hive_small.png') no-repeat;
     background-position:center;
     background-size:142px 127px;
     width:  242px;
@@ -129,14 +130,14 @@ h5#fixed_slogan_1{
 
 @-webkit-keyframes hive_icon {
   0% {
-        background: url('./images/hive_small.png') no-repeat;
+        background: url('images/hive_small.png') no-repeat;
         background-position:center;
         background-size:142px 127px;
         width:  242px;
         height: 218px;
   }
   100% {
-        background: url('./images/hive_small.png') no-repeat;
+        background: url('images/hive_small.png') no-repeat;
         background-position:center;
         background-size:242px 218px;
         width:  242px;

diff --git a/js/hive_mock.js b/js/hive_mock.js
@@ -51,23 +51,4 @@ var bitcoin = bitcoin || {
             address:   'poqjer23rfc234laq'
         });
     }
-};
-
-bitcoin['btc_string_to_satoshi'] = function(x){
-        if( typeof x === 'string'){
-            var tab = [];
-            if (x.indexOf('.') > 0 ){
-                tab = x.split('.');
-            }else if (x.indexOf(',') > 0){
-                tab = x.split(',');
-            }else{
-                tab = [x,'0'];
-            }
-            var count = tab[1].length;
-            tab = [parseInt(tab[0]), parseInt(tab[1])];
-            amount = tab[0]*bitcoin.BTC_IN_SATOSHI + tab[1]*(bitcoin.BTC_IN_SATOSHI/(Math.pow(10,count)));
-            return amount;
-        } else {
-            return x*bitcoin.BTC_IN_SATOSHI;
-        }
-    }
+};
diff --git a/js/hive_support.js b/js/hive_support.js
@@ -1,41 +1,62 @@
 /**
  * Created by marcinra on 10/18/13.
  */
-var address, headText2, fixed_slogan_1, fixed_slogan_2;
+var address, headText2, fixed_slogan_1, fixed_slogan_2, separator;
 var init = function(){
     address = '142m1MpXHhymF4aASiWwYohe1Y55v5BQwc';
     headText2= document.getElementsByClassName('headText2')[0];
     headText2.hidden = true;
     fixed_slogan_1 = document.getElementById('fixed_slogan_1');
     fixed_slogan_2 = document.getElementById('fixed_slogan_2');
     fixed_slogan_2.hidden = true;
+    bitcoin.getSystemInfo(function(info) {
+        separator = info.decimalSeparator;
+        var amount_val = document.getElementById('in_cash');
+        amount_val.value = '1'+ separator + '00';
+    });
 }
 
+var btc_string_to_satoshi = function(amount){
+    var tab = [];
+    if (amount.indexOf(separator) > 0 ){
+        tab = amount.split(separator);
+    }else{
+        tab = [amount,'0'];
+    }
+    var count = tab[1].length;
+    tab = [parseInt(tab[0]), parseInt(tab[1])];
+    return tab[0]*bitcoin.BTC_IN_SATOSHI + tab[1]*(bitcoin.BTC_IN_SATOSHI/(Math.pow(10,count)));
+}
 
 function isNumber(n) {
       return !isNaN(parseFloat(n)) && isFinite(n);
     }
 
 var validateValue = function(temp){
+    if (temp.indexOf(separator)>0){
+        temp.replace(separator,'.');
+    }
     if(!isNumber(temp.value)){
-        temp.value='0.00';
+        temp.value='1'+separator+'00';
         alert("can't read value it's not a number");
     }
 }
 
 var runAnimations = function(success, transaction_id){
-    var element = document.getElementsByClassName('back_img')[0];
+    if (success){
+        var element = document.getElementsByClassName('back_img')[0];
         element.className +=(' animation');
         headText2.hidden = false;
         fixed_slogan_1.hidden = true;
         fixed_slogan_2.hidden = false;
-    var head_elements = document.getElementsByClassName('headText1');
+        var head_elements = document.getElementsByClassName('headText1');
         for(o in head_elements) head_elements[o].hidden = true;
+    }
 }
 
 var send = function(){
         var amount_val = document.getElementById('in_cash');
-        var amount = bitcoin.btc_string_to_satoshi(amount_val.value);
+        var amount = btc_string_to_satoshi(amount_val.value);
         if(amount!=0){
             bitcoin.sendMoney(address, amount, runAnimations);
         }