diff --git a/app/controllers/currency.js b/app/controllers/currency.js index e635a7b..9642e97 100644 --- a/app/controllers/currency.js +++ b/app/controllers/currency.js @@ -40,11 +40,6 @@ exports.index = function(req, res) { // Init var currentTime = +new Date(); - console.log('-----------------------------------'); - console.log(timestamp); - console.log(currentTime); - console.log(currentTime >= (timestamp + delay)); - console.log('-----------------------------------'); if (bitstampRate === 0 || currentTime >= (timestamp + delay)) { timestamp = currentTime; diff --git a/public/css/common.css b/public/css/common.css index f84e5a6..81eda36 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -277,8 +277,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { height: 51px; overflow: hidden; } - -#footer .currency a:active { +#footer .currency a.active { color: #fff; text-decoration: underline; } diff --git a/public/js/controllers/footer.js b/public/js/controllers/footer.js index 8ad61ab..64c0f2d 100644 --- a/public/js/controllers/footer.js +++ b/public/js/controllers/footer.js @@ -39,7 +39,7 @@ angular.module('insight.system').controller('FooterController', $scope.setCurrency = function(currency) { if (currency === 'USD') { Currency.get({}, function(res) { - $rootScope.currency.factor = res.data.bitstamp; + $rootScope.currency.factor = $rootScope.currency.bitstamp = res.data.bitstamp; }); } else if (currency === 'mBTC') { $rootScope.currency.factor = 1000; diff --git a/public/js/controllers/header.js b/public/js/controllers/header.js index 25f2d0b..cf63deb 100755 --- a/public/js/controllers/header.js +++ b/public/js/controllers/header.js @@ -4,7 +4,9 @@ angular.module('insight.system').controller('HeaderController', function($scope, $rootScope, getSocket, Global, Block, Currency) { $scope.global = Global; - Currency.get(); + Currency.get({}, function(res) { + $rootScope.currency.bitstamp = res.data.bitstamp; + }); $scope.menu = [ { diff --git a/public/views/includes/footer.html b/public/views/includes/footer.html index 5395a66..080adb5 100644 --- a/public/views/includes/footer.html +++ b/public/views/includes/footer.html @@ -1,9 +1,11 @@