From 678ff275ba577979d132712564170b76e573eba2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 23 Sep 2013 11:38:33 -0400 Subject: [PATCH] Enforce indenting with JSHint - Doesn't differentiate between tabs and spaces - Switch/Case indenting may seem odd to some --- .jshintrc | 3 +- jquery.flot.js | 86 ++++++++++++++++++++++----------------------- jquery.flot.time.js | 69 ++++++++++++++++++++++++++---------- 3 files changed, 95 insertions(+), 63 deletions(-) diff --git a/.jshintrc b/.jshintrc index c888e06..c5e0483 100644 --- a/.jshintrc +++ b/.jshintrc @@ -19,5 +19,6 @@ }, "browser": true, - "jquery": true + "jquery": true, + "indent": 4 } diff --git a/jquery.flot.js b/jquery.flot.js index e5c4102..8d27c30 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -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]; } } } diff --git a/jquery.flot.time.js b/jquery.flot.time.js index 82ca664..2801b68 100644 --- a/jquery.flot.time.js +++ b/jquery.flot.time.js @@ -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;