Use SVN release of excanvas, hopefully this will make Flot work with IE

git-svn-id: https://flot.googlecode.com/svn/trunk@135 1e0a6537-2640-0410-bfb7-f154510ff394
pull/1/head
olau@iola.dk 17 years ago
parent 3a520603d0
commit f899a097a8

@ -69,7 +69,9 @@ Bug fixes:
prevent it from overlapping the plot itself. This also fixes a prevent it from overlapping the plot itself. This also fixes a
problem with anti-aliasing when the width is 1 pixel (reported by problem with anti-aliasing when the width is 1 pixel (reported by
Anthony Ettinger). Anthony Ettinger).
- Imported SVN version of excanvas and fixed an issue with the newer
version. Hopefully, this will make Flot work with IE8 (nudge by
Fabien Menager).
Flot 0.5 Flot 0.5
-------- --------

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title> <title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link> <link href="layout.css" rel="stylesheet" type="text/css"></link>
<!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]--> <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="../jquery.js"></script> <script language="javascript" type="text/javascript" src="../jquery.js"></script>
<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
</head> </head>

@ -28,80 +28,101 @@
// (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype) // (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype)
// or use Box Sizing Behavior from WebFX // or use Box Sizing Behavior from WebFX
// (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html) // (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
// * Non uniform scaling does not correctly scale strokes.
// * Optimize. There is always room for speed improvements. // * Optimize. There is always room for speed improvements.
// only add this code if we do not already have a canvas implementation // Only add this code if we do not already have a canvas implementation
if (!window.CanvasRenderingContext2D) { if (!document.createElement('canvas').getContext) {
(function () { (function() {
// alias some functions to make (compiled) code shorter // alias some functions to make (compiled) code shorter
var m = Math; var m = Math;
var mr = m.round; var mr = m.round;
var ms = m.sin; var ms = m.sin;
var mc = m.cos; var mc = m.cos;
var abs = m.abs;
var sqrt = m.sqrt;
// this is used for sub pixel precision // this is used for sub pixel precision
var Z = 10; var Z = 10;
var Z2 = Z / 2; var Z2 = Z / 2;
/**
* This funtion is assigned to the <canvas> elements as element.getContext().
* @this {HTMLElement}
* @return {CanvasRenderingContext2D_}
*/
function getContext() {
return this.context_ ||
(this.context_ = new CanvasRenderingContext2D_(this));
}
var slice = Array.prototype.slice;
/**
* Binds a function to an object. The returned function will always use the
* passed in {@code obj} as {@code this}.
*
* Example:
*
* g = bind(f, obj, a, b)
* g(c, d) // will do f.call(obj, a, b, c, d)
*
* @param {Function} f The function to bind the object to
* @param {Object} obj The object that should act as this when the function
* is called
* @param {*} var_args Rest arguments that will be used as the initial
* arguments when the function is called
* @return {Function} A new function that has bound this
*/
function bind(f, obj, var_args) {
var a = slice.call(arguments, 2);
return function() {
return f.apply(obj, a.concat(slice.call(arguments)));
};
}
var G_vmlCanvasManager_ = { var G_vmlCanvasManager_ = {
init: function (opt_doc) { init: function(opt_doc) {
var doc = opt_doc || document;
if (/MSIE/.test(navigator.userAgent) && !window.opera) { if (/MSIE/.test(navigator.userAgent) && !window.opera) {
var self = this; var doc = opt_doc || document;
doc.attachEvent("onreadystatechange", function () { // Create a dummy element so that IE will allow canvas elements to be
self.init_(doc); // recognized.
}); doc.createElement('canvas');
doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
} }
}, },
init_: function (doc) { init_: function(doc) {
if (doc.readyState == "complete") { // create xmlns
// create xmlns if (!doc.namespaces['g_vml_']) {
if (!doc.namespaces["g_vml_"]) { doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml',
doc.namespaces.add("g_vml_", "urn:schemas-microsoft-com:vml"); '#default#VML');
}
}
if (!doc.namespaces['g_o_']) {
doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office',
'#default#VML');
}
// setup default css // Setup default CSS. Only add one style sheet per document
if (!doc.styleSheets['ex_canvas_']) {
var ss = doc.createStyleSheet(); var ss = doc.createStyleSheet();
ss.cssText = "canvas{display:inline-block;overflow:hidden;" + ss.owningElement.id = 'ex_canvas_';
ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
// default size is 300x150 in Gecko and Opera // default size is 300x150 in Gecko and Opera
"text-align:left;width:300px;height:150px}" + 'text-align:left;width:300px;height:150px}' +
"g_vml_\\:*{behavior:url(#default#VML)}"; 'g_vml_\\:*{behavior:url(#default#VML)}' +
'g_o_\\:*{behavior:url(#default#VML)}';
// find all canvas elements
var els = doc.getElementsByTagName("canvas");
for (var i = 0; i < els.length; i++) {
if (!els[i].getContext) {
this.initElement(els[i]);
}
}
} }
},
fixElement_: function (el) { // find all canvas elements
// in IE before version 5.5 we would need to add HTML: to the tag name var els = doc.getElementsByTagName('canvas');
// but we do not care about IE before version 6 for (var i = 0; i < els.length; i++) {
var outerHTML = el.outerHTML; this.initElement(els[i]);
var newEl = el.ownerDocument.createElement(outerHTML);
// if the tag is still open IE has created the children as siblings and
// it has also created a tag with the name "/FOO"
if (outerHTML.slice(-2) != "/>") {
var tagName = "/" + el.tagName;
var ns;
// remove content
while ((ns = el.nextSibling) && ns.tagName != tagName) {
ns.removeNode();
}
// remove the incorrect closing tag
if (ns) {
ns.removeNode();
}
} }
el.parentNode.replaceChild(newEl, el);
return newEl;
}, },
/** /**
@ -112,35 +133,37 @@ if (!window.CanvasRenderingContext2D) {
* @param {HTMLElement} el The canvas element to initialize. * @param {HTMLElement} el The canvas element to initialize.
* @return {HTMLElement} the element that was created. * @return {HTMLElement} the element that was created.
*/ */
initElement: function (el) { initElement: function(el) {
el = this.fixElement_(el); if (!el.getContext) {
el.getContext = function () {
if (this.context_) { el.getContext = getContext;
return this.context_;
// Remove fallback content. There is no way to hide text nodes so we
// just remove all childNodes. We could hide all elements and remove
// text nodes but who really cares about the fallback content.
el.innerHTML = '';
// do not use inline function because that will leak memory
el.attachEvent('onpropertychange', onPropertyChange);
el.attachEvent('onresize', onResize);
var attrs = el.attributes;
if (attrs.width && attrs.width.specified) {
// TODO: use runtimeStyle and coordsize
// el.getContext().setWidth_(attrs.width.nodeValue);
el.style.width = attrs.width.nodeValue + 'px';
} else {
el.width = el.clientWidth;
} }
return this.context_ = new CanvasRenderingContext2D_(this); if (attrs.height && attrs.height.specified) {
}; // TODO: use runtimeStyle and coordsize
// el.getContext().setHeight_(attrs.height.nodeValue);
// do not use inline function because that will leak memory el.style.height = attrs.height.nodeValue + 'px';
el.attachEvent('onpropertychange', onPropertyChange); } else {
el.attachEvent('onresize', onResize); el.height = el.clientHeight;
}
var attrs = el.attributes; //el.getContext().setCoordsize_()
if (attrs.width && attrs.width.specified) {
// TODO: use runtimeStyle and coordsize
// el.getContext().setWidth_(attrs.width.nodeValue);
el.style.width = attrs.width.nodeValue + "px";
} else {
el.width = el.clientWidth;
}
if (attrs.height && attrs.height.specified) {
// TODO: use runtimeStyle and coordsize
// el.getContext().setHeight_(attrs.height.nodeValue);
el.style.height = attrs.height.nodeValue + "px";
} else {
el.height = el.clientHeight;
} }
//el.getContext().setCoordsize_()
return el; return el;
} }
}; };
@ -150,11 +173,11 @@ if (!window.CanvasRenderingContext2D) {
switch (e.propertyName) { switch (e.propertyName) {
case 'width': case 'width':
el.style.width = el.attributes.width.nodeValue + "px"; el.style.width = el.attributes.width.nodeValue + 'px';
el.getContext().clearRect(); el.getContext().clearRect();
break; break;
case 'height': case 'height':
el.style.height = el.attributes.height.nodeValue + "px"; el.style.height = el.attributes.height.nodeValue + 'px';
el.getContext().clearRect(); el.getContext().clearRect();
break; break;
} }
@ -214,43 +237,45 @@ if (!window.CanvasRenderingContext2D) {
o2.shadowOffsetX = o1.shadowOffsetX; o2.shadowOffsetX = o1.shadowOffsetX;
o2.shadowOffsetY = o1.shadowOffsetY; o2.shadowOffsetY = o1.shadowOffsetY;
o2.strokeStyle = o1.strokeStyle; o2.strokeStyle = o1.strokeStyle;
o2.globalAlpha = o1.globalAlpha;
o2.arcScaleX_ = o1.arcScaleX_; o2.arcScaleX_ = o1.arcScaleX_;
o2.arcScaleY_ = o1.arcScaleY_; o2.arcScaleY_ = o1.arcScaleY_;
o2.lineScale_ = o1.lineScale_;
} }
function processStyle(styleString) { function processStyle(styleString) {
var str, alpha = 1; var str, alpha = 1;
styleString = String(styleString); styleString = String(styleString);
if (styleString.substring(0, 3) == "rgb") { if (styleString.substring(0, 3) == 'rgb') {
var start = styleString.indexOf("(", 3); var start = styleString.indexOf('(', 3);
var end = styleString.indexOf(")", start + 1); var end = styleString.indexOf(')', start + 1);
var guts = styleString.substring(start + 1, end).split(","); var guts = styleString.substring(start + 1, end).split(',');
str = "#"; str = '#';
for (var i = 0; i < 3; i++) { for (var i = 0; i < 3; i++) {
str += dec2hex[Number(guts[i])]; str += dec2hex[Number(guts[i])];
} }
if ((guts.length == 4) && (styleString.substr(3, 1) == "a")) { if (guts.length == 4 && styleString.substr(3, 1) == 'a') {
alpha = guts[3]; alpha = guts[3];
} }
} else { } else {
str = styleString; str = styleString;
} }
return [str, alpha]; return {color: str, alpha: alpha};
} }
function processLineCap(lineCap) { function processLineCap(lineCap) {
switch (lineCap) { switch (lineCap) {
case "butt": case 'butt':
return "flat"; return 'flat';
case "round": case 'round':
return "round"; return 'round';
case "square": case 'square':
default: default:
return "square"; return 'square';
} }
} }
@ -260,7 +285,7 @@ if (!window.CanvasRenderingContext2D) {
* @param {HTMLElement} surfaceElement The element that the 2D context should * @param {HTMLElement} surfaceElement The element that the 2D context should
* be associated with * be associated with
*/ */
function CanvasRenderingContext2D_(surfaceElement) { function CanvasRenderingContext2D_(surfaceElement) {
this.m_ = createMatrixIdentity(); this.m_ = createMatrixIdentity();
this.mStack_ = []; this.mStack_ = [];
@ -268,12 +293,12 @@ if (!window.CanvasRenderingContext2D) {
this.currentPath_ = []; this.currentPath_ = [];
// Canvas context properties // Canvas context properties
this.strokeStyle = "#000"; this.strokeStyle = '#000';
this.fillStyle = "#000"; this.fillStyle = '#000';
this.lineWidth = 1; this.lineWidth = 1;
this.lineJoin = "miter"; this.lineJoin = 'miter';
this.lineCap = "butt"; this.lineCap = 'butt';
this.miterLimit = Z * 1; this.miterLimit = Z * 1;
this.globalAlpha = 1; this.globalAlpha = 1;
this.canvas = surfaceElement; this.canvas = surfaceElement;
@ -288,67 +313,88 @@ if (!window.CanvasRenderingContext2D) {
this.element_ = el; this.element_ = el;
this.arcScaleX_ = 1; this.arcScaleX_ = 1;
this.arcScaleY_ = 1; this.arcScaleY_ = 1;
this.lineScale_ = 1;
} }
var contextPrototype = CanvasRenderingContext2D_.prototype; var contextPrototype = CanvasRenderingContext2D_.prototype;
contextPrototype.clearRect = function() { contextPrototype.clearRect = function() {
this.element_.innerHTML = ""; this.element_.innerHTML = '';
this.currentPath_ = [];
}; };
contextPrototype.beginPath = function() { contextPrototype.beginPath = function() {
// TODO: Branch current matrix so that save/restore has no effect // TODO: Branch current matrix so that save/restore has no effect
// as per safari docs. // as per safari docs.
this.currentPath_ = []; this.currentPath_ = [];
}; };
contextPrototype.moveTo = function(aX, aY) { contextPrototype.moveTo = function(aX, aY) {
this.currentPath_.push({type: "moveTo", x: aX, y: aY}); var p = this.getCoords_(aX, aY);
this.currentX_ = aX; this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y});
this.currentY_ = aY; this.currentX_ = p.x;
this.currentY_ = p.y;
}; };
contextPrototype.lineTo = function(aX, aY) { contextPrototype.lineTo = function(aX, aY) {
this.currentPath_.push({type: "lineTo", x: aX, y: aY}); var p = this.getCoords_(aX, aY);
this.currentX_ = aX; this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y});
this.currentY_ = aY;
this.currentX_ = p.x;
this.currentY_ = p.y;
}; };
contextPrototype.bezierCurveTo = function(aCP1x, aCP1y, contextPrototype.bezierCurveTo = function(aCP1x, aCP1y,
aCP2x, aCP2y, aCP2x, aCP2y,
aX, aY) { aX, aY) {
this.currentPath_.push({type: "bezierCurveTo", var p = this.getCoords_(aX, aY);
cp1x: aCP1x, var cp1 = this.getCoords_(aCP1x, aCP1y);
cp1y: aCP1y, var cp2 = this.getCoords_(aCP2x, aCP2y);
cp2x: aCP2x, bezierCurveTo(this, cp1, cp2, p);
cp2y: aCP2y,
x: aX,
y: aY});
this.currentX_ = aX;
this.currentY_ = aY;
}; };
// Helper function that takes the already fixed cordinates.
function bezierCurveTo(self, cp1, cp2, p) {
self.currentPath_.push({
type: 'bezierCurveTo',
cp1x: cp1.x,
cp1y: cp1.y,
cp2x: cp2.x,
cp2y: cp2.y,
x: p.x,
y: p.y
});
self.currentX_ = p.x;
self.currentY_ = p.y;
}
contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) { contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) {
// the following is lifted almost directly from // the following is lifted almost directly from
// http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
var cp1x = this.currentX_ + 2.0 / 3.0 * (aCPx - this.currentX_);
var cp1y = this.currentY_ + 2.0 / 3.0 * (aCPy - this.currentY_); var cp = this.getCoords_(aCPx, aCPy);
var cp2x = cp1x + (aX - this.currentX_) / 3.0; var p = this.getCoords_(aX, aY);
var cp2y = cp1y + (aY - this.currentY_) / 3.0;
this.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, aX, aY); var cp1 = {
x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_),
y: this.currentY_ + 2.0 / 3.0 * (cp.y - this.currentY_)
};
var cp2 = {
x: cp1.x + (p.x - this.currentX_) / 3.0,
y: cp1.y + (p.y - this.currentY_) / 3.0
};
bezierCurveTo(this, cp1, cp2, p);
}; };
contextPrototype.arc = function(aX, aY, aRadius, contextPrototype.arc = function(aX, aY, aRadius,
aStartAngle, aEndAngle, aClockwise) { aStartAngle, aEndAngle, aClockwise) {
aRadius *= Z; aRadius *= Z;
var arcType = aClockwise ? "at" : "wa"; var arcType = aClockwise ? 'at' : 'wa';
var xStart = aX + (mc(aStartAngle) * aRadius) - Z2; var xStart = aX + mc(aStartAngle) * aRadius - Z2;
var yStart = aY + (ms(aStartAngle) * aRadius) - Z2; var yStart = aY + ms(aStartAngle) * aRadius - Z2;
var xEnd = aX + (mc(aEndAngle) * aRadius) - Z2; var xEnd = aX + mc(aEndAngle) * aRadius - Z2;
var yEnd = aY + (ms(aEndAngle) * aRadius) - Z2; var yEnd = aY + ms(aEndAngle) * aRadius - Z2;
// IE won't render arches drawn counter clockwise if xStart == xEnd. // IE won't render arches drawn counter clockwise if xStart == xEnd.
if (xStart == xEnd && !aClockwise) { if (xStart == xEnd && !aClockwise) {
@ -356,14 +402,18 @@ if (!window.CanvasRenderingContext2D) {
// that can be represented in binary // that can be represented in binary
} }
var p = this.getCoords_(aX, aY);
var pStart = this.getCoords_(xStart, yStart);
var pEnd = this.getCoords_(xEnd, yEnd);
this.currentPath_.push({type: arcType, this.currentPath_.push({type: arcType,
x: aX, x: p.x,
y: aY, y: p.y,
radius: aRadius, radius: aRadius,
xStart: xStart, xStart: pStart.x,
yStart: yStart, yStart: pStart.y,
xEnd: xEnd, xEnd: pEnd.x,
yEnd: yEnd}); yEnd: pEnd.y});
}; };
@ -376,44 +426,55 @@ if (!window.CanvasRenderingContext2D) {
}; };
contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) { contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) {
// Will destroy any existing path (same as FF behaviour) var oldPath = this.currentPath_;
this.beginPath(); this.beginPath();
this.moveTo(aX, aY); this.moveTo(aX, aY);
this.lineTo(aX + aWidth, aY); this.lineTo(aX + aWidth, aY);
this.lineTo(aX + aWidth, aY + aHeight); this.lineTo(aX + aWidth, aY + aHeight);
this.lineTo(aX, aY + aHeight); this.lineTo(aX, aY + aHeight);
this.closePath(); this.closePath();
this.stroke(); this.stroke();
this.currentPath_ = oldPath;
}; };
contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) { contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) {
// Will destroy any existing path (same as FF behaviour) var oldPath = this.currentPath_;
this.beginPath(); this.beginPath();
this.moveTo(aX, aY); this.moveTo(aX, aY);
this.lineTo(aX + aWidth, aY); this.lineTo(aX + aWidth, aY);
this.lineTo(aX + aWidth, aY + aHeight); this.lineTo(aX + aWidth, aY + aHeight);
this.lineTo(aX, aY + aHeight); this.lineTo(aX, aY + aHeight);
this.closePath(); this.closePath();
this.fill(); this.fill();
this.currentPath_ = oldPath;
}; };
contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) { contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) {
var gradient = new CanvasGradient_("gradient"); var gradient = new CanvasGradient_('gradient');
gradient.x0_ = aX0;
gradient.y0_ = aY0;
gradient.x1_ = aX1;
gradient.y1_ = aY1;
return gradient; return gradient;
}; };
contextPrototype.createRadialGradient = function(aX0, aY0, contextPrototype.createRadialGradient = function(aX0, aY0, aR0,
aR0, aX1, aX1, aY1, aR1) {
aY1, aR1) { var gradient = new CanvasGradient_('gradientradial');
var gradient = new CanvasGradient_("gradientradial"); gradient.x0_ = aX0;
gradient.radius1_ = aR0; gradient.y0_ = aY0;
gradient.radius2_ = aR1; gradient.r0_ = aR0;
gradient.focus_.x = aX0; gradient.x1_ = aX1;
gradient.focus_.y = aY0; gradient.y1_ = aY1;
gradient.r1_ = aR1;
return gradient; return gradient;
}; };
contextPrototype.drawImage = function (image, var_args) { contextPrototype.drawImage = function(image, var_args) {
var dx, dy, dw, dh, sx, sy, sw, sh; var dx, dy, dw, dh, sx, sy, sw, sh;
// to find the original width we overide the width and height // to find the original width we overide the width and height
@ -454,7 +515,7 @@ if (!window.CanvasRenderingContext2D) {
dw = arguments[7]; dw = arguments[7];
dh = arguments[8]; dh = arguments[8];
} else { } else {
throw "Invalid number of arguments"; throw Error('Invalid number of arguments');
} }
var d = this.getCoords_(dx, dy); var d = this.getCoords_(dx, dy);
@ -471,7 +532,7 @@ if (!window.CanvasRenderingContext2D) {
vmlStr.push(' <g_vml_:group', vmlStr.push(' <g_vml_:group',
' coordsize="', Z * W, ',', Z * H, '"', ' coordsize="', Z * W, ',', Z * H, '"',
' coordorigin="0,0"' , ' coordorigin="0,0"' ,
' style="width:', W, ';height:', H, ';position:absolute;'); ' style="width:', W, 'px;height:', H, 'px;position:absolute;');
// If filters are necessary (rotation exists), create them // If filters are necessary (rotation exists), create them
// filters are bog-slow, so only create them if abbsolutely necessary // filters are bog-slow, so only create them if abbsolutely necessary
@ -482,12 +543,12 @@ if (!window.CanvasRenderingContext2D) {
var filter = []; var filter = [];
// Note the 12/21 reversal // Note the 12/21 reversal
filter.push("M11='", this.m_[0][0], "',", filter.push('M11=', this.m_[0][0], ',',
"M12='", this.m_[1][0], "',", 'M12=', this.m_[1][0], ',',
"M21='", this.m_[0][1], "',", 'M21=', this.m_[0][1], ',',
"M22='", this.m_[1][1], "',", 'M22=', this.m_[1][1], ',',
"Dx='", mr(d.x / Z), "',", 'Dx=', mr(d.x / Z), ',',
"Dy='", mr(d.y / Z), "'"); 'Dy=', mr(d.y / Z), '');
// Bounding box calculation (need to minimize displayed area so that // Bounding box calculation (need to minimize displayed area so that
// filters don't waste time on unused pixels. // filters don't waste time on unused pixels.
@ -496,20 +557,20 @@ if (!window.CanvasRenderingContext2D) {
var c3 = this.getCoords_(dx, dy + dh); var c3 = this.getCoords_(dx, dy + dh);
var c4 = this.getCoords_(dx + dw, dy + dh); var c4 = this.getCoords_(dx + dw, dy + dh);
max.x = Math.max(max.x, c2.x, c3.x, c4.x); max.x = m.max(max.x, c2.x, c3.x, c4.x);
max.y = Math.max(max.y, c2.y, c3.y, c4.y); max.y = m.max(max.y, c2.y, c3.y, c4.y);
vmlStr.push("padding:0 ", mr(max.x / Z), "px ", mr(max.y / Z), vmlStr.push('padding:0 ', mr(max.x / Z), 'px ', mr(max.y / Z),
"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(", 'px 0;filter:progid:DXImageTransform.Microsoft.Matrix(',
filter.join(""), ", sizingmethod='clip');"); filter.join(''), ", sizingmethod='clip');")
} else { } else {
vmlStr.push("top:", mr(d.y / Z), "px;left:", mr(d.x / Z), "px;"); vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;');
} }
vmlStr.push(' ">' , vmlStr.push(' ">' ,
'<g_vml_:image src="', image.src, '"', '<g_vml_:image src="', image.src, '"',
' style="width:', Z * dw, ';', ' style="width:', Z * dw, 'px;',
' height:', Z * dh, ';"', ' height:', Z * dh, 'px;"',
' cropleft="', sx / w, '"', ' cropleft="', sx / w, '"',
' croptop="', sy / h, '"', ' croptop="', sy / h, '"',
' cropright="', (w - sx - sw) / w, '"', ' cropright="', (w - sx - sw) / w, '"',
@ -517,28 +578,25 @@ if (!window.CanvasRenderingContext2D) {
' />', ' />',
'</g_vml_:group>'); '</g_vml_:group>');
this.element_.insertAdjacentHTML("BeforeEnd", this.element_.insertAdjacentHTML('BeforeEnd',
vmlStr.join("")); vmlStr.join(''));
}; };
contextPrototype.stroke = function(aFill) { contextPrototype.stroke = function(aFill) {
var lineStr = []; var lineStr = [];
var lineOpen = false; var lineOpen = false;
var a = processStyle(aFill ? this.fillStyle : this.strokeStyle); var a = processStyle(aFill ? this.fillStyle : this.strokeStyle);
var color = a[0]; var color = a.color;
var opacity = a[1] * this.globalAlpha; var opacity = a.alpha * this.globalAlpha;
var W = 10; var W = 10;
var H = 10; var H = 10;
lineStr.push('<g_vml_:shape', lineStr.push('<g_vml_:shape',
' fillcolor="', color, '"', ' filled="', !!aFill, '"',
' filled="', Boolean(aFill), '"', ' style="position:absolute;width:', W, 'px;height:', H, 'px;"',
' style="position:absolute;width:', W, ';height:', H, ';"',
' coordorigin="0 0" coordsize="', Z * W, ' ', Z * H, '"', ' coordorigin="0 0" coordsize="', Z * W, ' ', Z * H, '"',
' stroked="', !aFill, '"', ' stroked="', !aFill, '"',
' strokeweight="', this.lineWidth, '"',
' strokecolor="', color, '"',
' path="'); ' path="');
var newSeq = false; var newSeq = false;
@ -547,37 +605,36 @@ if (!window.CanvasRenderingContext2D) {
for (var i = 0; i < this.currentPath_.length; i++) { for (var i = 0; i < this.currentPath_.length; i++) {
var p = this.currentPath_[i]; var p = this.currentPath_[i];
var c;
if (p.type == "moveTo") {
lineStr.push(" m "); switch (p.type) {
var c = this.getCoords_(p.x, p.y); case 'moveTo':
lineStr.push(mr(c.x), ",", mr(c.y)); c = p;
} else if (p.type == "lineTo") { lineStr.push(' m ', mr(p.x), ',', mr(p.y));
lineStr.push(" l "); break;
var c = this.getCoords_(p.x, p.y); case 'lineTo':
lineStr.push(mr(c.x), ",", mr(c.y)); lineStr.push(' l ', mr(p.x), ',', mr(p.y));
} else if (p.type == "close") { break;
lineStr.push(" x "); case 'close':
} else if (p.type == "bezierCurveTo") { lineStr.push(' x ');
lineStr.push(" c "); p = null;
var c = this.getCoords_(p.x, p.y); break;
var c1 = this.getCoords_(p.cp1x, p.cp1y); case 'bezierCurveTo':
var c2 = this.getCoords_(p.cp2x, p.cp2y); lineStr.push(' c ',
lineStr.push(mr(c1.x), ",", mr(c1.y), ",", mr(p.cp1x), ',', mr(p.cp1y), ',',
mr(c2.x), ",", mr(c2.y), ",", mr(p.cp2x), ',', mr(p.cp2y), ',',
mr(c.x), ",", mr(c.y)); mr(p.x), ',', mr(p.y));
} else if (p.type == "at" || p.type == "wa") { break;
lineStr.push(" ", p.type, " "); case 'at':
var c = this.getCoords_(p.x, p.y); case 'wa':
var cStart = this.getCoords_(p.xStart, p.yStart); lineStr.push(' ', p.type, ' ',
var cEnd = this.getCoords_(p.xEnd, p.yEnd); mr(p.x - this.arcScaleX_ * p.radius), ',',
mr(p.y - this.arcScaleY_ * p.radius), ' ',
lineStr.push(mr(c.x - this.arcScaleX_ * p.radius), ",", mr(p.x + this.arcScaleX_ * p.radius), ',',
mr(c.y - this.arcScaleY_ * p.radius), " ", mr(p.y + this.arcScaleY_ * p.radius), ' ',
mr(c.x + this.arcScaleX_ * p.radius), ",", mr(p.xStart), ',', mr(p.yStart), ' ',
mr(c.y + this.arcScaleY_ * p.radius), " ", mr(p.xEnd), ',', mr(p.yEnd));
mr(cStart.x), ",", mr(cStart.y), " ", break;
mr(cEnd.x), ",", mr(cEnd.y));
} }
@ -586,114 +643,144 @@ if (!window.CanvasRenderingContext2D) {
// Figure out dimensions so we can do gradient fills // Figure out dimensions so we can do gradient fills
// properly // properly
if(c) { if (p) {
if (min.x == null || c.x < min.x) { if (min.x == null || p.x < min.x) {
min.x = c.x; min.x = p.x;
} }
if (max.x == null || c.x > max.x) { if (max.x == null || p.x > max.x) {
max.x = c.x; max.x = p.x;
} }
if (min.y == null || c.y < min.y) { if (min.y == null || p.y < min.y) {
min.y = c.y; min.y = p.y;
} }
if (max.y == null || c.y > max.y) { if (max.y == null || p.y > max.y) {
max.y = c.y; max.y = p.y;
} }
} }
} }
lineStr.push(' ">'); lineStr.push(' ">');
if (typeof this.fillStyle == "object") { if (!aFill) {
var focus = {x: "50%", y: "50%"}; var lineWidth = this.lineScale_ * this.lineWidth;
var width = (max.x - min.x);
var height = (max.y - min.y);
var dimension = (width > height) ? width : height;
focus.x = mr((this.fillStyle.focus_.x / width) * 100 + 50) + "%"; // VML cannot correctly render a line if the width is less than 1px.
focus.y = mr((this.fillStyle.focus_.y / height) * 100 + 50) + "%"; // In that case, we dilute the color to make the line look thinner.
if (lineWidth < 1) {
var colors = []; opacity *= lineWidth;
}
// inside radius (%) lineStr.push(
if (this.fillStyle.type_ == "gradientradial") { '<g_vml_:stroke',
var inside = (this.fillStyle.radius1_ / dimension * 100); ' opacity="', opacity, '"',
' joinstyle="', this.lineJoin, '"',
' miterlimit="', this.miterLimit, '"',
' endcap="', processLineCap(this.lineCap), '"',
' weight="', lineWidth, 'px"',
' color="', color, '" />'
);
} else if (typeof this.fillStyle == 'object') {
var fillStyle = this.fillStyle;
var angle = 0;
var focus = {x: 0, y: 0};
// additional offset
var shift = 0;
// scale factor for offset
var expansion = 1;
if (fillStyle.type_ == 'gradient') {
var x0 = fillStyle.x0_ / this.arcScaleX_;
var y0 = fillStyle.y0_ / this.arcScaleY_;
var x1 = fillStyle.x1_ / this.arcScaleX_;
var y1 = fillStyle.y1_ / this.arcScaleY_;
var p0 = this.getCoords_(x0, y0);
var p1 = this.getCoords_(x1, y1);
var dx = p1.x - p0.x;
var dy = p1.y - p0.y;
angle = Math.atan2(dx, dy) * 180 / Math.PI;
// The angle should be a non-negative number.
if (angle < 0) {
angle += 360;
}
// percentage that outside radius exceeds inside radius // Very small angles produce an unexpected result because they are
var expansion = (this.fillStyle.radius2_ / dimension * 100) - inside; // converted to a scientific notation string.
if (angle < 1e-6) {
angle = 0;
}
} else { } else {
var inside = 0; var p0 = this.getCoords_(fillStyle.x0_, fillStyle.y0_);
var expansion = 100; var width = max.x - min.x;
var height = max.y - min.y;
focus = {
x: (p0.x - min.x) / width,
y: (p0.y - min.y) / height
};
width /= this.arcScaleX_ * Z;
height /= this.arcScaleY_ * Z;
var dimension = m.max(width, height);
shift = 2 * fillStyle.r0_ / dimension;
expansion = 2 * fillStyle.r1_ / dimension - shift;
} }
var insidecolor = {offset: null, color: null}; // We need to sort the color stops in ascending order by offset,
var outsidecolor = {offset: null, color: null}; // otherwise IE won't interpret it correctly.
var stops = fillStyle.colors_;
// We need to sort 'colors' by percentage, from 0 > 100 otherwise ie stops.sort(function(cs1, cs2) {
// won't interpret it correctly
this.fillStyle.colors_.sort(function (cs1, cs2) {
return cs1.offset - cs2.offset; return cs1.offset - cs2.offset;
}); });
for (var i = 0; i < this.fillStyle.colors_.length; i++) { var length = stops.length;
var fs = this.fillStyle.colors_[i]; var color1 = stops[0].color;
var color2 = stops[length - 1].color;
colors.push( (fs.offset * expansion) + inside, "% ", fs.color, ","); var opacity1 = stops[0].alpha * this.globalAlpha;
var opacity2 = stops[length - 1].alpha * this.globalAlpha;
if (fs.offset > insidecolor.offset || insidecolor.offset == null) { var colors = [];
insidecolor.offset = fs.offset; for (var i = 0; i < length; i++) {
insidecolor.color = fs.color; var stop = stops[i];
} colors.push(stop.offset * expansion + shift + ' ' + stop.color);
if (fs.offset < outsidecolor.offset || outsidecolor.offset == null) {
outsidecolor.offset = fs.offset;
outsidecolor.color = fs.color;
}
} }
colors.pop();
// When colors attribute is used, the meanings of opacity and o:opacity2
lineStr.push('<g_vml_:fill', // are reversed.
' color="', outsidecolor.color, '"', lineStr.push('<g_vml_:fill type="', fillStyle.type_, '"',
' color2="', insidecolor.color, '"', ' method="none" focus="100%"',
' type="', this.fillStyle.type_, '"', ' color="', color1, '"',
' focusposition="', focus.x, ', ', focus.y, '"', ' color2="', color2, '"',
' colors="', colors.join(""), '"', ' colors="', colors.join(','), '"',
' opacity="', opacity, '" />'); ' opacity="', opacity2, '"',
} else if (aFill) { ' g_o_:opacity2="', opacity1, '"',
lineStr.push('<g_vml_:fill color="', color, '" opacity="', opacity, '" />'); ' angle="', angle, '"',
' focusposition="', focus.x, ',', focus.y, '" />');
} else { } else {
lineStr.push( lineStr.push('<g_vml_:fill color="', color, '" opacity="', opacity,
'<g_vml_:stroke', '" />');
' opacity="', opacity,'"',
' joinstyle="', this.lineJoin, '"',
' miterlimit="', this.miterLimit, '"',
' endcap="', processLineCap(this.lineCap) ,'"',
' weight="', this.lineWidth, 'px"',
' color="', color,'" />'
);
} }
lineStr.push("</g_vml_:shape>"); lineStr.push('</g_vml_:shape>');
this.element_.insertAdjacentHTML("beforeEnd", lineStr.join("")); this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
//this.currentPath_ = [];
}; };
contextPrototype.fill = function() { contextPrototype.fill = function() {
this.stroke(true); this.stroke(true);
}; }
contextPrototype.closePath = function() { contextPrototype.closePath = function() {
this.currentPath_.push({type: "close"}); this.currentPath_.push({type: 'close'});
}; };
/** /**
* @private * @private
*/ */
contextPrototype.getCoords_ = function(aX, aY) { contextPrototype.getCoords_ = function(aX, aY) {
var m = this.m_;
return { return {
x: Z * (aX * this.m_[0][0] + aY * this.m_[1][0] + this.m_[2][0]) - Z2, x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
y: Z * (aX * this.m_[0][1] + aY * this.m_[1][1] + this.m_[2][1]) - Z2 y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
} }
}; };
@ -742,7 +829,14 @@ if (!window.CanvasRenderingContext2D) {
[0, 0, 1] [0, 0, 1]
]; ];
this.m_ = matrixMultiply(m1, this.m_); var m = this.m_ = matrixMultiply(m1, this.m_);
// Get the line scale.
// Determinant of this.m_ means how much the area is enlarged by the
// transformation. So its square root can be used as a scale factor
// for width.
var det = m[0][0] * m[1][1] - m[0][1] * m[1][0];
this.lineScale_ = sqrt(abs(det));
}; };
/******** STUBS ********/ /******** STUBS ********/
@ -761,15 +855,20 @@ if (!window.CanvasRenderingContext2D) {
// Gradient / Pattern Stubs // Gradient / Pattern Stubs
function CanvasGradient_(aType) { function CanvasGradient_(aType) {
this.type_ = aType; this.type_ = aType;
this.radius1_ = 0; this.x0_ = 0;
this.radius2_ = 0; this.y0_ = 0;
this.r0_ = 0;
this.x1_ = 0;
this.y1_ = 0;
this.r1_ = 0;
this.colors_ = []; this.colors_ = [];
this.focus_ = {x: 0, y: 0};
} }
CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) { CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) {
aColor = processStyle(aColor); aColor = processStyle(aColor);
this.colors_.push({offset: 1-aOffset, color: aColor}); this.colors_.push({offset: aOffset,
color: aColor.color,
alpha: aColor.alpha});
}; };
function CanvasPattern_() {} function CanvasPattern_() {}

1
excanvas.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -328,6 +328,15 @@
} }
function constructCanvas() { function constructCanvas() {
function makeCanvas(width, height) {
var c = document.createElement('canvas');
c.width = width;
c.height = height;
if ($.browser.msie) // excanvas hack
c = window.G_vmlCanvasManager.initElement(c);
return c;
}
canvasWidth = target.width(); canvasWidth = target.width();
canvasHeight = target.height(); canvasHeight = target.height();
target.html(""); // clear target target.html(""); // clear target
@ -338,15 +347,13 @@
throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight; throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight;
// the canvas // the canvas
canvas = $('<canvas width="' + canvasWidth + '" height="' + canvasHeight + '"></canvas>').appendTo(target).get(0); canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(target).get(0);
if ($.browser.msie) // excanvas hack
canvas = window.G_vmlCanvasManager.initElement(canvas);
ctx = canvas.getContext("2d"); ctx = canvas.getContext("2d");
// overlay = $('<canvas style="position:absolute;left:0px;top:0px;" width="' + canvasWidth + '" height="' + canvasHeight + '"></canvas>').appendTo(target).get(0);
// overlay canvas for interactive features // overlay canvas for interactive features
overlay = $('<canvas style="position:absolute;left:0px;top:0px;" width="' + canvasWidth + '" height="' + canvasHeight + '"></canvas>').appendTo(target).get(0); overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(target).get(0);
if ($.browser.msie) // excanvas hack
overlay = window.G_vmlCanvasManager.initElement(overlay);
octx = overlay.getContext("2d"); octx = overlay.getContext("2d");
// we include the canvas in the event holder too, because IE 7 // we include the canvas in the event holder too, because IE 7

Loading…
Cancel
Save