From 02c39024fddc84b4a61f706d8e40db7acc1fd8b1 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Thu, 15 Aug 2019 10:28:42 -0700 Subject: [PATCH] whitespace cleanup --- web/assets/javascripts/dashboard.js | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/web/assets/javascripts/dashboard.js b/web/assets/javascripts/dashboard.js index e7592738..b741ddbe 100644 --- a/web/assets/javascripts/dashboard.js +++ b/web/assets/javascripts/dashboard.js @@ -16,10 +16,8 @@ var gridSize=(this.orientation=="right"?1:-1)*this.graph.width;this.graph.vis.ap var nodes=vis.selectAll("path").data(series.stack.filter(function(d){return d.y!==null})).enter().append("svg:rect").attr("x",function(d){return graph.x(d.x)+barXOffset}).attr("y",function(d){return graph.y(d.y0+Math.abs(d.y))*(d.y<0?-1:1)}).attr("width",seriesBarWidth).attr("height",function(d){return graph.y.magnitude(Math.abs(d.y))}).attr("opacity",series.opacity).attr("transform",transform);Array.prototype.forEach.call(nodes[0],function(n){n.setAttribute("fill",series.color)});if(this.unstack)barXOffset+=seriesBarWidth},this)},_frequentInterval:function(data){var intervalCounts={};for(var i=0;i0){this[0].data.forEach(function(plot){item.data.push({x:plot.x,y:0})})}else if(item.data.length===0){item.data.push({x:this.timeBase-(this.timeInterval||0),y:0})}this.push(item);if(this.legend){this.legend.addLine(this.itemByName(item.name))}},addData:function(data,x){var index=this.getIndex();Rickshaw.keys(data).forEach(function(name){if(!this.itemByName(name)){this.addItem({name:name})}},this);this.forEach(function(item){item.data.push({x:x||(index*this.timeInterval||1)+this.timeBase,y:data[item.name]||0})},this)},getIndex:function(){return this[0]&&this[0].data&&this[0].data.length?this[0].data.length:0},itemByName:function(name){for(var i=0;i1;i--){this.currentSize+=1;this.currentIndex+=1;this.forEach(function(item){item.data.unshift({x:((i-1)*this.timeInterval||1)+this.timeBase,y:0,i:i})},this)}}},addData:function($super,data,x){$super(data,x);this.currentSize+=1;this.currentIndex+=1;if(this.maxDataPoints!==undefined){while(this.currentSize>this.maxDataPoints){this.dropData()}}},dropData:function(){this.forEach(function(item){item.data.splice(0,1)});this.currentSize-=1},getIndex:function(){return this.currentIndex}});return Rickshaw}); var poller; - var realtimeGraph = function(updatePath) { var timeInterval = parseInt(localStorage.timeInterval || '5000'); - var graphElement = document.getElementById("realtime"); var graph = new Rickshaw.Graph( { @@ -30,8 +28,8 @@ var realtimeGraph = function(updatePath) { interpolation: 'linear', series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#B1003E' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, { - timeInterval: timeInterval, - maxDataPoints: 100, + timeInterval: timeInterval, + maxDataPoints: 100, }) }); @@ -46,7 +44,6 @@ var realtimeGraph = function(updatePath) { var legend = document.querySelector('#realtime-legend'); var Hover = Rickshaw.Class.create(Rickshaw.Graph.HoverDetail, { render: function(args) { - legend.innerHTML = ""; var timestamp = document.createElement('div'); @@ -68,7 +65,6 @@ var realtimeGraph = function(updatePath) { line.appendChild(swatch); line.appendChild(label); - legend.appendChild(line); var dot = document.createElement('div'); @@ -77,11 +73,8 @@ var realtimeGraph = function(updatePath) { dot.style.borderColor = d.series.color; this.element.appendChild(dot); - dot.className = 'dot active'; - this.show(); - }, this ); } }); @@ -90,7 +83,6 @@ var realtimeGraph = function(updatePath) { var i = 0; poller = setInterval(function() { $.getJSON($("#history").data("update-url"), function(data) { - if (i === 0) { var processed = data.sidekiq.processed; var failed = data.sidekiq.failed; @@ -144,7 +136,6 @@ var historyGraph = function() { ] } ); var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } ); - var y_axis = new Rickshaw.Graph.Axis.Y({ graph: graph, tickFormat: Rickshaw.Fixtures.Number.formatKMBT, @@ -156,7 +147,6 @@ var historyGraph = function() { var legend = document.querySelector('#history-legend'); var Hover = Rickshaw.Class.create(Rickshaw.Graph.HoverDetail, { render: function(args) { - legend.innerHTML = ""; var timestamp = document.createElement('div'); @@ -178,7 +168,6 @@ var historyGraph = function() { line.appendChild(swatch); line.appendChild(label); - legend.appendChild(line); var dot = document.createElement('div'); @@ -187,11 +176,8 @@ var historyGraph = function() { dot.style.borderColor = d.series.color; this.element.appendChild(dot); - dot.className = 'dot active'; - this.show(); - }, this ); } }); @@ -216,7 +202,6 @@ var updateStatsSummary = function(data) { $('ul.summary li.retries span.count').html(data.retries.numberWithDelimiter()) $('ul.summary li.enqueued span.count').html(data.enqueued.numberWithDelimiter()) $('ul.summary li.dead span.count').html(data.dead.numberWithDelimiter()) - } var updateRedisStats = function(data) { @@ -277,7 +262,6 @@ $(function(){ $(document).on('mousemove', 'div.interval-slider input', function(){ setSliderLabel($(this).val()); }); - }); // Reset graphs @@ -300,13 +284,10 @@ var debounce = function(fn, timeout) window.onresize = function() { var prevWidth = window.innerWidth; - return debounce(function () { var currWidth = window.innerWidth; - if (prevWidth !== currWidth) { prevWidth = currWidth; - clearInterval(poller); resetGraphs(); renderGraphs();