projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f0e1fe)
various IE fixes
authorDan Vanderkam <danvdk@gmail.com>
Tue, 14 Sep 2010 22:03:56 +0000 (18:03 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Tue, 14 Sep 2010 22:03:56 +0000 (18:03 -0400)
docs/annotations.html patch | blob | blame | history
dygraph-canvas.js patch | blob | blame | history
tests/annotation-gviz.html patch | blob | blame | history
tests/annotation.html patch | blob | blame | history

diff --git a/docs/annotations.html b/docs/annotations.html
index e20122e..afe09ac 100644 (file)
--- a/docs/annotations.html
+++ b/docs/annotations.html
@@ -10,8 +10,10 @@
       <script type="text/javascript" src="excanvas.js"></script>
     <![endif]-->
     <script type="text/javascript" src="annotations/dygraph-combined.js"></script>
+    <!--
     <script type="text/javascript" src="annotations/dygraph.js"></script>
     <script type="text/javascript" src="annotations/dygraph-canvas.js"></script>
+    -->
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index fdebac7..8d3bfe2 100644 (file)
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -501,7 +501,7 @@ DygraphCanvasRenderer.prototype._renderAnnotations = function() {
     "position": "absolute",
     "fontSize": this.options.axisLabelFontSize + "px",
     "zIndex": 10,
-    "overflow": "hidden",
+    "overflow": "hidden"
   };
 
   var bindEvt = function(eventName, classEventName, p, self) {
diff --git a/tests/annotation-gviz.html b/tests/annotation-gviz.html
index 9a65d71..5b2fab8 100644 (file)
--- a/tests/annotation-gviz.html
+++ b/tests/annotation-gviz.html
@@ -1,5 +1,8 @@
 <html>
   <head>
+    <!--[if IE]>
+    <script type="text/javascript" src="excanvas.js"></script>
+    <![endif]-->
     <!--
     <script type="text/javascript" src="dygraph-combined.js"></script>
     -->
diff --git a/tests/annotation.html b/tests/annotation.html
index 0976052..776c29a 100644 (file)
--- a/tests/annotation.html
+++ b/tests/annotation.html
@@ -22,7 +22,7 @@
     <input type="button" value="Add Annotation" onclick="add()" />
     <input type="button" value="Shove to bottom" onclick="bottom(this)" />
     <div id="events"> </div>
-    <div style="position:absolute; left:200px; top: 200px;" id="g"></div>
+    <div style="position:absolute; left:200px; top: 200px;" id="g_div"></div>
     <div style="position:absolute; left:700px; top: 200px;" id="list"></div>
 
     <script type="text/javascript">
@@ -32,7 +32,7 @@
       }
 
       g = new Dygraph(
-              document.getElementById("g"),
+              document.getElementById("g_div"),
               function() {
                 var zp = function(x) { if (x < 10) return "0"+x; else return x; };
                 var r = "date,parabola,line,another line,sine wave\n";
@@ -61,7 +61,7 @@
                     html += ann[i].text + "</span><br/>";
                   }
                   document.getElementById("list").innerHTML = html;
-                },
+                }
               }
           );
 
danvk/dygraphs fork supporting touch events