[Pkg-javascript-commits] [flot] 01/08: Imported Upstream version 0.8.3+dfsg
Marcelo Jorge Vieira
metal at moszumanska.debian.org
Mon Nov 24 12:15:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
metal pushed a commit to branch master
in repository flot.
commit fa8738612138324a86a7bfb028c51930937c6063
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date: Sun Nov 23 19:00:27 2014 -0200
Imported Upstream version 0.8.3+dfsg
---
LICENSE.txt | 2 +-
NEWS.md | 48 ++++++++++++++++++++++++++++++++++++
component.json | 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 | 4 +--
examples/selection/index.html | 27 ++++++++++++++------
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 | 17 +++++++------
examples/zooming/index.html | 2 +-
flot.jquery.json | 4 +--
jquery.flot.canvas.js | 2 +-
jquery.flot.categories.js | 2 +-
jquery.flot.crosshair.js | 8 +++---
jquery.flot.errorbars.js | 2 +-
jquery.flot.fillbetween.js | 2 +-
jquery.flot.image.js | 2 +-
jquery.flot.pie.js | 19 ++++++++------
jquery.flot.selection.js | 2 +-
jquery.flot.stack.js | 2 +-
jquery.flot.symbol.js | 2 +-
jquery.flot.threshold.js | 2 +-
jquery.flot.time.js | 3 ++-
package.json | 2 +-
44 files changed, 133 insertions(+), 69 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/NEWS.md b/NEWS.md
index a99b65e..ad0303d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -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 --git a/component.json b/component.json
index f3dabc5..5961172 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "Flot",
- "version": "0.8.2",
+ "version": "0.8.3",
"main": "jquery.flot.js",
"dependencies": {
"jquery": ">= 1.2.6"
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
diff --git a/examples/resize/index.html b/examples/resize/index.html
index e9dc1ad..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
@@ -69,7 +69,7 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
diff --git a/examples/selection/index.html b/examples/selection/index.html
index 27f3367..48db7d3 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,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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
diff --git a/examples/visitors/index.html b/examples/visitors/index.html
index 8fc9a26..803c0bc 100644
--- a/examples/visitors/index.html
+++ b/examples/visitors/index.html
@@ -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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
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 @@
</div>
<div id="footer">
- Copyright © 2007 - 2013 IOLA and Ole Laursen
+ Copyright © 2007 - 2014 IOLA and Ole Laursen
</div>
</body>
diff --git a/flot.jquery.json b/flot.jquery.json
index 5cf7509..91ac79a 100644
--- a/flot.jquery.json
+++ b/flot.jquery.json
@@ -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 at gmail.com",
"url": "http://github.com/dnschnur"
}]
-}
\ No newline at end of file
+}
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 c5df9d9..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:
@@ -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;
@@ -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);
}
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.pie.js b/jquery.flot.pie.js
index 9915863..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
@@ -224,13 +224,16 @@ 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], { /* 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 --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 15f5281..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
@@ -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);
diff --git a/package.json b/package.json
index 023af9f..deb9651 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Flot",
- "version": "0.8.2",
+ "version": "0.8.3",
"main": "jquery.flot.js",
"scripts": {
"test": "make test"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/flot.git
More information about the Pkg-javascript-commits
mailing list