summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wall <richard@largo>2011-08-12 23:03:10 +0100
committerRichard Wall <richard@largo>2011-08-12 23:03:10 +0100
commit9fed331ed6f8f879dd3dca53b84932630a97b5f3 (patch)
treec30d29f2571054a45fad1b8788388bb117fde85d
parent82950bb8df438601419880c748cd269f13cd5754 (diff)
add some missing parseint radix args
-rw-r--r--docs/examples/assets/js/jsrrdgraph.js78
1 files changed, 49 insertions, 29 deletions
diff --git a/docs/examples/assets/js/jsrrdgraph.js b/docs/examples/assets/js/jsrrdgraph.js
index 44ecde4..279be04 100644
--- a/docs/examples/assets/js/jsrrdgraph.js
+++ b/docs/examples/assets/js/jsrrdgraph.js
@@ -193,7 +193,7 @@ RRDTime.prototype = {
this.tokidx++;
if (!isNaN(this.token)) {
this.tokid = RRDTime.NUMBER;
- this.token = parseInt(this.token);
+ this.token = parseInt(this.token, 10);
} else if (this.token === ':') {
this.tokid = RRDTime.COLON;
} else if (this.token === '.') {
@@ -412,9 +412,9 @@ RRDTime.prototype = {
}
if (mon > 19700101 && mon < 24000101) { /*works between 1900 and 2400 */
var str = this.token + '';
- year = parseInt(str.substr(0,4));
- mon = parseInt(str.substr(4,2));
- mday = parseInt(str.substr(6,2));
+ year = parseInt(str.substr(0,4), 10);
+ mon = parseInt(str.substr(4,2), 10);
+ mday = parseInt(str.substr(6,2), 10);
this.gettok();
} else {
this.gettok();
@@ -1186,10 +1186,10 @@ RRDGraphDesc.prototype = {
vf: null, /* instruction for VDEF function */
rpnp: null, /* instructions for CDEF function */
- /* SHIFT implementation */
+ /* SHIFT implementation */
shidx: 0, /* gdes reference for offset (-1 --> constant) */
- shval: 0, /* offset if shidx is -1 */
- shift: 0, /* current shift applied */
+ shval: 0, /* offset if shidx is -1 */
+ shift: 0, /* current shift applied */
/* description of data fetched for the graph element */
start: 0, /* timestaps for first and last data element */
@@ -1207,7 +1207,7 @@ RRDGraphDesc.prototype = {
/* dashed line stuff */
dash: false, /* boolean, draw dashed line? */
- p_dashes: null, /* pointer do dash array which keeps the lengths of dashes */
+ p_dashes: null, /* pointer do dash array which keeps the lengths of dashes */
ndash: false, /* number of dash segments */
offset: 0, /* dash offset along the line */
@@ -1218,9 +1218,9 @@ RRDGraphDesc.prototype = {
this.step = graph.step;
this.step_orig = graph.step;
this.start = graph.start;
- this.start_orig = graph.start;
+ this.start_orig = graph.start;
this.end = graph.end;
- this.end_orig = graph.end;
+ this.end_orig = graph.end;
this.cf = RRDGraphDesc.CF.AVERAGE;
this.cf_reduce = RRDGraphDesc.CF.AVERAGE;
this.data = [];
@@ -1464,7 +1464,7 @@ RRDGraph.prototype = {
break;
case 'base':
case 'b':
- this.base = parseInt(value);
+ this.base = parseInt(value, 10);
if (this.base !== 1000 && this.base !== 1024)
throw 'the only sensible value for base apart from 1000 is 1024';
break;
@@ -1509,7 +1509,7 @@ RRDGraph.prototype = {
break;
case 'height':
case 'h':
- this.ysize = parseInt(value);
+ this.ysize = parseInt(value, 10);
break;
case 'no-minor':
case 'I':
@@ -1528,7 +1528,7 @@ RRDGraph.prototype = {
break;
case 'units-length':
case 'L':
- this.unitslength = parseInt(value);
+ this.unitslength = parseInt(value, 10);
this.forceleftspace = true;
break;
case 'lower-limit':
@@ -1578,7 +1578,7 @@ RRDGraph.prototype = {
this.rigid = true;
break;
case 'step':
- this.step = parseInt(value);
+ this.step = parseInt(value, 10);
break;
case 'start':
case 's':
@@ -1607,13 +1607,13 @@ RRDGraph.prototype = {
break;
case 'width':
case 'w':
- this.xsize = parseInt(value);
+ this.xsize = parseInt(value, 10);
if (this.xsize < 10)
throw "width below 10 pixels";
break;
case 'units-exponent':
case 'X':
- this.unitsexponent = parseInt(value);
+ this.unitsexponent = parseInt(value, 10);
break;
case 'x-grid':
case 'x':
@@ -1626,16 +1626,16 @@ RRDGraph.prototype = {
this.xlab_user.gridtm = this.tmt_conv(args[0]);
if (this.xlab_user.gridtm < 0)
throw "unknown keyword "+args[0];
- this.xlab_user.gridst = parseInt(args[1]);
+ this.xlab_user.gridst = parseInt(args[1], 10);
this.xlab_user.mgridtm = this.tmt_conv(args[2]);
if (this.xlab_user.mgridtm < 2)
throw "unknown keyword "+args[2];
- this.xlab_user.mgridst = parseInt(args[3]);
+ this.xlab_user.mgridst = parseInt(args[3], 10);
this.xlab_user.labtm = this.tmt_conv(args[4]);
if (this.xlab_user.labtm < 0)
throw "unknown keyword "+args[4];
- this.xlab_user.labst = parseInt(args[5]);
- this.xlab_user.precis = parseInt(args[6]);
+ this.xlab_user.labst = parseInt(args[5], 10);
+ this.xlab_user.precis = parseInt(args[6], 10);
this.xlab_user.minsec = 1;
this.xlab_form = args[7]; // FIXME : ? join(:)
this.xlab_user.stst = this.xlab_form;
@@ -1656,7 +1656,7 @@ RRDGraph.prototype = {
this.ygridstep = parseFloat(value.substr(0,index));
if (this.ygridstep <= 0)
throw "grid step must be > 0";
- this.ylabfact = parseInt(value.substr(index+1));
+ this.ylabfact = parseInt(value.substr(index+1), 10);
if (this.ylabfact < 1)
throw "label factor must be > 0";
}
@@ -1716,7 +1716,7 @@ RRDGraph.prototype = {
}
break;
case 'border':
- this.draw_3d_border = parseInt(value);
+ this.draw_3d_border = parseInt(value, 10);
break;
case 'grid-dash':
var index = value.indexOf(':');
@@ -1737,17 +1737,37 @@ RRDGraph.prototype = {
{
var bits;
if ((bits = /^#?([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])$/.exec(str))) {
- return [parseInt(bits[1]+bits[1], 16), parseInt(bits[2]+bits[2], 16), parseInt(bits[3]+bits[3], 16), 1.0];
+ return [
+ parseInt(bits[1] + bits[1], 16),
+ parseInt(bits[2] + bits[2], 16),
+ parseInt(bits[3] + bits[3], 16),
+ 1.0];
} else if ((bits = /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/.exec(str))) {
- return [parseInt(bits[1], 16), parseInt(bits[2], 16), parseInt(bits[3], 16), 1.0];
+ return [
+ parseInt(bits[1], 16),
+ parseInt(bits[2], 16),
+ parseInt(bits[3], 16),
+ 1.0];
} else if ((bits = /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/.exec(str))) {
- return [parseInt(bits[1], 16), parseInt(bits[2], 16), parseInt(bits[3], 16), parseInt(bits[4], 16)/255];
+ return [
+ parseInt(bits[1], 16),
+ parseInt(bits[2], 16),
+ parseInt(bits[3], 16),
+ parseInt(bits[4], 16)/255];
} else if ((bits = /^rgb\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\)$/.exec(str))) {
- return [parseInt(bits[1]), parseInt(bits[2]), parseInt(bits[3]), 1.0];
+ return [
+ parseInt(bits[1], 10),
+ parseInt(bits[2], 10),
+ parseInt(bits[3], 10),
+ 1.0];
} else if ((bits = /^rgba\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*([0-9.]+)\)$/.exec(str))) {
- return [parseInt(bits[1]), parseInt(bits[2]), parseInt(bits[3]), parseFloat(bits[4])];
+ return [
+ parseInt(bits[1], 10),
+ parseInt(bits[2], 10),
+ parseInt(bits[3], 10),
+ parseFloat(bits[4]), 10];
} else {
- throw "Unknow color format '"+str+"'";
+ throw "Unknown color format '" + str + "'";
}
},
color2rgba: function (color)
@@ -4303,7 +4323,7 @@ RRDGraph.prototype = {
if (this.gdes[gdp.shidx].gf !== RRDGraphDesc.GF.VDEF)
throw "Encountered unknown type variable '"+this.gdes[gdp.shidx].vname+"'";
} else {
- gdp.shval = parseInt(offset); // FIXME check
+ gdp.shval = parseInt(offset, 10); // FIXME check
gdp.shidx = -1;
}
gdp.legend = '';