Skip to content

F
flot
Commit 8e2f09a9 authored by David Schnur's avatar David Schnur
Browse files
Options

Merge pull request #1141 from nschonni/0.9-jshint-indent4 

0.9 jshint indent4
parents d76e1cb2 678ff275
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 63 deletions
.jshintrc
View file @ 8e2f09a9
......@@ -19,5 +19,6 @@
},
"browser": true,
"jquery": true
"jquery": true,
"indent": 4
}
jquery.flot.js
View file @ 8e2f09a9
......@@ -701,26 +701,26 @@ Licensed under the MIT license.
},
hooks: {}
},
surface = null, // the canvas for the plot itself
overlay = null, // canvas for interactive stuff on top of plot
eventHolder = null, // jQuery object that events should be bound to
ctx = null, octx = null,
xaxes = [], yaxes = [],
plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
plotWidth = 0, plotHeight = 0,
hooks = {
processOptions: [],
processRawData: [],
processDatapoints: [],
processOffset: [],
drawBackground: [],
drawSeries: [],
draw: [],
bindEvents: [],
drawOverlay: [],
shutdown: []
},
plot = this;
surface = null, // the canvas for the plot itself
overlay = null, // canvas for interactive stuff on top of plot
eventHolder = null, // jQuery object that events should be bound to
ctx = null, octx = null,
xaxes = [], yaxes = [],
plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
plotWidth = 0, plotHeight = 0,
hooks = {
processOptions: [],
processRawData: [],
processDatapoints: [],
processOffset: [],
drawBackground: [],
drawSeries: [],
draw: [],
bindEvents: [],
drawOverlay: [],
shutdown: []
},
plot = this;
// public functions
plot.setData = setData;
......@@ -1387,17 +1387,17 @@ Licensed under the MIT license.
var delta;
switch (s.bars.align) {
case "left":
delta = 0;
break;
case "right":
delta = -s.bars.barWidth;
break;
case "center":
delta = -s.bars.barWidth / 2;
break;
default:
throw new Error("Invalid bar alignment: " + s.bars.align);
case "left":
delta = 0;
break;
case "right":
delta = -s.bars.barWidth;
break;
case "center":
delta = -s.bars.barWidth / 2;
break;
default:
throw new Error("Invalid bar alignment: " + s.bars.align);
}
if (s.bars.horizontal) {
......@@ -2869,17 +2869,17 @@ Licensed under the MIT license.
var barLeft;
switch (series.bars.align) {
case "left":
barLeft = 0;
break;
case "right":
barLeft = -series.bars.barWidth;
break;
case "center":
barLeft = -series.bars.barWidth / 2;
break;
default:
throw new Error("Invalid bar alignment: " + series.bars.align);
case "left":
barLeft = 0;
break;
case "right":
barLeft = -series.bars.barWidth;
break;
case "center":
barLeft = -series.bars.barWidth / 2;
break;
default:
throw new Error("Invalid bar alignment: " + series.bars.align);
}
var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
......@@ -3103,7 +3103,7 @@ Licensed under the MIT license.
my >= y + barLeft && my <= y + barRight) :
(mx >= x + barLeft && mx <= x + barRight &&
my >= Math.min(b, y) && my <= Math.max(b, y))) {
item = [i, j / ps];
item = [i, j / ps];
}
}
}
......
jquery.flot.time.js
View file @ 8e2f09a9
......@@ -69,25 +69,56 @@ API.txt for details.
if (escape) {
switch (c) {
case "a": c = "" + dayNames[d.getDay()]; break;
case "b": c = "" + monthNames[d.getMonth()]; break;
case "d": c = leftPad(d.getDate()); break;
case "e": c = leftPad(d.getDate(), " "); break;
case "h": // For back-compat with 0.7; remove in 1.0
case "H": c = leftPad(hours); break;
case "I": c = leftPad(hours12); break;
case "l": c = leftPad(hours12, " "); break;
case "m": c = leftPad(d.getMonth() + 1); break;
case "M": c = leftPad(d.getMinutes()); break;
// quarters not in Open Group's strftime specification
case "q":
c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
case "S": c = leftPad(d.getSeconds()); break;
case "y": c = leftPad(d.getFullYear() % 100); break;
case "Y": c = "" + d.getFullYear(); break;
case "p": c = (isAM) ? ("" + "am") : ("" + "pm"); break;
case "P": c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
case "w": c = "" + d.getDay(); break;
case "a":
c = "" + dayNames[d.getDay()];
break;
case "b":
c = "" + monthNames[d.getMonth()];
break;
case "d":
c = leftPad(d.getDate());
break;
case "e":
c = leftPad(d.getDate(), " ");
break;
case "h": // For back-compat with 0.7; remove in 1.0
case "H":
c = leftPad(hours);
break;
case "I":
c = leftPad(hours12);
break;
case "l":
c = leftPad(hours12, " ");
break;
case "m":
c = leftPad(d.getMonth() + 1);
break;
case "M":
c = leftPad(d.getMinutes());
break;
// quarters not in Open Group's strftime specification
case "q":
c = "" + (Math.floor(d.getMonth() / 3) + 1);
break;
case "S":
c = leftPad(d.getSeconds());
break;
case "y":
c = leftPad(d.getFullYear() % 100);
break;
case "Y":
c = "" + d.getFullYear();
break;
case "p":
c = (isAM) ? ("" + "am") : ("" + "pm");
break;
case "P":
c = (isAM) ? ("" + "AM") : ("" + "PM");
break;
case "w":
c = "" + d.getDay();
break;
}
r.push(c);
escape = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment