Commits

Chris Leonello committed 2329319

Fixed to use the non mimified excanvas from source. experimenting with various excanvas fixes.

Comments (0)

Files changed (10)

examples/axisLabelsRotatedText.html

 <head>
   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
 	      tickRenderer: $.jqplot.CanvasAxisTickRenderer,
 	      tickOptions: {
           angle: -30,
-          fontFamily: 'Times',
-          fontSize: '12pt'
+          fontFamily: 'Courier New',
+          fontSize: '9pt'
 	      }
 	      
 	    },

examples/axisLabelsRotatedText2.html

         // labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
         tickRenderer: $.jqplot.CanvasAxisTickRenderer,
         tickOptions: {
-          enableFontSupport: true,
+          // enableFontSupport: true,
             angle: -30
         }
         
         // labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
         tickRenderer: $.jqplot.CanvasAxisTickRenderer,
         tickOptions: {
-          enableFontSupport: true,
+          // enableFontSupport: true,
             angle: -30
         }
       }

examples/chartInTable.html

 <!DOCTYPE html>
 <html>
 <head>
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
     <script language="javascript" type="text/javascript" src="../src/excanvas.js"></script>
     <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
     <script language="javascript" type="text/javascript" src="../src/jquery.jqplot.js"></script>

examples/dataTracking.html

   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />
   
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
 

examples/exportImage.html

 <html lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=8"/>
 
   <title>Bar Charts</title>
   
   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="../examples/examples.css" />
+  <!--[if lt IE 7]>
+    <script type="text/javascript" src="../../flot/excanvas.js"></script>
+  <![endif]-->
+  <!--[if lt IE 7]>
+    <script type="text/javascript" src="../../explorercanvas/excanvas.js"></script>
+  <![endif]-->
   <!--[if lt IE 9]>
     <script type="text/javascript" src="../src/excanvas.js"></script>
   <![endif]-->
+  <!--[if lt IE 7]>
+    <script type="text/javascript" src="../../flashcanvas/src/flashcanvas.js"></script>
+  <![endif]-->
   
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.barRenderer.js"></script>
   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.canvasAxisTickRenderer.js"></script>
   <script language="javascript" type="text/javascript" src="../src/plugins/jqplot.canvasTextRenderer.js"></script>
+<!--   // <script language="javascript" type="text/javascript" src="../src/canvasHack.js"></script> -->
   <!-- END: load jqplot -->
 
   <style type="text/css">
     }
   </style>
   
-  <script class="code" type="text/javascript">
+  <script class="nocode" type="text/javascript">
 
-    $(document).ready(function () {
-      var s1 = [[0, 2], [1, 6], [2, 7], [3, 10]];
+    // $(document).ready(function () {
+    //   var s1 = [[0, 2], [1, 6], [2, 7], [3, 10]];
 
-      plot1 = $.jqplot("chart1", [s1], {
-        seriesDefaults:{
-        },
-        axes: {
-            xaxis: {
-            }
-        }
-      });
-    });
-
-    function getImage() {
-      var img = $('#chart1').jqplotToImage(0,0);
-      if (img) {
-        window.open (img.toDataURL("image/png"));
-      }
-    }
-
+    //   plot1 = $.jqplot("chart1", [s1], {
+    //     seriesDefaults:{
+    //     },
+    //     axes: {
+    //         xaxis: {
+    //         }
+    //     }
+    //   });
+    // });
 
 </script>
 
        renderer: $.jqplot.BarRenderer,
        rendererOptions: {
           barWidth: 20
-       },
-        shadowAngle: 135
+       }
      },
-     series: [{
-       label: 'User1'
-     },
-     {
-       label: 'User2'
-     }],
+     series: [{ label: 'User1' },{ label: 'User2' }],
      axes: {
         xaxis: {
          renderer: $.jqplot.CategoryAxisRenderer,
                   ticks: tickers,
                  rendererOptions: {
-                   tickRenderer: $.jqplot.CanvasAxisTickRenderer
+                   // tickRenderer: $.jqplot.CanvasAxisTickRenderer
                  },
          tickOptions: {
-           angle: -30
+           // angle: -30
          }
         },
        yaxis: {
 </script>
 
 
-<script type="text/javascript" src="example.js"></script>
+<!-- <script type="text/javascript" src="example.js"></script> -->
     
   </head>
   <body>
 <?php include "nav.inc"; ?>
         
-    <div id="chart1" style="margin-top:20px; margin-left:20px; width:300px; height:200px;"></div>
+<!--     <div id="chart1" style="margin-top:20px; margin-left:20px; width:300px; height:200px;"></div> -->
         
     <div id="chart2" style="margin-top:20px; margin-left:20px; width:300px; height:200px;"></div>
 
             btn = null;
         });
     }
+
+    // $('body').CanvasHack();
 });
 </script>
 

examples/fillToZero.html

   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />
   
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
 

examples/markerStyles.html

   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />
   
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>
 

examples/test2.html

 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <title>Simple Test</title>
- <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+ <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
 
  <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />

examples/zoomOptions.html

 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>Simple Test</title>
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   
   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />

examples/zoomProxy.html

   <link rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
   <link rel="stylesheet" type="text/css" href="examples.css" />
   
-  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.min.js"></script><![endif]-->
+  <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="../src/excanvas.js"></script><![endif]-->
   <!-- BEGIN: load jquery -->
   <script language="javascript" type="text/javascript" src="../src/jquery.js"></script>