From f01bcee85446beb63a04d0b95c427f68c92ae4a9 Mon Sep 17 00:00:00 2001 From: "olau@iola.dk" Date: Sat, 4 Jul 2009 22:06:26 +0000 Subject: [PATCH] Don't use default as attribute name as it is a keyword which non-Firefox browsers don't like (reported by Charlie Groves) git-svn-id: https://flot.googlecode.com/svn/trunk@179 1e0a6537-2640-0410-bfb7-f154510ff394 --- API.txt | 8 ++++---- jquery.flot.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/API.txt b/API.txt index 0df039b..17c24be 100644 --- a/API.txt +++ b/API.txt @@ -930,10 +930,10 @@ Currently available hooks (when in doubt, check the Flot source): taken into account when scaling the x axis, that it must be a number, and that it is required - so if it is null or cannot be converted to a number, the whole point will be zeroed out with - nulls. Beyond these you can also specify "default". If the - coordinate is null and default is set, then default is used for the - value. This is for instance handy for bars where we can omit the - third coordinate (the bottom of the bar) which then defaults to 0. + nulls. Beyond these you can also specify "defaultValue", a value to + use if the coordinate is null. This is for instance handy for bars + where one can omit the third coordinate (the bottom of the bar) + which then defaults to 0. - processDatapoints [phase 3] diff --git a/jquery.flot.js b/jquery.flot.js index 54a729a..15bf315 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -361,7 +361,7 @@ format.push({ y: true, number: true, required: true }) if (s.bars.show) - format.push({ y: true, number: true, required: false, default: 0 }); + format.push({ y: true, number: true, required: false, defaultValue: 0 }); s.datapoints.format = format; } @@ -405,8 +405,8 @@ nullify = true; } - if (f.default != null) - val = f.default; + if (f.defaultValue != null) + val = f.defaultValue; } }