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

problem with .overlay (reported by bcraysie/Bob Cravens, issue 540)
ichthyos · Jun 3, 2011 · e55b5b4 · e55b5b4
1 parent 2c8fc1a
commit e55b5b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -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
 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:

diff --git a/jquery.flot.js b/jquery.flot.js
@@ -735,8 +735,8 @@
 
         function setupCanvases() {
             var reused,
-                existingCanvas = placeholder.children("canvas.base"),
-                existingOverlay = placeholder.children("canvas.overlay");
+                existingCanvas = placeholder.children("canvas.flot-base"),
+                existingOverlay = placeholder.children("canvas.flot-overlay");
 
             if (existingCanvas.length == 0 || existingOverlay == 0) {
                 // init everything
@@ -750,8 +750,8 @@
 
                 getCanvasDimensions();
 
-                canvas = makeCanvas(true, "base");
-                overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features
+                canvas = makeCanvas(true, "flot-base");
+                overlay = makeCanvas(false, "flot-overlay"); // overlay canvas for interactive features
 
                 reused = false;
             }