Browse Source

-Fix default axis formatting function. Fixes #1557.

-Keep single defaults location
-Update documentation on formatting function.
codeClimate
Ludo Stellingwerff 8 years ago
parent
commit
257d876e14
5 changed files with 14 additions and 56 deletions
  1. +4
    -5
      docs/graph2d/index.html
  2. +3
    -13
      lib/timeline/DataStep.js
  3. +3
    -3
      lib/timeline/component/DataAxis.js
  4. +2
    -1
      lib/timeline/component/Legend.js
  5. +2
    -34
      lib/timeline/component/LineGraph.js

+ 4
- 5
docs/graph2d/index.html View File

@ -470,12 +470,11 @@ var options = {
<td>Function</td> <td>Function</td>
<td></td> <td></td>
<td>Insert a custom function on how to format the label. The function will receive a numeric value and has to return a string. Default function is: <td>Insert a custom function on how to format the label. The function will receive a numeric value and has to return a string. Default function is:
<pre class="code">
<pre class="prettyprint lang-js">
function (value) { function (value) {
return value;
}
</pre>
which does nothing to it.</td>
return ''+value.toPrecision(3);
}</pre>
</td>
</tr> </tr>
<tr parent="dataAxis" class="hidden"> <tr parent="dataAxis" class="hidden">
<td class="indent2">dataAxis.left.range.min</td> <td class="indent2">dataAxis.left.range.min</td>

+ 3
- 13
lib/timeline/DataStep.js View File

@ -190,21 +190,11 @@ DataStep.prototype.previous = function() {
DataStep.prototype.getCurrent = function() { DataStep.prototype.getCurrent = function() {
// prevent round-off errors when close to zero // prevent round-off errors when close to zero
var current = (Math.abs(this.current) < this.step / 2) ? 0 : this.current; var current = (Math.abs(this.current) < this.step / 2) ? 0 : this.current;
var returnValue = current.toPrecision(5);
var returnValue = current;
if (typeof this.formattingFunction === 'function') { if (typeof this.formattingFunction === 'function') {
returnValue = this.formattingFunction(current);
return this.formattingFunction(current);
} }
if (typeof returnValue === 'number') {
return '' + returnValue;
}
else if (typeof returnValue === 'string') {
return returnValue;
}
else {
return current.toPrecision(5);
}
return '' + returnValue.toPrecision(3);
}; };
/** /**

+ 3
- 3
lib/timeline/component/DataAxis.js View File

@ -19,7 +19,7 @@ function DataAxis (body, options, svg, linegraphOptions) {
orientation: 'left', // supported: 'left', 'right' orientation: 'left', // supported: 'left', 'right'
showMinorLabels: true, showMinorLabels: true,
showMajorLabels: true, showMajorLabels: true,
icons: true,
icons: false,
majorLinesOffset: 7, majorLinesOffset: 7,
minorLinesOffset: 4, minorLinesOffset: 4,
labelOffsetX: 10, labelOffsetX: 10,
@ -30,12 +30,12 @@ function DataAxis (body, options, svg, linegraphOptions) {
alignZeros: true, alignZeros: true,
left:{ left:{
range: {min:undefined,max:undefined}, range: {min:undefined,max:undefined},
format: function (value) {return value;},
format: function (value) {return ''+value.toPrecision(3);},
title: {text:undefined,style:undefined} title: {text:undefined,style:undefined}
}, },
right:{ right:{
range: {min:undefined,max:undefined}, range: {min:undefined,max:undefined},
format: function (value) {return value;},
format: function (value) {return ''+value.toPrecision(3);},
title: {text:undefined,style:undefined} title: {text:undefined,style:undefined}
} }
}; };

+ 2
- 1
lib/timeline/component/Legend.js View File

@ -8,7 +8,7 @@ var Component = require('./Component');
function Legend(body, options, side, linegraphOptions) { function Legend(body, options, side, linegraphOptions) {
this.body = body; this.body = body;
this.defaultOptions = { this.defaultOptions = {
enabled: true,
enabled: false,
icons: true, icons: true,
iconSize: 20, iconSize: 20,
iconSpacing: 6, iconSpacing: 6,
@ -21,6 +21,7 @@ function Legend(body, options, side, linegraphOptions) {
position: 'top-left' // top/bottom - left,center,right position: 'top-left' // top/bottom - left,center,right
} }
} }
this.side = side; this.side = side;
this.options = util.extend({},this.defaultOptions); this.options = util.extend({},this.defaultOptions);
this.linegraphOptions = linegraphOptions; this.linegraphOptions = linegraphOptions;

+ 2
- 34
lib/timeline/component/LineGraph.js View File

@ -50,40 +50,8 @@ function LineGraph(body, options) {
size: 6, size: 6,
style: 'square' // square, circle style: 'square' // square, circle
}, },
dataAxis: {
showMinorLabels: true,
showMajorLabels: true,
icons: false,
width: '40px',
visible: true,
alignZeros: true,
left: {
range: {min: undefined, max: undefined},
format: function (value) {
return value;
},
title: {text: undefined, style: undefined}
},
right: {
range: {min: undefined, max: undefined},
format: function (value) {
return value;
},
title: {text: undefined, style: undefined}
}
},
legend: {
enabled: false,
icons: true,
left: {
visible: true,
position: 'top-left' // top/bottom - left,right
},
right: {
visible: true,
position: 'top-right' // top/bottom - left,right
}
},
dataAxis: {}, //Defaults are done on DataAxis level
legend: {}, //Defaults are done on Legend level
groups: { groups: {
visibility: {} visibility: {}
} }

Loading…
Cancel
Save