From dbd3af9d157b833058da32e8f6a1c1874733f363 Mon Sep 17 00:00:00 2001 From: ilvalle Date: Wed, 24 Apr 2013 09:00:39 +0200 Subject: [PATCH 01/21] made dateGenerator accessible from external plugin, this is useful for the tooltip plugin --- jquery.flot.time.js | 1 + 1 file changed, 1 insertion(+) diff --git a/jquery.flot.time.js b/jquery.flot.time.js index 15f5281..75feefd 100644 --- a/jquery.flot.time.js +++ b/jquery.flot.time.js @@ -427,5 +427,6 @@ API.txt for details. // on the function, so we need to re-expose it here. $.plot.formatDate = formatDate; + $.plot.dateGenerator = dateGenerator; })(jQuery); From 8e761580cb108628dd905aeb8327e00eda286efe Mon Sep 17 00:00:00 2001 From: Neil Katin Date: Sun, 1 Dec 2013 15:06:04 -0800 Subject: [PATCH 02/21] Proposed fix for issue 1204: only enforce zoom limits in the direction of the zoom. --- jquery.flot.navigate.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery.flot.navigate.js b/jquery.flot.navigate.js index 10256b8..e23204a 100644 --- a/jquery.flot.navigate.js +++ b/jquery.flot.navigate.js @@ -260,8 +260,8 @@ Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-L 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; From e4c035b37d83dba7124eb23db29617edb1dc9cec Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sat, 21 Dec 2013 03:32:35 -0800 Subject: [PATCH 03/21] Updated version number to 0.8.3-alpha. --- NEWS.md | 7 +++++++ component.json | 2 +- flot.jquery.json | 2 +- jquery.flot.js | 4 ++-- package.json | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index a99b65e..41c5937 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +## Flot 0.8.3 ## + +### Bug fixes ### + + + + ## Flot 0.8.2 ## ### Changes ### diff --git a/component.json b/component.json index f3dabc5..b134da8 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.2", + "version": "0.8.3-alpha", "main": "jquery.flot.js", "dependencies": { "jquery": ">= 1.2.6" diff --git a/flot.jquery.json b/flot.jquery.json index 5cf7509..5fa705c 100644 --- a/flot.jquery.json +++ b/flot.jquery.json @@ -1,6 +1,6 @@ { "name": "flot", - "version": "0.8.2", + "version": "0.8.3-alpha", "title": "Flot", "author": { "name": "Ole Laursen", diff --git a/jquery.flot.js b/jquery.flot.js index 965e78e..a4359f9 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1,4 +1,4 @@ -/* Javascript plotting library for jQuery, version 0.8.2. +/* Javascript plotting library for jQuery, version 0.8.3-alpha. Copyright (c) 2007-2013 IOLA and Ole Laursen. Licensed under the MIT license. @@ -3117,7 +3117,7 @@ Licensed under the MIT license. return plot; }; - $.plot.version = "0.8.2"; + $.plot.version = "0.8.3-alpha"; $.plot.plugins = []; diff --git a/package.json b/package.json index 023af9f..55d252e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.2", + "version": "0.8.3-alpha", "main": "jquery.flot.js", "scripts": { "test": "make test" From 4c86903b99fd95b4dbb35c0d00d0147063f825a2 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sat, 21 Dec 2013 03:45:32 -0800 Subject: [PATCH 04/21] Logic tweak to save a few bytes. --- jquery.flot.crosshair.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.flot.crosshair.js b/jquery.flot.crosshair.js index c5df9d9..9aaf677 100644 --- a/jquery.flot.crosshair.js +++ b/jquery.flot.crosshair.js @@ -139,7 +139,7 @@ The plugin also adds four public methods: 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; From e5d2237829163a723f2591ba787a5f08ee1f4f5b Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sat, 21 Dec 2013 05:42:26 -0800 Subject: [PATCH 05/21] Use floor instead of round for better sub-pixel accuracy. --- jquery.flot.crosshair.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery.flot.crosshair.js b/jquery.flot.crosshair.js index 9aaf677..16e321e 100644 --- a/jquery.flot.crosshair.js +++ b/jquery.flot.crosshair.js @@ -147,12 +147,12 @@ The plugin also adds four public methods: 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); } From 739cefd53962f08eed7c828ee233d3643d6e0fcb Mon Sep 17 00:00:00 2001 From: David Schnur Date: Tue, 24 Dec 2013 14:37:32 -0500 Subject: [PATCH 06/21] Add sub-pixel adjustments to avoid blurry markings. Fixes #1210. --- jquery.flot.js | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index a4359f9..c416408 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1963,26 +1963,34 @@ Licensed under the MIT license. 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, From 4db2939f17ae7e321bd1ede57eac2854be128850 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 5 Jan 2014 08:34:37 -0800 Subject: [PATCH 07/21] Fix poor wording / typo in comment. --- jquery.flot.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index c416408..9c9a8fd 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1706,8 +1706,8 @@ Licensed under the MIT license. 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."); From b9c6359c225c68252f808a4d0eb897baadde68d2 Mon Sep 17 00:00:00 2001 From: soenter Date: Sat, 11 Jan 2014 08:59:54 +0800 Subject: [PATCH 08/21] Improve the performance of large data processing --- examples/selection/index.html | 14 ++++++++------ examples/visitors/index.html | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/examples/selection/index.html b/examples/selection/index.html index 27f3367..88cc313 100644 --- a/examples/selection/index.html +++ b/examples/selection/index.html @@ -67,12 +67,14 @@ var zoom = $("#zoom").attr("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(); } }); diff --git a/examples/visitors/index.html b/examples/visitors/index.html index 8fc9a26..182f6aa 100644 --- a/examples/visitors/index.html +++ b/examples/visitors/index.html @@ -93,12 +93,14 @@ // 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 From bc707fead9c13c94d4e1346fcfe29fbae6977f5b Mon Sep 17 00:00:00 2001 From: Phil Tsarik Date: Mon, 27 Jan 2014 14:42:04 +0300 Subject: [PATCH 09/21] Pie: Fix combined data to keep all other original values. But not only data, color, label, angle, percent as was before. Allows to store own values in series and use them e.g. in labelFormatter. --- jquery.flot.pie.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/jquery.flot.pie.js b/jquery.flot.pie.js index 9915863..625789e 100644 --- a/jquery.flot.pie.js +++ b/jquery.flot.pie.js @@ -224,13 +224,15 @@ More detail and specific examples can be found in the included HTML file. 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], { + data: [[1, value]], + color: data[i].color, + label: data[i].label, + angle: value * Math.PI * 2 / total, + percent: value / (total / 100) + }) + ); } } From 38f7a8c58d30e6be733e67bd538f4ab0f4ae5df8 Mon Sep 17 00:00:00 2001 From: soenter Date: Sun, 9 Feb 2014 08:23:35 +0800 Subject: [PATCH 10/21] Improve the performance of large data processing(fix spaces -> tabs) --- examples/selection/index.html | 14 +++++++------- examples/visitors/index.html | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/selection/index.html b/examples/selection/index.html index 88cc313..6dbf2db 100644 --- a/examples/selection/index.html +++ b/examples/selection/index.html @@ -68,13 +68,13 @@ if (zoom) { $.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(); + var opts = axis.options; + opts.min = ranges.xaxis.from; + opts.max = ranges.xaxis.to; + }); + plot.setupGrid(); + plot.draw(); + plot.clearSelection(); } }); diff --git a/examples/visitors/index.html b/examples/visitors/index.html index 182f6aa..614c3ec 100644 --- a/examples/visitors/index.html +++ b/examples/visitors/index.html @@ -92,12 +92,11 @@ $("#placeholder").bind("plotselected", function (event, ranges) { // do the zooming - $.each(plot.getXAxes(), function(_, axis) { - var opts = axis.options; - opts.min = ranges.xaxis.from; - opts.max = ranges.xaxis.to; - }); + var opts = axis.options; + opts.min = ranges.xaxis.from; + opts.max = ranges.xaxis.to; + }); plot.setupGrid(); plot.draw(); plot.clearSelection(); From 28cc35845f15a63810e0849eeb7606811422fe39 Mon Sep 17 00:00:00 2001 From: Phil Tsarik Date: Mon, 17 Feb 2014 14:01:10 +0300 Subject: [PATCH 11/21] Add a comment explaining why extend is being used --- jquery.flot.pie.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jquery.flot.pie.js b/jquery.flot.pie.js index 625789e..b9d4f66 100644 --- a/jquery.flot.pie.js +++ b/jquery.flot.pie.js @@ -225,7 +225,8 @@ More detail and specific examples can be found in the included HTML file. var value = data[i].data[0][1]; if (numCombined < 2 || value / total > options.series.pie.combine.threshold) { newdata.push( - $.extend(data[i], { + $.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, From 4964dcb3c1c190e39e43b81fa3e66a7d54902d16 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 13 Apr 2014 14:24:17 -0700 Subject: [PATCH 12/21] Fix zoom to selection box when using jQuery 1.9+. Fixes #1250. --- examples/selection/index.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/selection/index.html b/examples/selection/index.html index 6dbf2db..dd5c28b 100644 --- a/examples/selection/index.html +++ b/examples/selection/index.html @@ -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,7 +73,7 @@ $("#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) { $.each(plot.getXAxes(), function(_, axis) { From e17d3798349ca6c9918f74cddd91ea4d06dfb83b Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 13 Apr 2014 15:08:10 -0700 Subject: [PATCH 13/21] Provide a detach shim for jQuery prior to 1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flot 0.8 still officially supports jQuery 1.2.6 and higher, so we can’t assume the existence of detach. This will go away in 0.9, where the minimum jQuery version is 1.4.4. Fixes #1240. --- jquery.flot.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jquery.flot.js b/jquery.flot.js index 9c9a8fd..05fb8a9 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -38,6 +38,22 @@ Licensed under the MIT license. 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. // From 86f7ab1e4851c7cba1cee4834ddc7557f594cfba Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 13 Apr 2014 23:00:15 -0700 Subject: [PATCH 14/21] Allow x2axis/y2axis with no min/max to auto-scale. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using x2axis/y2axis to add a second axis is deprecated, but we currently still support it. Historically we’ve just extended the first axis’s options with the second’s, but that is a problem when the first has min/max and the second doesn’t; it will inherit an inappropriate min/max. We might want to consider not extending at all, but since that’s a bigger change we’ll for now just ensure that if no min/max is specified, we respect that. Fixes #1228. --- jquery.flot.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jquery.flot.js b/jquery.flot.js index 9c9a8fd..a7eaf6c 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -814,10 +814,24 @@ Licensed under the MIT license. 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; From 1d3a062833593c1917462fb846f94215dfde52b1 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Wed, 16 Apr 2014 22:52:38 -0700 Subject: [PATCH 15/21] Update copyright year to 2014. --- LICENSE.txt | 2 +- examples/ajax/index.html | 2 +- examples/annotating/index.html | 2 +- examples/axes-interacting/index.html | 2 +- examples/axes-multiple/index.html | 2 +- examples/axes-time-zones/index.html | 2 +- examples/axes-time/index.html | 2 +- examples/basic-options/index.html | 2 +- examples/basic-usage/index.html | 2 +- examples/canvas/index.html | 2 +- examples/categories/index.html | 2 +- examples/image/index.html | 2 +- examples/interacting/index.html | 2 +- examples/navigate/index.html | 2 +- examples/percentiles/index.html | 2 +- examples/realtime/index.html | 2 +- examples/resize/index.html | 2 +- examples/selection/index.html | 2 +- examples/series-errorbars/index.html | 2 +- examples/series-pie/index.html | 2 +- examples/series-toggle/index.html | 2 +- examples/series-types/index.html | 2 +- examples/stacking/index.html | 2 +- examples/symbols/index.html | 2 +- examples/threshold/index.html | 2 +- examples/tracking/index.html | 2 +- examples/visitors/index.html | 2 +- examples/zooming/index.html | 2 +- jquery.flot.canvas.js | 2 +- jquery.flot.categories.js | 2 +- jquery.flot.crosshair.js | 2 +- jquery.flot.errorbars.js | 2 +- jquery.flot.fillbetween.js | 2 +- jquery.flot.image.js | 2 +- jquery.flot.js | 2 +- jquery.flot.navigate.js | 2 +- jquery.flot.pie.js | 2 +- jquery.flot.resize.js | 2 +- jquery.flot.selection.js | 2 +- jquery.flot.stack.js | 2 +- jquery.flot.symbol.js | 2 +- jquery.flot.threshold.js | 2 +- jquery.flot.time.js | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 67f4625..719da06 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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 --git a/examples/ajax/index.html b/examples/ajax/index.html index 35ce10d..2f0532e 100644 --- a/examples/ajax/index.html +++ b/examples/ajax/index.html @@ -166,7 +166,7 @@ diff --git a/examples/annotating/index.html b/examples/annotating/index.html index 71f6218..3b4cb1b 100644 --- a/examples/annotating/index.html +++ b/examples/annotating/index.html @@ -80,7 +80,7 @@ diff --git a/examples/axes-interacting/index.html b/examples/axes-interacting/index.html index 7e44111..1e11ea4 100644 --- a/examples/axes-interacting/index.html +++ b/examples/axes-interacting/index.html @@ -90,7 +90,7 @@ diff --git a/examples/axes-multiple/index.html b/examples/axes-multiple/index.html index 4c7c68c..cc31d88 100644 --- a/examples/axes-multiple/index.html +++ b/examples/axes-multiple/index.html @@ -70,7 +70,7 @@ diff --git a/examples/axes-time-zones/index.html b/examples/axes-time-zones/index.html index 94ef43e..5444241 100644 --- a/examples/axes-time-zones/index.html +++ b/examples/axes-time-zones/index.html @@ -107,7 +107,7 @@ diff --git a/examples/axes-time/index.html b/examples/axes-time/index.html index 1391ca1..ac3b2dc 100644 --- a/examples/axes-time/index.html +++ b/examples/axes-time/index.html @@ -130,7 +130,7 @@ diff --git a/examples/basic-options/index.html b/examples/basic-options/index.html index cb15fe2..8d7f98d 100644 --- a/examples/basic-options/index.html +++ b/examples/basic-options/index.html @@ -84,7 +84,7 @@ diff --git a/examples/basic-usage/index.html b/examples/basic-usage/index.html index bf6d467..4ace696 100644 --- a/examples/basic-usage/index.html +++ b/examples/basic-usage/index.html @@ -50,7 +50,7 @@ diff --git a/examples/canvas/index.html b/examples/canvas/index.html index 51f3656..f51362a 100644 --- a/examples/canvas/index.html +++ b/examples/canvas/index.html @@ -68,7 +68,7 @@ diff --git a/examples/categories/index.html b/examples/categories/index.html index 97bafb8..5841676 100644 --- a/examples/categories/index.html +++ b/examples/categories/index.html @@ -52,7 +52,7 @@ diff --git a/examples/image/index.html b/examples/image/index.html index 0bc89e0..450101c 100644 --- a/examples/image/index.html +++ b/examples/image/index.html @@ -62,7 +62,7 @@ diff --git a/examples/interacting/index.html b/examples/interacting/index.html index 982aa2f..31169db 100644 --- a/examples/interacting/index.html +++ b/examples/interacting/index.html @@ -111,7 +111,7 @@ diff --git a/examples/navigate/index.html b/examples/navigate/index.html index dbb170f..671692e 100644 --- a/examples/navigate/index.html +++ b/examples/navigate/index.html @@ -146,7 +146,7 @@ diff --git a/examples/percentiles/index.html b/examples/percentiles/index.html index 4513641..57df2a5 100644 --- a/examples/percentiles/index.html +++ b/examples/percentiles/index.html @@ -72,7 +72,7 @@ diff --git a/examples/realtime/index.html b/examples/realtime/index.html index 4333aca..8742a29 100644 --- a/examples/realtime/index.html +++ b/examples/realtime/index.html @@ -115,7 +115,7 @@ diff --git a/examples/resize/index.html b/examples/resize/index.html index e9dc1ad..459e0ee 100644 --- a/examples/resize/index.html +++ b/examples/resize/index.html @@ -69,7 +69,7 @@ diff --git a/examples/selection/index.html b/examples/selection/index.html index dd5c28b..48db7d3 100644 --- a/examples/selection/index.html +++ b/examples/selection/index.html @@ -145,7 +145,7 @@ diff --git a/examples/series-errorbars/index.html b/examples/series-errorbars/index.html index f76f08e..23a5a87 100644 --- a/examples/series-errorbars/index.html +++ b/examples/series-errorbars/index.html @@ -143,7 +143,7 @@ diff --git a/examples/series-pie/index.html b/examples/series-pie/index.html index 12e9f44..342636f 100644 --- a/examples/series-pie/index.html +++ b/examples/series-pie/index.html @@ -811,7 +811,7 @@ diff --git a/examples/series-toggle/index.html b/examples/series-toggle/index.html index c66d890..4c06290 100644 --- a/examples/series-toggle/index.html +++ b/examples/series-toggle/index.html @@ -114,7 +114,7 @@ diff --git a/examples/series-types/index.html b/examples/series-types/index.html index dfafba2..91f7243 100644 --- a/examples/series-types/index.html +++ b/examples/series-types/index.html @@ -83,7 +83,7 @@ diff --git a/examples/stacking/index.html b/examples/stacking/index.html index 9eb0528..bf5414e 100644 --- a/examples/stacking/index.html +++ b/examples/stacking/index.html @@ -100,7 +100,7 @@ diff --git a/examples/symbols/index.html b/examples/symbols/index.html index 47a4d5a..e2507be 100644 --- a/examples/symbols/index.html +++ b/examples/symbols/index.html @@ -69,7 +69,7 @@ diff --git a/examples/threshold/index.html b/examples/threshold/index.html index 1079d76..c2c596f 100644 --- a/examples/threshold/index.html +++ b/examples/threshold/index.html @@ -69,7 +69,7 @@ diff --git a/examples/tracking/index.html b/examples/tracking/index.html index 59ace02..69276c2 100644 --- a/examples/tracking/index.html +++ b/examples/tracking/index.html @@ -128,7 +128,7 @@ diff --git a/examples/visitors/index.html b/examples/visitors/index.html index 614c3ec..803c0bc 100644 --- a/examples/visitors/index.html +++ b/examples/visitors/index.html @@ -140,7 +140,7 @@ diff --git a/examples/zooming/index.html b/examples/zooming/index.html index 8d6b3cb..fb295d5 100644 --- a/examples/zooming/index.html +++ b/examples/zooming/index.html @@ -137,7 +137,7 @@ diff --git a/jquery.flot.canvas.js b/jquery.flot.canvas.js index d94b961..29328d5 100644 --- a/jquery.flot.canvas.js +++ b/jquery.flot.canvas.js @@ -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 --git a/jquery.flot.categories.js b/jquery.flot.categories.js index 6e6e8ba..2f9b257 100644 --- a/jquery.flot.categories.js +++ b/jquery.flot.categories.js @@ -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 --git a/jquery.flot.crosshair.js b/jquery.flot.crosshair.js index 16e321e..5111695 100644 --- a/jquery.flot.crosshair.js +++ b/jquery.flot.crosshair.js @@ -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: diff --git a/jquery.flot.errorbars.js b/jquery.flot.errorbars.js index 7298436..2583d5c 100644 --- a/jquery.flot.errorbars.js +++ b/jquery.flot.errorbars.js @@ -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 --git a/jquery.flot.fillbetween.js b/jquery.flot.fillbetween.js index 2854d2d..18b15d2 100644 --- a/jquery.flot.fillbetween.js +++ b/jquery.flot.fillbetween.js @@ -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 --git a/jquery.flot.image.js b/jquery.flot.image.js index d2837cf..625a035 100644 --- a/jquery.flot.image.js +++ b/jquery.flot.image.js @@ -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 --git a/jquery.flot.js b/jquery.flot.js index b98ada0..4c143cd 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1,6 +1,6 @@ /* Javascript plotting library for jQuery, version 0.8.3-alpha. -Copyright (c) 2007-2013 IOLA and Ole Laursen. +Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. */ diff --git a/jquery.flot.navigate.js b/jquery.flot.navigate.js index e23204a..13fb7f1 100644 --- a/jquery.flot.navigate.js +++ b/jquery.flot.navigate.js @@ -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 diff --git a/jquery.flot.pie.js b/jquery.flot.pie.js index b9d4f66..9c19db9 100644 --- a/jquery.flot.pie.js +++ b/jquery.flot.pie.js @@ -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 diff --git a/jquery.flot.resize.js b/jquery.flot.resize.js index 44e04f8..1049b63 100644 --- a/jquery.flot.resize.js +++ b/jquery.flot.resize.js @@ -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 --git a/jquery.flot.selection.js b/jquery.flot.selection.js index f8fa668..d3c20fa 100644 --- a/jquery.flot.selection.js +++ b/jquery.flot.selection.js @@ -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 --git a/jquery.flot.stack.js b/jquery.flot.stack.js index c01de67..e75a7df 100644 --- a/jquery.flot.stack.js +++ b/jquery.flot.stack.js @@ -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 --git a/jquery.flot.symbol.js b/jquery.flot.symbol.js index cc181ff..79f6349 100644 --- a/jquery.flot.symbol.js +++ b/jquery.flot.symbol.js @@ -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 --git a/jquery.flot.threshold.js b/jquery.flot.threshold.js index 2f6e635..8c99c40 100644 --- a/jquery.flot.threshold.js +++ b/jquery.flot.threshold.js @@ -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 --git a/jquery.flot.time.js b/jquery.flot.time.js index 75feefd..34c1d12 100644 --- a/jquery.flot.time.js +++ b/jquery.flot.time.js @@ -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 From 7aec501eaf48df4f89c9d999bb09e70475093f9c Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sat, 19 Apr 2014 17:51:53 -0700 Subject: [PATCH 16/21] Update the inline resize plugin with recent fixes. This updates the inline resize plugin with flot/jquery-resize@74716750f4 and flot/jquery-resize@189b555558. Fixes #1277 and #1265. --- jquery.flot.resize.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jquery.flot.resize.js b/jquery.flot.resize.js index 1049b63..8a626dd 100644 --- a/jquery.flot.resize.js +++ b/jquery.flot.resize.js @@ -19,8 +19,7 @@ can just fix the size of their placeholders. * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ - -(function($,t,n){function p(){for(var n=r.length-1;n>=0;n--){var o=$(r[n]);if(o[0]==t||o.is(":visible")){var h=o.width(),d=o.height(),v=o.data(a);!v||h===v.w&&d===v.h?i[f]=i[l]:(i[f]=i[c],o.trigger(u,[v.w=h,v.h=d]))}else v=o.data(a),v.w=0,v.h=0}s!==null&&(s=t.requestAnimationFrame(p))}var r=[],i=$.resize=$.extend($.resize,{}),s,o="setTimeout",u="resize",a=u+"-special-event",f="delay",l="pendingDelay",c="activeDelay",h="throttleWindow";i[l]=250,i[c]=20,i[f]=i[l],i[h]=!0,$.event.special[u]={setup:function(){if(!i[h]&&this[o])return!1;var t=$(this);r.push(this),t.data(a,{w:t.width(),h:t.height()}),r.length===1&&(s=n,p())},teardown:function(){if(!i[h]&&this[o])return!1;var t=$(this);for(var n=r.length-1;n>=0;n--)if(r[n]==this){r.splice(n,1);break}t.removeData(a),r.length||(cancelAnimationFrame(s),s=null)},add:function(t){function s(t,i,s){var o=$(this),u=o.data(a);u.w=i!==n?i:o.width(),u.h=s!==n?s:o.height(),r.apply(this,arguments)}if(!i[h]&&this[o])return!1;var r;if($.isFunction(t))return r=t,s;r=t.handler,t.handler=s}},t.requestAnimationFrame||(t.requestAnimationFrame=function(){return t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||t.msRequestAnimationFrame||function(e,n){return t.setTimeout(e,i[f])}}()),t.cancelAnimationFrame||(t.cancelAnimationFrame=function(){return t.webkitCancelRequestAnimationFrame||t.mozCancelRequestAnimationFrame||t.oCancelRequestAnimationFrame||t.msCancelRequestAnimationFrame||clearTimeout}())})(jQuery,this); +(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this); (function ($) { var options = { }; // no options From e31ff8e565986aae4d9fb91fc9304e43d81c5c9e Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sat, 19 Apr 2014 17:52:31 -0700 Subject: [PATCH 17/21] Fix IE-breaking trailing comma in the example. --- examples/resize/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/resize/index.html b/examples/resize/index.html index 459e0ee..46b815c 100644 --- a/examples/resize/index.html +++ b/examples/resize/index.html @@ -38,7 +38,7 @@ maxWidth: 900, maxHeight: 500, minWidth: 450, - minHeight: 250, + minHeight: 250 }); // Add the Flot version string to the footer From 0beb104eb9850f4485f6808adaab6c0e0ff1ad48 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 20 Apr 2014 09:48:59 -0700 Subject: [PATCH 18/21] Revert #1200; it was causing #1283 breakages. The fix for an unnecessary gap on the right of the chart turned out to break text wrapping for ticks that were legitimately in that position. Fixes #1283. --- jquery.flot.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index 4c143cd..390fd9e 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1550,17 +1550,12 @@ Licensed under the MIT license. // 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); } } }); From 7f63b0703bf5926ad9dbf50945077b289a52ec8e Mon Sep 17 00:00:00 2001 From: David Schnur Date: Sun, 20 Apr 2014 15:39:17 -0700 Subject: [PATCH 19/21] Work-around for full-width plots. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduces an unofficial work-around for the behavior introduced in 0.8.0, where we reserve extra space for the first and last tick labels. This makes it impossible for plots to span the full width of their container. This work-around overloads the reserveSpace option, which normally only applies when show = false. Now, if show = true and reserveSpace = false, we skip the step that allocates extra space for labels. We’ll introduce a proper solution in 0.9, but this should provide a way for users to move forward in the meantime. --- jquery.flot.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index 390fd9e..558e697 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1446,7 +1446,7 @@ Licensed under the MIT license. // 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) { @@ -1589,20 +1589,18 @@ Licensed under the MIT license. } } - // 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 From f17893ea35411f1763a9057889d1ffeb7334abd0 Mon Sep 17 00:00:00 2001 From: David Schnur Date: Mon, 21 Apr 2014 06:57:16 -0700 Subject: [PATCH 20/21] Updated NEWS for the 0.8.3 release. --- NEWS.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/NEWS.md b/NEWS.md index 41c5937..ad0303d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,49 @@ ## 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 ## From 453b017cc5acfd75e252b93e8635f57f4196d45d Mon Sep 17 00:00:00 2001 From: David Schnur Date: Mon, 21 Apr 2014 06:58:01 -0700 Subject: [PATCH 21/21] Update version number to 0.8.3 final. --- component.json | 2 +- flot.jquery.json | 4 ++-- jquery.flot.js | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/component.json b/component.json index b134da8..5961172 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.3-alpha", + "version": "0.8.3", "main": "jquery.flot.js", "dependencies": { "jquery": ">= 1.2.6" diff --git a/flot.jquery.json b/flot.jquery.json index 5fa705c..91ac79a 100644 --- a/flot.jquery.json +++ b/flot.jquery.json @@ -1,6 +1,6 @@ { "name": "flot", - "version": "0.8.3-alpha", + "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 --git a/jquery.flot.js b/jquery.flot.js index 558e697..39f3e4c 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -1,4 +1,4 @@ -/* Javascript plotting library for jQuery, version 0.8.3-alpha. +/* Javascript plotting library for jQuery, version 0.8.3. Copyright (c) 2007-2014 IOLA and Ole Laursen. Licensed under the MIT license. @@ -3148,7 +3148,7 @@ Licensed under the MIT license. return plot; }; - $.plot.version = "0.8.3-alpha"; + $.plot.version = "0.8.3"; $.plot.plugins = []; diff --git a/package.json b/package.json index 55d252e..deb9651 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Flot", - "version": "0.8.3-alpha", + "version": "0.8.3", "main": "jquery.flot.js", "scripts": { "test": "make test"