fixed huge cpu load

pull/5/head
cubedro 10 years ago
parent 403304947a
commit 89ba119123
  1. 2
      dist/index.html
  2. 2
      dist/js/netstats.min.js
  3. 2
      dist/js/netstats.min.js.map
  4. 8
      public/js/controllers.js
  5. 84
      public/js/directives.js
  6. 6
      views/index.jade

2
dist/index.html vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -63,10 +63,10 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
}
}
// var timeout = setInterval(function ()
// {
// $scope.$apply();
// }, 200);
var timeout = setInterval(function ()
{
$scope.$apply();
}, 200);
$scope.getNumber = function (num) {
return new Array(num);

@ -7,48 +7,48 @@ angular.module('netStatsApp.directives', [])
elm.text(version);
};
}])
.directive('timeAgo', ['$interval', function($interval) {
function link (scope, element, attrs)
{
var timestamp,
timeoutId;
function updateTime() {
element.text(timeAgo())
}
function timeAgo()
{
if(timestamp === 0)
return '∞';
var time = (new Date()).getTime();
var diff = Math.floor((time - timestamp)/1000);
if(diff < 60)
return Math.round(diff) + ' s ago';
return moment.duration(Math.round(diff), 's').humanize() + ' ago';
};
scope.$watch(attrs.timeAgo, function(value) {
timestamp = value;
updateTime();
});
element.on('$destroy', function() {
$interval.cancel(timeoutId);
});
timeoutId = $interval(function () {
updateTime();
}, 200);
};
return {
link: link
};
}])
// .directive('timeAgo', ['$interval', function($interval) {
// function link (scope, element, attrs)
// {
// var timestamp,
// timeoutId;
// function updateTime() {
// element.text(timeAgo())
// }
// function timeAgo()
// {
// if(timestamp === 0)
// return '∞';
// var time = (new Date()).getTime();
// var diff = Math.floor((time - timestamp)/1000);
// if(diff < 60)
// return Math.round(diff) + ' s ago';
// return moment.duration(Math.round(diff), 's').humanize() + ' ago';
// };
// scope.$watch(attrs.timeAgo, function(value) {
// timestamp = value;
// updateTime();
// });
// element.on('$destroy', function() {
// $interval.cancel(timeoutId);
// });
// timeoutId = $interval(function () {
// updateTime();
// }, 200);
// };
// return {
// link: link
// };
// }])
.directive('sparkchart', function () {
return {

@ -26,8 +26,8 @@ block content
i.icon-time
div.big-details-holder
span.small-title last block
//- span.big-details {{ lastBlock | blockTimeFilter }}
span.big-details(time-ago="lastBlock")
span.big-details {{ lastBlock | blockTimeFilter }}
//- span.big-details(time-ago="lastBlock")
div.clearfix
div.col-xs-2.stat-holder
div.big-info.avgblocktime(class="{{ avgBlockTime | avgTimeClass }}")
@ -205,7 +205,7 @@ block content
span.small {{node.stats.block.totalDifficulty | number}}
td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
td(style="padding-left: 14px;") {{node.stats.block.uncles.length || 0}}
td(class="{{ node.stats.block.received | timeClass : node.stats.active }}", time-ago="node.stats.block.received")
td(class="{{ node.stats.block.received | timeClass : node.stats.active }}") {{node.stats.block.received | blockTimeFilter }}
td(class="{{ node.stats | propagationTimeClass : bestBlock }}")
div.propagationBox
span {{node.stats.block.propagation | blockPropagationFilter}}

Loading…
Cancel
Save