Skip to content

Commit 11b8f7c

Browse files
committed
Fixes after upgrading jqPlot
ISO-8601 datetime parsing is broken in all recent jqPlot versions.
1 parent a8b16a2 commit 11b8f7c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

codespeed/static/js/timeline.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,12 @@ function renderPlot(data) {
122122
},
123123
legend: {show: true, location: 'nw'},
124124
highlighter: {
125+
show: true,
125126
tooltipLocation: 'nw',
126127
yvalues: 4,
127128
formatString:'<table class="jqplot-highlighter"> <tr><td>date:</td><td>%s</td></tr> <tr><td>result:</td><td>%s</td></tr> <tr><td>std dev:</td><td>%s</td></tr> <tr><td>commit:</td><td>%s</td></tr></table>'
128129
},
129-
cursor:{zoom:true, showTooltip:false, clickReset:true}
130+
cursor:{show:true, zoom:true, showTooltip:false, clickReset:true}
130131
};
131132
if (series.length > 4) {
132133
// Move legend outside plot area to unclutter

codespeed/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,8 @@ def gettimelinedata(request):
293293
std_dev = res.std_dev
294294
results.append(
295295
[
296-
res.revision.date.isoformat(), res.value, std_dev,
296+
res.revision.date.strftime('%Y/%m/%d %H:%M:%S %z'),
297+
res.value, std_dev,
297298
res.revision.get_short_commitid(), branch
298299
]
299300
)

0 commit comments

Comments
 (0)