Commit e55b5b4d authored by Ole Laursen's avatar Ole Laursen

Prefix canvas classes with "flot-" to prevent clashes, mostly a

problem with .overlay (reported by bcraysie/Bob Cravens, issue 540)
parent 2c8fc1a0
...@@ -11,6 +11,8 @@ the canvas API (this doesn't affect IE); if this is a problem, either ...@@ -11,6 +11,8 @@ the canvas API (this doesn't affect IE); if this is a problem, either
continue using an older version of Flot or try an emulation helper continue using an older version of Flot or try an emulation helper
such as canvas-text or Flashcanvas. such as canvas-text or Flashcanvas.
The base and overlay canvas are now using the CSS classes "flot-base"
and "flot-overlay" to prevent accidental clashes (issue 540).
Changes: Changes:
......
...@@ -735,8 +735,8 @@ ...@@ -735,8 +735,8 @@
function setupCanvases() { function setupCanvases() {
var reused, var reused,
existingCanvas = placeholder.children("canvas.base"), existingCanvas = placeholder.children("canvas.flot-base"),
existingOverlay = placeholder.children("canvas.overlay"); existingOverlay = placeholder.children("canvas.flot-overlay");
if (existingCanvas.length == 0 || existingOverlay == 0) { if (existingCanvas.length == 0 || existingOverlay == 0) {
// init everything // init everything
...@@ -750,8 +750,8 @@ ...@@ -750,8 +750,8 @@
getCanvasDimensions(); getCanvasDimensions();
canvas = makeCanvas(true, "base"); canvas = makeCanvas(true, "flot-base");
overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features overlay = makeCanvas(false, "flot-overlay"); // overlay canvas for interactive features
reused = false; reused = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment