diff -Nru flot-0.8.2+dfsg/component.json flot-0.8.3+dfsg/component.json --- flot-0.8.2+dfsg/component.json 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/component.json 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.2", + "version": "0.8.3", "main": "jquery.flot.js", "dependencies": { "jquery": ">= 1.2.6" diff -Nru flot-0.8.2+dfsg/debian/changelog flot-0.8.3+dfsg/debian/changelog --- flot-0.8.2+dfsg/debian/changelog 2014-02-09 20:22:22.000000000 +0000 +++ flot-0.8.3+dfsg/debian/changelog 2014-11-24 12:09:29.000000000 +0000 @@ -1,3 +1,13 @@ +flot (0.8.3+dfsg-1) unstable; urgency=low + + * New upstream release + * Updated Standards-Version to 3.9.6 (no changes) + * Use canonical Vcs-fields + * Fixed dh_auto_clean + * Installing flot.jquery.json + + -- Marcelo Jorge Vieira Mon, 24 Nov 2014 06:27:07 -0200 + flot (0.8.2+dfsg-1) unstable; urgency=low * New Upstream Release diff -Nru flot-0.8.2+dfsg/debian/control flot-0.8.3+dfsg/debian/control --- flot-0.8.2+dfsg/debian/control 2014-02-09 20:22:13.000000000 +0000 +++ flot-0.8.3+dfsg/debian/control 2014-11-24 12:09:20.000000000 +0000 @@ -2,13 +2,13 @@ Section: web Priority: optional Maintainer: Debian Javascript Maintainers -Uploaders: Marcelo Jorge Vieira (metal) +Uploaders: Marcelo Jorge Vieira Build-Depends: debhelper (>= 7.0.50~), node-uglify, libjs-jquery-mousewheel, libjs-jquery-event-drag, libjs-jquery-resize -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://code.google.com/p/flot/ -Vcs-Browser: http://git.debian.org/?p=pkg-javascript/flot.git -Vcs-Git: git://git.debian.org/git/pkg-javascript/flot.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-javascript/flot.git +Vcs-Git: git://anonscm.debian.org/pkg-javascript/flot.git Package: libjs-jquery-flot Architecture: all diff -Nru flot-0.8.2+dfsg/debian/jquery.flot.js flot-0.8.3+dfsg/debian/jquery.flot.js --- flot-0.8.2+dfsg/debian/jquery.flot.js 2014-02-09 19:43:29.000000000 +0000 +++ flot-0.8.3+dfsg/debian/jquery.flot.js 2014-11-24 12:09:20.000000000 +0000 @@ -1,6 +1,6 @@ -/* Javascript plotting library for jQuery, version 0.8.2. +/* Javascript plotting library for jQuery, version 0.8.3. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. */ @@ -12,6 +12,22 @@ var hasOwnProperty = Object.prototype.hasOwnProperty; + // A shim to provide 'detach' to jQuery versions prior to 1.4. Using a DOM + // operation produces the same effect as detach, i.e. removing the element + // without touching its jQuery data. + + // Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+. + + if (!$.fn.detach) { + $.fn.detach = function() { + return this.each(function() { + if (this.parentNode) { + this.parentNode.removeChild( this ); + } + }); + }; + } + /////////////////////////////////////////////////////////////////////////// // The Canvas object is a wrapper around an HTML5 tag. // @@ -788,10 +804,24 @@ if (options.x2axis) { options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis); options.xaxes[1].position = "top"; + // Override the inherit to allow the axis to auto-scale + if (options.x2axis.min == null) { + options.xaxes[1].min = null; + } + if (options.x2axis.max == null) { + options.xaxes[1].max = null; + } } if (options.y2axis) { options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis); options.yaxes[1].position = "right"; + // Override the inherit to allow the axis to auto-scale + if (options.y2axis.min == null) { + options.yaxes[1].min = null; + } + if (options.y2axis.max == null) { + options.yaxes[1].max = null; + } } if (options.grid.coloredAreas) options.grid.markings = options.grid.coloredAreas; @@ -1390,7 +1420,7 @@ // Determine the axis's position in its direction and on its side $.each(isXAxis ? xaxes : yaxes, function(i, a) { - if (a && a.reserveSpace) { + if (a && (a.show || a.reserveSpace)) { if (a === axis) { found = true; } else if (a.options.position === pos) { @@ -1494,17 +1524,12 @@ // jump as much around with replots $.each(allAxes(), function (_, axis) { if (axis.reserveSpace && axis.ticks && axis.ticks.length) { - var lastTick = axis.ticks[axis.ticks.length - 1]; if (axis.direction === "x") { margins.left = Math.max(margins.left, axis.labelWidth / 2); - if (lastTick.v <= axis.max) { - margins.right = Math.max(margins.right, axis.labelWidth / 2); - } + margins.right = Math.max(margins.right, axis.labelWidth / 2); } else { margins.bottom = Math.max(margins.bottom, axis.labelHeight / 2); - if (lastTick.v <= axis.max) { - margins.top = Math.max(margins.top, axis.labelHeight / 2); - } + margins.top = Math.max(margins.top, axis.labelHeight / 2); } } }); @@ -1538,20 +1563,18 @@ } } - // init axes $.each(axes, function (_, axis) { - axis.show = axis.options.show; - if (axis.show == null) - axis.show = axis.used; // by default an axis is visible if it's got data - - axis.reserveSpace = axis.show || axis.options.reserveSpace; - + var axisOpts = axis.options; + axis.show = axisOpts.show == null ? axis.used : axisOpts.show; + axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace; setRange(axis); }); if (showGrid) { - var allocatedAxes = $.grep(axes, function (axis) { return axis.reserveSpace; }); + var allocatedAxes = $.grep(axes, function (axis) { + return axis.show || axis.reserveSpace; + }); $.each(allocatedAxes, function (_, axis) { // make the ticks @@ -1680,8 +1703,8 @@ axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec); axis.tickSize = opts.tickSize || size; - // Time mode was moved to a plug-in in 0.8, but since so many people use this - // we'll add an especially friendly make sure they remembered to include it. + // Time mode was moved to a plug-in in 0.8, and since so many people use it + // we'll add an especially friendly reminder to make sure they included it. if (opts.mode == "time" && !axis.tickGenerator) { throw new Error("Time mode requires the flot.time plugin."); @@ -1937,26 +1960,34 @@ yrange.from = Math.max(yrange.from, yrange.axis.min); yrange.to = Math.min(yrange.to, yrange.axis.max); - if (xrange.from == xrange.to && yrange.from == yrange.to) + var xequal = xrange.from === xrange.to, + yequal = yrange.from === yrange.to; + + if (xequal && yequal) { continue; + } // then draw - xrange.from = xrange.axis.p2c(xrange.from); - xrange.to = xrange.axis.p2c(xrange.to); - yrange.from = yrange.axis.p2c(yrange.from); - yrange.to = yrange.axis.p2c(yrange.to); - - if (xrange.from == xrange.to || yrange.from == yrange.to) { - // draw line + xrange.from = Math.floor(xrange.axis.p2c(xrange.from)); + xrange.to = Math.floor(xrange.axis.p2c(xrange.to)); + yrange.from = Math.floor(yrange.axis.p2c(yrange.from)); + yrange.to = Math.floor(yrange.axis.p2c(yrange.to)); + + if (xequal || yequal) { + var lineWidth = m.lineWidth || options.grid.markingsLineWidth, + subPixel = lineWidth % 2 ? 0.5 : 0; ctx.beginPath(); ctx.strokeStyle = m.color || options.grid.markingsColor; - ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth; - ctx.moveTo(xrange.from, yrange.from); - ctx.lineTo(xrange.to, yrange.to); + ctx.lineWidth = lineWidth; + if (xequal) { + ctx.moveTo(xrange.to + subPixel, yrange.from); + ctx.lineTo(xrange.to + subPixel, yrange.to); + } else { + ctx.moveTo(xrange.from, yrange.to + subPixel); + ctx.lineTo(xrange.to, yrange.to + subPixel); + } ctx.stroke(); - } - else { - // fill area + } else { ctx.fillStyle = m.color || options.grid.markingsColor; ctx.fillRect(xrange.from, yrange.to, xrange.to - xrange.from, @@ -3091,7 +3122,7 @@ return plot; }; - $.plot.version = "0.8.2"; + $.plot.version = "0.8.3"; $.plot.plugins = []; diff -Nru flot-0.8.2+dfsg/debian/jquery.flot.navigate.js flot-0.8.3+dfsg/debian/jquery.flot.navigate.js --- flot-0.8.2+dfsg/debian/jquery.flot.navigate.js 2014-02-09 19:42:00.000000000 +0000 +++ flot-0.8.3+dfsg/debian/jquery.flot.navigate.js 2014-11-24 12:09:20.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for adding the ability to pan and zoom the plot. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The default behaviour is double click and scrollwheel up/down to zoom in, drag @@ -234,8 +234,8 @@ var range = max - min; if (zr && - ((zr[0] != null && range < zr[0]) || - (zr[1] != null && range > zr[1]))) + ((zr[0] != null && range < zr[0] && amount >1) || + (zr[1] != null && range > zr[1] && amount <1))) return; opts.min = min; diff -Nru flot-0.8.2+dfsg/debian/jquery.flot.resize.js flot-0.8.3+dfsg/debian/jquery.flot.resize.js --- flot-0.8.2+dfsg/debian/jquery.flot.resize.js 2014-02-09 19:39:25.000000000 +0000 +++ flot-0.8.3+dfsg/debian/jquery.flot.resize.js 2014-11-24 12:09:20.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for automatically redrawing plots as the placeholder resizes. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. It works by listening for changes on the placeholder div (through the jQuery diff -Nru flot-0.8.2+dfsg/debian/libjs-jquery-flot.install flot-0.8.3+dfsg/debian/libjs-jquery-flot.install --- flot-0.8.2+dfsg/debian/libjs-jquery-flot.install 2014-02-09 18:07:42.000000000 +0000 +++ flot-0.8.3+dfsg/debian/libjs-jquery-flot.install 2014-11-24 12:09:20.000000000 +0000 @@ -1 +1,2 @@ jquery*.js usr/share/javascript/jquery-flot/ +flot.jquery.json usr/share/javascript/jquery-flot/ diff -Nru flot-0.8.2+dfsg/debian/rules flot-0.8.3+dfsg/debian/rules --- flot-0.8.2+dfsg/debian/rules 2014-02-09 18:07:42.000000000 +0000 +++ flot-0.8.3+dfsg/debian/rules 2014-11-24 08:32:13.000000000 +0000 @@ -19,6 +19,7 @@ done override_dh_auto_clean: + dh_auto_clean rm -f *.min.js rm -f jquery.flot.navigate.js rm -f jquery.flot.resize.js diff -Nru flot-0.8.2+dfsg/examples/ajax/index.html flot-0.8.3+dfsg/examples/ajax/index.html --- flot-0.8.2+dfsg/examples/ajax/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/ajax/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -166,7 +166,7 @@ diff -Nru flot-0.8.2+dfsg/examples/annotating/index.html flot-0.8.3+dfsg/examples/annotating/index.html --- flot-0.8.2+dfsg/examples/annotating/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/annotating/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -80,7 +80,7 @@ diff -Nru flot-0.8.2+dfsg/examples/axes-interacting/index.html flot-0.8.3+dfsg/examples/axes-interacting/index.html --- flot-0.8.2+dfsg/examples/axes-interacting/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/axes-interacting/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -90,7 +90,7 @@ diff -Nru flot-0.8.2+dfsg/examples/axes-multiple/index.html flot-0.8.3+dfsg/examples/axes-multiple/index.html --- flot-0.8.2+dfsg/examples/axes-multiple/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/axes-multiple/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -70,7 +70,7 @@ diff -Nru flot-0.8.2+dfsg/examples/axes-time/index.html flot-0.8.3+dfsg/examples/axes-time/index.html --- flot-0.8.2+dfsg/examples/axes-time/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/axes-time/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -130,7 +130,7 @@ diff -Nru flot-0.8.2+dfsg/examples/axes-time-zones/index.html flot-0.8.3+dfsg/examples/axes-time-zones/index.html --- flot-0.8.2+dfsg/examples/axes-time-zones/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/axes-time-zones/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -107,7 +107,7 @@ diff -Nru flot-0.8.2+dfsg/examples/basic-options/index.html flot-0.8.3+dfsg/examples/basic-options/index.html --- flot-0.8.2+dfsg/examples/basic-options/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/basic-options/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -84,7 +84,7 @@ diff -Nru flot-0.8.2+dfsg/examples/basic-usage/index.html flot-0.8.3+dfsg/examples/basic-usage/index.html --- flot-0.8.2+dfsg/examples/basic-usage/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/basic-usage/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -50,7 +50,7 @@ diff -Nru flot-0.8.2+dfsg/examples/canvas/index.html flot-0.8.3+dfsg/examples/canvas/index.html --- flot-0.8.2+dfsg/examples/canvas/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/canvas/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -68,7 +68,7 @@ diff -Nru flot-0.8.2+dfsg/examples/categories/index.html flot-0.8.3+dfsg/examples/categories/index.html --- flot-0.8.2+dfsg/examples/categories/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/categories/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -52,7 +52,7 @@ diff -Nru flot-0.8.2+dfsg/examples/image/index.html flot-0.8.3+dfsg/examples/image/index.html --- flot-0.8.2+dfsg/examples/image/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/image/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -62,7 +62,7 @@ diff -Nru flot-0.8.2+dfsg/examples/interacting/index.html flot-0.8.3+dfsg/examples/interacting/index.html --- flot-0.8.2+dfsg/examples/interacting/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/interacting/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -111,7 +111,7 @@ diff -Nru flot-0.8.2+dfsg/examples/navigate/index.html flot-0.8.3+dfsg/examples/navigate/index.html --- flot-0.8.2+dfsg/examples/navigate/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/navigate/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -146,7 +146,7 @@ diff -Nru flot-0.8.2+dfsg/examples/percentiles/index.html flot-0.8.3+dfsg/examples/percentiles/index.html --- flot-0.8.2+dfsg/examples/percentiles/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/percentiles/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -72,7 +72,7 @@ diff -Nru flot-0.8.2+dfsg/examples/realtime/index.html flot-0.8.3+dfsg/examples/realtime/index.html --- flot-0.8.2+dfsg/examples/realtime/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/realtime/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -115,7 +115,7 @@ diff -Nru flot-0.8.2+dfsg/examples/resize/index.html flot-0.8.3+dfsg/examples/resize/index.html --- flot-0.8.2+dfsg/examples/resize/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/resize/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -38,7 +38,7 @@ maxWidth: 900, maxHeight: 500, minWidth: 450, - minHeight: 250, + minHeight: 250 }); // Add the Flot version string to the footer @@ -69,7 +69,7 @@ diff -Nru flot-0.8.2+dfsg/examples/selection/index.html flot-0.8.3+dfsg/examples/selection/index.html --- flot-0.8.2+dfsg/examples/selection/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/selection/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -12,6 +12,15 @@ $(function() { + // Shim allowing us to get the state of the check-box on jQuery versions + // prior to 1.6, when prop was added. The reason we don't just use attr + // is because it doesn't work in jQuery versions 1.9.x and later. + + // TODO: Remove this once Flot's minimum supported jQuery reaches 1.6. + if (typeof $.fn.prop != 'function') { + $.fn.prop = $.fn.attr; + } + var data = [{ label: "United States", data: [[1990, 18.9], [1991, 18.7], [1992, 18.4], [1993, 19.3], [1994, 19.5], [1995, 19.3], [1996, 19.4], [1997, 20.2], [1998, 19.8], [1999, 19.9], [2000, 20.4], [2001, 20.1], [2002, 20.0], [2003, 19.8], [2004, 20.4]] @@ -64,15 +73,17 @@ $("#selection").text(ranges.xaxis.from.toFixed(1) + " to " + ranges.xaxis.to.toFixed(1)); - var zoom = $("#zoom").attr("checked"); + var zoom = $("#zoom").prop("checked"); if (zoom) { - plot = $.plot(placeholder, data, $.extend(true, {}, options, { - xaxis: { - min: ranges.xaxis.from, - max: ranges.xaxis.to - } - })); + $.each(plot.getXAxes(), function(_, axis) { + var opts = axis.options; + opts.min = ranges.xaxis.from; + opts.max = ranges.xaxis.to; + }); + plot.setupGrid(); + plot.draw(); + plot.clearSelection(); } }); @@ -134,7 +145,7 @@ diff -Nru flot-0.8.2+dfsg/examples/series-errorbars/index.html flot-0.8.3+dfsg/examples/series-errorbars/index.html --- flot-0.8.2+dfsg/examples/series-errorbars/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/series-errorbars/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -143,7 +143,7 @@ diff -Nru flot-0.8.2+dfsg/examples/series-pie/index.html flot-0.8.3+dfsg/examples/series-pie/index.html --- flot-0.8.2+dfsg/examples/series-pie/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/series-pie/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -811,7 +811,7 @@ diff -Nru flot-0.8.2+dfsg/examples/series-toggle/index.html flot-0.8.3+dfsg/examples/series-toggle/index.html --- flot-0.8.2+dfsg/examples/series-toggle/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/series-toggle/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -114,7 +114,7 @@ diff -Nru flot-0.8.2+dfsg/examples/series-types/index.html flot-0.8.3+dfsg/examples/series-types/index.html --- flot-0.8.2+dfsg/examples/series-types/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/series-types/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -83,7 +83,7 @@ diff -Nru flot-0.8.2+dfsg/examples/stacking/index.html flot-0.8.3+dfsg/examples/stacking/index.html --- flot-0.8.2+dfsg/examples/stacking/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/stacking/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -100,7 +100,7 @@ diff -Nru flot-0.8.2+dfsg/examples/symbols/index.html flot-0.8.3+dfsg/examples/symbols/index.html --- flot-0.8.2+dfsg/examples/symbols/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/symbols/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -69,7 +69,7 @@ diff -Nru flot-0.8.2+dfsg/examples/threshold/index.html flot-0.8.3+dfsg/examples/threshold/index.html --- flot-0.8.2+dfsg/examples/threshold/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/threshold/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -69,7 +69,7 @@ diff -Nru flot-0.8.2+dfsg/examples/tracking/index.html flot-0.8.3+dfsg/examples/tracking/index.html --- flot-0.8.2+dfsg/examples/tracking/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/tracking/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -128,7 +128,7 @@ diff -Nru flot-0.8.2+dfsg/examples/visitors/index.html flot-0.8.3+dfsg/examples/visitors/index.html --- flot-0.8.2+dfsg/examples/visitors/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/visitors/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -92,13 +92,14 @@ $("#placeholder").bind("plotselected", function (event, ranges) { // do the zooming - - plot = $.plot("#placeholder", [d], $.extend(true, {}, options, { - xaxis: { - min: ranges.xaxis.from, - max: ranges.xaxis.to - } - })); + $.each(plot.getXAxes(), function(_, axis) { + var opts = axis.options; + opts.min = ranges.xaxis.from; + opts.max = ranges.xaxis.to; + }); + plot.setupGrid(); + plot.draw(); + plot.clearSelection(); // don't fire event on the overview to prevent eternal loop @@ -139,7 +140,7 @@ diff -Nru flot-0.8.2+dfsg/examples/zooming/index.html flot-0.8.3+dfsg/examples/zooming/index.html --- flot-0.8.2+dfsg/examples/zooming/index.html 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/examples/zooming/index.html 2014-04-21 13:58:01.000000000 +0000 @@ -137,7 +137,7 @@ diff -Nru flot-0.8.2+dfsg/flot.jquery.json flot-0.8.3+dfsg/flot.jquery.json --- flot-0.8.2+dfsg/flot.jquery.json 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/flot.jquery.json 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "flot", - "version": "0.8.2", + "version": "0.8.3", "title": "Flot", "author": { "name": "Ole Laursen", @@ -24,4 +24,4 @@ "email": "dnschnur@gmail.com", "url": "http://github.com/dnschnur" }] -} \ No newline at end of file +} diff -Nru flot-0.8.2+dfsg/jquery.flot.canvas.js flot-0.8.3+dfsg/jquery.flot.canvas.js --- flot-0.8.2+dfsg/jquery.flot.canvas.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.canvas.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for drawing all elements of a plot on the canvas. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. Flot normally produces certain elements, like axis labels and the legend, using diff -Nru flot-0.8.2+dfsg/jquery.flot.categories.js flot-0.8.3+dfsg/jquery.flot.categories.js --- flot-0.8.2+dfsg/jquery.flot.categories.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.categories.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for plotting textual data or categories. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. Consider a dataset like [["February", 34], ["March", 20], ...]. This plugin diff -Nru flot-0.8.2+dfsg/jquery.flot.crosshair.js flot-0.8.3+dfsg/jquery.flot.crosshair.js --- flot-0.8.2+dfsg/jquery.flot.crosshair.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.crosshair.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for showing crosshairs when the mouse hovers over the plot. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The plugin supports these options: @@ -139,7 +139,7 @@ ctx.translate(plotOffset.left, plotOffset.top); if (crosshair.x != -1) { - var adj = plot.getOptions().crosshair.lineWidth % 2 === 0 ? 0 : 0.5; + var adj = plot.getOptions().crosshair.lineWidth % 2 ? 0.5 : 0; ctx.strokeStyle = c.color; ctx.lineWidth = c.lineWidth; @@ -147,12 +147,12 @@ ctx.beginPath(); if (c.mode.indexOf("x") != -1) { - var drawX = Math.round(crosshair.x) + adj; + var drawX = Math.floor(crosshair.x) + adj; ctx.moveTo(drawX, 0); ctx.lineTo(drawX, plot.height()); } if (c.mode.indexOf("y") != -1) { - var drawY = Math.round(crosshair.y) + adj; + var drawY = Math.floor(crosshair.y) + adj; ctx.moveTo(0, drawY); ctx.lineTo(plot.width(), drawY); } diff -Nru flot-0.8.2+dfsg/jquery.flot.errorbars.js flot-0.8.3+dfsg/jquery.flot.errorbars.js --- flot-0.8.2+dfsg/jquery.flot.errorbars.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.errorbars.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for plotting error bars. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. Error bars are used to show standard deviation and other statistical diff -Nru flot-0.8.2+dfsg/jquery.flot.fillbetween.js flot-0.8.3+dfsg/jquery.flot.fillbetween.js --- flot-0.8.2+dfsg/jquery.flot.fillbetween.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.fillbetween.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for computing bottoms for filled line and bar charts. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The case: you've got two series that you want to fill the area between. In Flot diff -Nru flot-0.8.2+dfsg/jquery.flot.image.js flot-0.8.3+dfsg/jquery.flot.image.js --- flot-0.8.2+dfsg/jquery.flot.image.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.image.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for plotting images. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The data syntax is [ [ image, x1, y1, x2, y2 ], ... ] where (x1, y1) and diff -Nru flot-0.8.2+dfsg/jquery.flot.pie.js flot-0.8.3+dfsg/jquery.flot.pie.js --- flot-0.8.2+dfsg/jquery.flot.pie.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.pie.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for rendering pie charts. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The plugin assumes that each series has a single data value, and that each @@ -224,13 +224,16 @@ for (var i = 0; i < data.length; ++i) { var value = data[i].data[0][1]; if (numCombined < 2 || value / total > options.series.pie.combine.threshold) { - newdata.push({ - data: [[1, value]], - color: data[i].color, - label: data[i].label, - angle: value * Math.PI * 2 / total, - percent: value / (total / 100) - }); + newdata.push( + $.extend(data[i], { /* extend to allow keeping all other original data values + and using them e.g. in labelFormatter. */ + data: [[1, value]], + color: data[i].color, + label: data[i].label, + angle: value * Math.PI * 2 / total, + percent: value / (total / 100) + }) + ); } } diff -Nru flot-0.8.2+dfsg/jquery.flot.selection.js flot-0.8.3+dfsg/jquery.flot.selection.js --- flot-0.8.2+dfsg/jquery.flot.selection.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.selection.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for selecting regions of a plot. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The plugin supports these options: diff -Nru flot-0.8.2+dfsg/jquery.flot.stack.js flot-0.8.3+dfsg/jquery.flot.stack.js --- flot-0.8.2+dfsg/jquery.flot.stack.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.stack.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for stacking data sets rather than overlyaing them. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The plugin assumes the data is sorted on x (or y if stacking horizontally). diff -Nru flot-0.8.2+dfsg/jquery.flot.symbol.js flot-0.8.3+dfsg/jquery.flot.symbol.js --- flot-0.8.2+dfsg/jquery.flot.symbol.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.symbol.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin that adds some extra symbols for plotting points. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The symbols are accessed as strings through the standard symbol options: diff -Nru flot-0.8.2+dfsg/jquery.flot.threshold.js flot-0.8.3+dfsg/jquery.flot.threshold.js --- flot-0.8.2+dfsg/jquery.flot.threshold.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.threshold.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Flot plugin for thresholding data. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. The plugin supports these options: diff -Nru flot-0.8.2+dfsg/jquery.flot.time.js flot-0.8.3+dfsg/jquery.flot.time.js --- flot-0.8.2+dfsg/jquery.flot.time.js 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/jquery.flot.time.js 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ /* Pretty handling of time axes. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. Set axis.mode to "time" to enable. See the section "Time series data" in @@ -427,5 +427,6 @@ // on the function, so we need to re-expose it here. $.plot.formatDate = formatDate; + $.plot.dateGenerator = dateGenerator; })(jQuery); diff -Nru flot-0.8.2+dfsg/LICENSE.txt flot-0.8.3+dfsg/LICENSE.txt --- flot-0.8.2+dfsg/LICENSE.txt 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/LICENSE.txt 2014-04-21 13:58:01.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2007-2013 IOLA and Ole Laursen +Copyright (c) 2007-2014 IOLA and Ole Laursen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff -Nru flot-0.8.2+dfsg/NEWS.md flot-0.8.3+dfsg/NEWS.md --- flot-0.8.2+dfsg/NEWS.md 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/NEWS.md 2014-04-21 13:58:01.000000000 +0000 @@ -1,3 +1,51 @@ +## Flot 0.8.3 ## + +### Changes ### + +- Updated example code to avoid encouraging unnecessary re-plots. + (patch by soenter, pull request #1221) + +### Bug fixes ### + + - Added a work-around to disable the allocation of extra space for first and + last axis ticks, allowing plots to span the full width of their container. + A proper solution for this bug will be implemented in the 0.9 release. + (reported by Josh Pigford and andig, issue #1212, pull request #1290) + + - Fixed a regression introduced in 0.8.1, where the last tick label would + sometimes wrap rather than extending the plot's offset to create space. + (reported by Elite Gamer, issue #1283) + + - Fixed a regression introduced in 0.8.2, where the resize plugin would use + unexpectedly high amounts of CPU even when idle. + (reported by tommie, issue #1277, pull request #1289) + + - Fixed the selection example to work with jQuery 1.9.x and later. + (reported by EGLadona and dmfalke, issue #1250, pull request #1285) + + - Added a detach shim to fix support for jQuery versions earlier than 1.4.x. + (reported by ngavard, issue #1240, pull request #1286) + + - Fixed a rare 'Uncaught TypeError' when using the resize plugin in IE 7/8. + (reported by tleish, issue #1265, pull request #1289) + + - Fixed zoom constraints to apply only in the direction of the zoom. + (patch by Neil Katin, issue #1204, pull request #1205) + + - Markings lines are no longer blurry when drawn on pixel boundaries. + (reported by btccointicker and Rouillard, issue #1210) + + - Don't discard original pie data-series values when combining slices. + (patch by Phil Tsarik, pull request #1238) + + - Fixed broken auto-scale behavior when using deprecated [x|y]2axis options. + (reported by jorese, issue #1228, pull request #1284) + + - Exposed the dateGenerator function on the plot object, as it used to be + before time-mode was moved into a separate plugin. + (patch by Paolo Valleri, pull request #1028) + + ## Flot 0.8.2 ## ### Changes ### diff -Nru flot-0.8.2+dfsg/package.json flot-0.8.3+dfsg/package.json --- flot-0.8.2+dfsg/package.json 2013-11-28 18:43:09.000000000 +0000 +++ flot-0.8.3+dfsg/package.json 2014-04-21 13:58:01.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.2", + "version": "0.8.3", "main": "jquery.flot.js", "scripts": { "test": "make test"