Skip to content

Commit

Permalink
Make spacing between operators consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonbrunel
simonbrunel committed Jul 15, 2017
1 parent a8151b5 commit 35df6ef
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions src/scales/scale.time.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ module.exports = function(Chart) {
table.push({time: min, decimal: 0});
}

for (i=0, ilen=ticks.length; i<ilen; ++i) {
next = ticks[i+1] || 0;
prev = ticks[i-1] || 0;
for (i = 0, ilen=ticks.length; i<ilen; ++i) {
next = ticks[i + 1] || 0;
prev = ticks[i - 1] || 0;
curr = ticks[i];

// only add points that breaks the scale linearity
if (Math.round((next+prev)/2) !== curr) {
decimal = linear? (curr - min) / (max - min) : ilen > 1? i/(ilen-1) : 0;
if (Math.round((next + prev) / 2) !== curr) {
decimal = linear ? (curr - min) / (max - min) : ilen > 1 ? i / (ilen - 1) : 0;
table.push({time: curr, decimal: decimal});
}
}

if (ticks[ilen-1] !== max) {
if (ticks[ilen - 1] !== max) {
table.push({time: max, decimal: 1});
}

Expand All @@ -81,12 +81,12 @@ module.exports = function(Chart) {
// @see adapted from http://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
function lookup(table, key, value) {
var lo = 0;
var hi = table.length -1;
var hi = table.length - 1;
var mid, i0, i1;

while (lo >= 0 && lo <= hi) {
mid = ((lo + hi) >> 1);
i0 = table[mid-1] || null;
i0 = table[mid - 1] || null;
i1 = table[mid];

if (!i0) {
Expand All @@ -95,7 +95,7 @@ module.exports = function(Chart) {
} else if (i1[key] < value) {
lo = mid + 1;
} else if (i0[key] > value) {
hi = mid -1;
hi = mid - 1;
} else {
return {lo: i0, hi: i1};
}
Expand All @@ -112,7 +112,7 @@ module.exports = function(Chart) {

var round = scale.options.time.round;
var value = scale.getRightValue(input);
var time = value.isValid? value : timeHelpers.parseTime(scale, value);
var time = value.isValid ? value : timeHelpers.parseTime(scale, value);
if (!time || !time.isValid()) {
return null;
}
Expand Down Expand Up @@ -151,23 +151,23 @@ module.exports = function(Chart) {
var i, j, ilen, jlen, data, timestamp;

// Convert labels to timestamps
for (i=0, ilen=chart.data.labels.length; i<ilen; ++i) {
for (i = 0, ilen = chart.data.labels.length; i < ilen; ++i) {
timestamp = parse(chart.data.labels[i], me);
min = Math.min(min, timestamp);
max = Math.max(max, timestamp);
labels.push(timestamp);
}

// Convert data to timestamps
for (i=0, ilen=datasets.length; i<ilen; ++i) {
for (i = 0, ilen = datasets.length; i < ilen; ++i) {
if (chart.isDatasetVisible(i)) {
data = datasets[i].data;

// Let's consider that all data have the same format.
if (helpers.isObject(data[0])) {
timestamps[i] = [];

for (j=0, jlen=data.length; j<jlen; ++j) {
for (j = 0, jlen = data.length; j < jlen; ++j) {
timestamp = parse(data[j], me);
min = Math.min(min, timestamp);
max = Math.max(max, timestamp);
Expand All @@ -186,8 +186,8 @@ module.exports = function(Chart) {
max = parse(options.time.max, me) || max;

// In case there is no valid min/max, let's use today limits
min = min === MAX_INTEGER? +moment().startOf('day') : min;
max = max === MIN_INTEGER? +moment().endOf('day') + 1 : max;
min = min === MAX_INTEGER ? +moment().startOf('day') : min;
max = max === MIN_INTEGER ? +moment().endOf('day') + 1 : max;

me._model = {
datasets: timestamps,
Expand Down Expand Up @@ -219,7 +219,7 @@ module.exports = function(Chart) {
if (min !== ticks[0]) {
ticks.unshift(min);
}
if (max !== ticks[ticks.length-1]) {
if (max !== ticks[ticks.length - 1]) {
ticks.push(max);
}
} else {
Expand All @@ -243,7 +243,7 @@ module.exports = function(Chart) {

me.ticks = ticks;
me.min = min = ticks[0];
me.max = max = ticks[ticks.length-1];
me.max = max = ticks[ticks.length - 1];
me.unit = unit;
me.majorUnit = majorUnit;
me.displayFormat = formats[unit];
Expand Down Expand Up @@ -300,7 +300,7 @@ module.exports = function(Chart) {
var ticks = this.ticks;
var i, ilen;

for (i=0, ilen=ticks.length; i<ilen; ++i) {
for (i = 0, ilen = ticks.length; i < ilen; ++i) {
ticks[i] = this.tickFormatFunction(moment(ticks[i]));
}
},
Expand All @@ -316,14 +316,14 @@ module.exports = function(Chart) {

// If value is out of bounds, use ticks [0, 1] or [n-1, n] for interpolation,
// note that the lookup table always contains at least 2 items (min and max)
var prev = !range.lo? table[0] : !range.hi? table[table.length-2] : range.lo;
var next = !range.lo? table[1] : !range.hi? table[table.length-1] : range.hi;
var prev = !range.lo ? table[0] : !range.hi ? table[table.length - 2] : range.lo;
var next = !range.lo ? table[1] : !range.hi ? table[table.length - 1] : range.hi;

var span = next.time - prev.time;
var ratio = span? (time - prev.time) / span : 0;
var ratio = span ? (time - prev.time) / span : 0;
var offset = (next.decimal - prev.decimal) * ratio;
var size = model.horizontal? me.width : me.height;
var start = model.horizontal? me.left : me.top;
var size = model.horizontal ? me.width : me.height;
var start = model.horizontal ? me.left : me.top;

return start + size * (prev.decimal + offset);
},
Expand All @@ -346,7 +346,7 @@ module.exports = function(Chart) {
},

getPixelForTick: function(index) {
return index >= 0 && index < this.ticks.length?
return index >= 0 && index < this.ticks.length ?
this.getPixelForOffset(this.ticks[index].time) :
null;
},
Expand All @@ -355,15 +355,15 @@ module.exports = function(Chart) {
var me = this;
var model = me._model;
var table = model.table;
var size = model.horizontal? me.width : me.height;
var start = model.horizontal? me.left : me.top;
var decimal = size? (pixel - start) / size : 0;
var size = model.horizontal ? me.width : me.height;
var start = model.horizontal ? me.left : me.top;
var decimal = size ? (pixel - start) / size : 0;
var range = lookup(table, 'decimal', decimal);

// if pixel is out of bounds, use ticks [0, 1] or [n-1, n] for interpolation,
// note that the lookup table always contains at least 2 items (min and max)
var prev = !range.lo? table[0] : !range.hi? table[table.length-2] : range.lo;
var next = !range.lo? table[1] : !range.hi? table[table.length-1] : range.hi;
var prev = !range.lo ? table[0] : !range.hi ? table[table.length - 2] : range.lo;
var next = !range.lo ? table[1] : !range.hi ? table[table.length - 1] : range.hi;

var span = next.decimal - prev.decimal;
var ratio = span? (decimal - prev.decimal) / span : 0;
Expand Down

0 comments on commit 35df6ef

Please sign in to comment.