From a7747bef23d531977e7b0f2d754457f47e8ef61e Mon Sep 17 00:00:00 2001 From: "olau@iola.dk" Date: Mon, 13 Dec 2010 17:03:40 +0000 Subject: [PATCH] Fix JSON to be valid and update news git-svn-id: https://flot.googlecode.com/svn/trunk@273 1e0a6537-2640-0410-bfb7-f154510ff394 --- NEWS.txt | 5 +++++ examples/data-eu-gdp-growth-1.json | 4 ++-- examples/data-eu-gdp-growth-2.json | 4 ++-- examples/data-eu-gdp-growth-3.json | 4 ++-- examples/data-eu-gdp-growth-4.json | 4 ++-- examples/data-eu-gdp-growth-5.json | 4 ++-- examples/data-eu-gdp-growth.json | 4 ++-- examples/data-japan-gdp-growth.json | 4 ++-- examples/data-usa-gdp-growth.json | 4 ++-- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index c6065e8..106990b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -98,6 +98,11 @@ Bug fixes: if it is locked (fix by Lau Bech Lauritzen and Banko Adam). - Fix bug with points plotting using line width from lines rather than points. +- Fix bug with passing non-array 0 data (for plugins that don't expect + arrays, patch by vpapp1). +- Fix errors in JSON in examples so they work with jQuery 1.4.2 + (fix reported by honestbleeps, issue 357). + Flot 0.6 -------- diff --git a/examples/data-eu-gdp-growth-1.json b/examples/data-eu-gdp-growth-1.json index 4372bf5..51952cf 100644 --- a/examples/data-eu-gdp-growth-1.json +++ b/examples/data-eu-gdp-growth-1.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9]] } diff --git a/examples/data-eu-gdp-growth-2.json b/examples/data-eu-gdp-growth-2.json index 6199882..82004d6 100644 --- a/examples/data-eu-gdp-growth-2.json +++ b/examples/data-eu-gdp-growth-2.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2]] } diff --git a/examples/data-eu-gdp-growth-3.json b/examples/data-eu-gdp-growth-3.json index 607f178..8684479 100644 --- a/examples/data-eu-gdp-growth-3.json +++ b/examples/data-eu-gdp-growth-3.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5]] } diff --git a/examples/data-eu-gdp-growth-4.json b/examples/data-eu-gdp-growth-4.json index df60fa9..b363578 100644 --- a/examples/data-eu-gdp-growth-4.json +++ b/examples/data-eu-gdp-growth-4.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1]] } diff --git a/examples/data-eu-gdp-growth-5.json b/examples/data-eu-gdp-growth-5.json index e722bcc..a7e1e13 100644 --- a/examples/data-eu-gdp-growth-5.json +++ b/examples/data-eu-gdp-growth-5.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]] } diff --git a/examples/data-eu-gdp-growth.json b/examples/data-eu-gdp-growth.json index e722bcc..a7e1e13 100644 --- a/examples/data-eu-gdp-growth.json +++ b/examples/data-eu-gdp-growth.json @@ -1,4 +1,4 @@ { - label: 'Europe (EU27)', - data: [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]] + "label": "Europe (EU27)", + "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]] } diff --git a/examples/data-japan-gdp-growth.json b/examples/data-japan-gdp-growth.json index 09aae77..855477c 100644 --- a/examples/data-japan-gdp-growth.json +++ b/examples/data-japan-gdp-growth.json @@ -1,4 +1,4 @@ { - label: 'Japan', - data: [[1999, -0.1], [2000, 2.9], [2001, 0.2], [2002, 0.3], [2003, 1.4], [2004, 2.7], [2005, 1.9], [2006, 2.0], [2007, 2.3], [2008, -0.7]] + "label": "Japan", + "data": [[1999, -0.1], [2000, 2.9], [2001, 0.2], [2002, 0.3], [2003, 1.4], [2004, 2.7], [2005, 1.9], [2006, 2.0], [2007, 2.3], [2008, -0.7]] } diff --git a/examples/data-usa-gdp-growth.json b/examples/data-usa-gdp-growth.json index 33fd4d3..33f66c6 100644 --- a/examples/data-usa-gdp-growth.json +++ b/examples/data-usa-gdp-growth.json @@ -1,4 +1,4 @@ { - label: 'USA', - data: [[1999, 4.4], [2000, 3.7], [2001, 0.8], [2002, 1.6], [2003, 2.5], [2004, 3.6], [2005, 2.9], [2006, 2.8], [2007, 2.0], [2008, 1.1]] + "label": "USA", + "data": [[1999, 4.4], [2000, 3.7], [2001, 0.8], [2002, 1.6], [2003, 2.5], [2004, 3.6], [2005, 2.9], [2006, 2.8], [2007, 2.0], [2008, 1.1]] }