Changeset 18

Timestamp:

01/05/06 00:33:11 (2 years ago)

Author:

al

Message:

Replacing IECanvas.htc with excanvas.js

Files:

• plotkit/trunk/PlotKit/Base.js (modified) (2 diffs)
• plotkit/trunk/PlotKit/Canvas.js (modified) (4 diffs)
• plotkit/trunk/PlotKit/excanvas.js (added)
• plotkit/trunk/PlotKit/iecanvas.htc (deleted)
• plotkit/trunk/doc/SVGCanvasCompat.html (modified) (3 diffs)
• plotkit/trunk/doc/SVGCanvasCompat.txt (modified) (3 diffs)
• plotkit/trunk/tests/basic.html (modified) (1 diff)
• plotkit/trunk/tests/basic.js (modified) (1 diff)
• plotkit/trunk/tests/sweet.html (modified) (1 diff)

plotkit/trunk/PlotKit/Base.js

@@ -179 +179 @@
-    },
-    
-
-
-
-
+
+
+
+
+
+
+
+
-    // http://www.quirksmode.org/js/findpos.html
-
@@ -313 +317 @@
-   "roundInterval",
-   "uniq",
+   "excanvasSupported"
-];
-

plotkit/trunk/PlotKit/Canvas.js

@@ -11 +11 @@
-    
-    It uses DIVs for labels.
-    
-    Notes About IE Support
-    ----------------------
-    
-    This class relies on iecanvas.htc for Canvas Emulation under IE[1].
-    iecanvas.htc is included in the distribution of PlotKit for convenience. In order to enable IE support, you must set the following option when initialising the renderer:
-    
-    var renderOptions = {
-        "IECanvasHTC": "contrib/iecanvas.htc"
-    };
-    var engine = new CanvasRenderer(canvasElement, layout, renderOptions);
-    
-    Where "contrib/iecanvas.htc" is the path to the htc behavior relative
-    to where your HTML is.
-    
-    This is only needed for IE support.
-    
-    Copyright
@@ -98 +82 @@
-                "axisLabelWidth": 50,
-                "pieRadius": 0.4,
-
-
+
-    };
-    MochiKit.Base.update(this.options, options ? options : {});
-
-    // we need to refetch the element because of this horrible Canvas on IE
-    // crap
-    this.element_id = element.id ? element.id : element;
-
-    // Stuff relating to Canvas on IE support
-    var self = PlotKit.CanvasRenderer;
-    this.isIE = self.IECanvasEmulationIfNeeded(this.options.IECanvasHTC);
-    this.IEDelay = 0.5;
-    this.maxTries = 5;
-    this.renderDelay = null;
-    this.clearDelay = null;
-
-    this.layout = layout;
-    this.style = layout.style;
-
-
+
-    this.container = this.element.parentNode;
+
+    // Stuff relating to Canvas on IE support    
+    this.isIE = PlotKit.Base.excanvasSupported();
+
+    if (this.isIE) {
+        this.IEDelay = 0.5;
+        this.maxTries = 5;
+        this.renderDelay = null;
+        this.clearDelay = null;
+        this.element = G_vmlCanvasManager.initElement(this.element);
+    }
+
-    this.height = this.element.height;
-    this.width = this.element.width;
@@ -159 +141 @@
-        // still experimental
-    }
-};
-
-PlotKit.CanvasRenderer.IECanvasEmulationIfNeeded = function(htc) {
-    var ie = navigator.appVersion.match(/MSIE (\d\.\d)/);
-    var opera = (navigator.userAgent.toLowerCase().indexOf("opera") != -1);
-    if ((!ie) || (ie[1] < 6) || (opera))
-        return false;
-
-    if (isUndefinedOrNull(MochiKit.DOM.getElement('VMLRender'))) {
-        // before we add VMLRender, we need to recreate all canvas tags
-        // programmatically otherwise IE will not recognise it
-
-        var nodes = document.getElementsByTagName('canvas');
-        for (var i = 0; i < nodes.length; i++) {
-            var node = nodes[i];
-            if (node.getContext) { return; } // Other implementation, abort
-            var newNode = MochiKit.DOM.CANVAS(
-               {id: node.id, 
-                width: "" + parseInt(node.width),
-                height: "" + parseInt(node.height)}, "");
-            newNode.style.width = parseInt(node.width) + "px";
-            newNode.style.height = parseInt(node.height) + "px";
-            node.id = node.id + "_old";
-            MochiKit.DOM.swapDOM(node, newNode);
-        }
-
-        document.namespaces.add("v");
-        var vmlopts = {'id':'VMLRender',
-                       'codebase':'vgx.dll',
-                       'classid':'CLSID:10072CEC-8CC1-11D1-986E-00A0C955B42E'};
-        var vml = MochiKit.DOM.createDOM('object', vmlopts);
-        document.body.appendChild(vml);
-        var vmlStyle = document.createStyleSheet();
-        vmlStyle.addRule("canvas", "behavior: url('" + htc + "');");
-        vmlStyle.addRule("v\\:*", "behavior: url(#VMLRender);");
-    }
-    return true;
-};
-
@@ -594 +539 @@
-    context.clearRect(0, 0, this.width, this.height);
-
-
-
-
-
-
-
-
+
+
-    this.xlabels = new Array();
-    this.ylabels = new Array();
-
-
+
+
+
+
+
-
-PlotKit.CanvasRenderer.prototype._initialiseEvents = function() {

plotkit/trunk/doc/SVGCanvasCompat.html

@@ -36 +36 @@
-
-<h1> State of SVG and Canvas in Modern Browsers</h1>
-15 March
+27 April
-</p>
-<p>My friends, just like HTML and CSS, different browsers support
@@ -106 +106 @@
-<h2> Quirks</h2>
-<ul>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- <li><p> <strong>Opera</strong> will not obey <code>stroke()</code> for arc paths.
-</p>
@@ -203 +201 @@
-
- <li><p> <strong>Opera 9</strong> will refuse to draw an element if attribute <code>filter</code>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-<h1> Disclaimer</h1>

plotkit/trunk/doc/SVGCanvasCompat.txt

@@ -14 +14 @@
-==========================================
-
-15 March
+27 April
-
-
@@ -66 +66 @@
-
-* __Safari__ will forget a path after ``fill()`` or ``stroke()`` has
-
-
+  
+  
-
-* __Opera__ will not obey ``stroke()`` for arc paths.
@@ -120 +120 @@
-
-* __Opera 9__ will refuse to draw an element if attribute ``filter``
-  
+
-
-
-
+
-
-

plotkit/trunk/tests/basic.html

@@ -9 +9 @@
-   type="text/css" />
-   <script src="/js/mochi/MochiKit.js" type="text/javascript"></script>
-
-
-
+
+
+
+
-   <script src="/js/plotkit-tests/basic.js" type="text/javascript"></script>
+
-</head>
-

plotkit/trunk/tests/basic.js

@@ -94 +94 @@
-    tests.appendChild(generateUnitTest(1, genericTest, simpleData1,
-    "bar", ""));
+
-    tests.appendChild(generateUnitTest(2, genericTest, simpleData1, 
-    "line", ""));

plotkit/trunk/tests/sweet.html

@@ -8 +8 @@
-   <link href="tests.css" media="screen" rel="Stylesheet" type="text/css" />
-   <script src="/js/mochi/MochiKit.js" type="text/javascript"></script>
-
-
-
-
+
+
+
+
+
-   <script src="/js/plotkit-tests/sweet.js" type="text/javascript"></script>
-</head>