Commit f899a097 authored by olau@iola.dk's avatar olau@iola.dk

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
parent 3a520603
...@@ -69,7 +69,9 @@ Bug fixes: ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 // find all canvas elements
var els = doc.getElementsByTagName("canvas"); var els = doc.getElementsByTagName('canvas');
for (var i = 0; i < els.length; i++) { for (var i = 0; i < els.length; i++) {
if (!els[i].getContext) {
this.initElement(els[i]); this.initElement(els[i]);
} }
}
}
},
fixElement_: function (el) {
// in IE before version 5.5 we would need to add HTML: to the tag name
// but we do not care about IE before version 6
var outerHTML = el.outerHTML;
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,14 +133,15 @@ if (!window.CanvasRenderingContext2D) { ...@@ -112,14 +133,15 @@ 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
return this.context_ = new CanvasRenderingContext2D_(this); // 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 // do not use inline function because that will leak memory
el.attachEvent('onpropertychange', onPropertyChange); el.attachEvent('onpropertychange', onPropertyChange);
...@@ -129,18 +151,19 @@ if (!window.CanvasRenderingContext2D) { ...@@ -129,18 +151,19 @@ if (!window.CanvasRenderingContext2D) {
if (attrs.width && attrs.width.specified) { if (attrs.width && attrs.width.specified) {
// TODO: use runtimeStyle and coordsize // TODO: use runtimeStyle and coordsize
// el.getContext().setWidth_(attrs.width.nodeValue); // el.getContext().setWidth_(attrs.width.nodeValue);
el.style.width = attrs.width.nodeValue + "px"; el.style.width = attrs.width.nodeValue + 'px';
} else { } else {
el.width = el.clientWidth; el.width = el.clientWidth;
} }
if (attrs.height && attrs.height.specified) { if (attrs.height && attrs.height.specified) {
// TODO: use runtimeStyle and coordsize // TODO: use runtimeStyle and coordsize
// el.getContext().setHeight_(attrs.height.nodeValue); // el.getContext().setHeight_(attrs.height.nodeValue);
el.style.height = attrs.height.nodeValue + "px"; el.style.height = attrs.height.nodeValue + 'px';
} else { } else {
el.height = el.clientHeight; el.height = el.clientHeight;
} }
//el.getContext().setCoordsize_() //el.getContext().setCoordsize_()
}
return el; return el;
} }
}; };
...@@ -150,11 +173,11 @@ if (!window.CanvasRenderingContext2D) { ...@@ -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) { ...@@ -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';
} }
} }
...@@ -268,12 +293,12 @@ if (!window.CanvasRenderingContext2D) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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") { switch (p.type) {
lineStr.push(" m "); case 'moveTo':
var c = this.getCoords_(p.x, p.y); c = p;
lineStr.push(mr(c.x), ",", mr(c.y)); lineStr.push(' m ', mr(p.x), ',', mr(p.y));
} else if (p.type == "lineTo") { break;
lineStr.push(" l "); case 'lineTo':
var c = this.getCoords_(p.x, p.y); lineStr.push(' l ', mr(p.x), ',', mr(p.y));
lineStr.push(mr(c.x), ",", mr(c.y)); break;
} else if (p.type == "close") { case 'close':
lineStr.push(" x "); lineStr.push(' x ');
} else if (p.type == "bezierCurveTo") { p = null;
lineStr.push(" c "); break;
var c = this.getCoords_(p.x, p.y); case 'bezierCurveTo':
var c1 = this.getCoords_(p.cp1x, p.cp1y); lineStr.push(' c ',
var c2 = this.getCoords_(p.cp2x, p.cp2y); mr(p.cp1x), ',', mr(p.cp1y), ',',
lineStr.push(mr(c1.x), ",", mr(c1.y), ",", mr(p.cp2x), ',', mr(p.cp2y), ',',
mr(c2.x), ",", mr(c2.y), ",", mr(p.x), ',', mr(p.y));
mr(c.x), ",", mr(c.y)); break;
} else if (p.type == "at" || p.type == "wa") { case 'at':
lineStr.push(" ", p.type, " "); case 'wa':
var c = this.getCoords_(p.x, p.y); lineStr.push(' ', p.type, ' ',
var cStart = this.getCoords_(p.xStart, p.yStart); mr(p.x - this.arcScaleX_ * p.radius), ',',
var cEnd = this.getCoords_(p.xEnd, p.yEnd); mr(p.y - this.arcScaleY_ * p.radius), ' ',
mr(p.x + this.arcScaleX_ * p.radius), ',',
lineStr.push(mr(c.x - this.arcScaleX_ * p.radius), ",", mr(p.y + this.arcScaleY_ * p.radius), ' ',
mr(c.y - this.arcScaleY_ * p.radius), " ", mr(p.xStart), ',', mr(p.yStart), ' ',
mr(c.x + this.arcScaleX_ * p.radius), ",", mr(p.xEnd), ',', mr(p.yEnd));
mr(c.y + this.arcScaleY_ * p.radius), " ", break;
mr(cStart.x), ",", mr(cStart.y), " ",
mr(cEnd.x), ",", mr(cEnd.y));
} }
...@@ -586,114 +643,144 @@ if (!window.CanvasRenderingContext2D) { ...@@ -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 (%)
if (this.fillStyle.type_ == "gradientradial") {
var inside = (this.fillStyle.radius1_ / dimension * 100);
// percentage that outside radius exceeds inside radius lineStr.push(
var expansion = (this.fillStyle.radius2_ / dimension * 100) - inside; '<g_vml_:stroke',
} else { ' opacity="', opacity, '"',
var inside = 0; ' joinstyle="', this.lineJoin, '"',
var expansion = 100; ' 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;
}
// Very small angles produce an unexpected result because they are
// converted to a scientific notation string.
if (angle < 1e-6) {
angle = 0;
} }
} else {
var p0 = this.getCoords_(fillStyle.x0_, fillStyle.y0_);
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
};
var insidecolor = {offset: null, color: null}; width /= this.arcScaleX_ * Z;
var outsidecolor = {offset: null, color: null}; height /= this.arcScaleY_ * Z;
var dimension = m.max(width, height);
shift = 2 * fillStyle.r0_ / dimension;
expansion = 2 * fillStyle.r1_ / dimension - shift;
}
// We need to sort 'colors' by percentage, from 0 > 100 otherwise ie // We need to sort the color stops in ascending order by offset,
// won't interpret it correctly // otherwise IE won't interpret it correctly.
this.fillStyle.colors_.sort(function (cs1, cs2) { var stops = fillStyle.colors_;
stops.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) {
insidecolor.offset = fs.offset;
insidecolor.color = fs.color;
}
if (fs.offset < outsidecolor.offset || outsidecolor.offset == null) { var colors = [];
outsidecolor.offset = fs.offset; for (var i = 0; i < length; i++) {
outsidecolor.color = fs.color; var stop = stops[i];
} colors.push(stop.offset * expansion + shift + ' ' + stop.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) { ...@@ -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) { ...@@ -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_() {}
......
if(!document.createElement("canvas").getContext){(function(){var R=Math;var S=R.round;var O=R.sin;var a=R.cos;var J=R.abs;var Y=R.sqrt;var A=10;var K=A/2;function G(){return this.context_||(this.context_=new M(this))}var Q=Array.prototype.slice;function b(c,d,e){var Z=Q.call(arguments,2);return function(){return c.apply(d,Z.concat(Q.call(arguments)))}}var H={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var c=Z||document;c.createElement("canvas");c.attachEvent("onreadystatechange",b(this.init_,this,c))}},init_:function(e){if(!e.namespaces.g_vml_){e.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!e.namespaces.g_o_){e.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!e.styleSheets.ex_canvas_){var d=e.createStyleSheet();d.owningElement.id="ex_canvas_";d.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}g_vml_\\:*{behavior:url(#default#VML)}g_o_\\:*{behavior:url(#default#VML)}"}var c=e.getElementsByTagName("canvas");for(var Z=0;Z<c.length;Z++){this.initElement(c[Z])}},initElement:function(c){if(!c.getContext){c.getContext=G;c.innerHTML="";c.attachEvent("onpropertychange",X);c.attachEvent("onresize",B);var Z=c.attributes;if(Z.width&&Z.width.specified){c.style.width=Z.width.nodeValue+"px"}else{c.width=c.clientWidth}if(Z.height&&Z.height.specified){c.style.height=Z.height.nodeValue+"px"}else{c.height=c.clientHeight}}return c}};function X(c){var Z=c.srcElement;switch(c.propertyName){case"width":Z.style.width=Z.attributes.width.nodeValue+"px";Z.getContext().clearRect();break;case"height":Z.style.height=Z.attributes.height.nodeValue+"px";Z.getContext().clearRect();break}}function B(c){var Z=c.srcElement;if(Z.firstChild){Z.firstChild.style.width=Z.clientWidth+"px";Z.firstChild.style.height=Z.clientHeight+"px"}}H.init();var E=[];for(var V=0;V<16;V++){for(var U=0;U<16;U++){E[V*16+U]=V.toString(16)+U.toString(16)}}function N(){return[[1,0,0],[0,1,0],[0,0,1]]}function D(e,d){var c=N();for(var Z=0;Z<3;Z++){for(var h=0;h<3;h++){var f=0;for(var g=0;g<3;g++){f+=e[Z][g]*d[g][h]}c[Z][h]=f}}return c}function T(c,Z){Z.fillStyle=c.fillStyle;Z.lineCap=c.lineCap;Z.lineJoin=c.lineJoin;Z.lineWidth=c.lineWidth;Z.miterLimit=c.miterLimit;Z.shadowBlur=c.shadowBlur;Z.shadowColor=c.shadowColor;Z.shadowOffsetX=c.shadowOffsetX;Z.shadowOffsetY=c.shadowOffsetY;Z.strokeStyle=c.strokeStyle;Z.globalAlpha=c.globalAlpha;Z.arcScaleX_=c.arcScaleX_;Z.arcScaleY_=c.arcScaleY_;Z.lineScale_=c.lineScale_}function C(c){var f,e=1;c=String(c);if(c.substring(0,3)=="rgb"){var h=c.indexOf("(",3);var Z=c.indexOf(")",h+1);var g=c.substring(h+1,Z).split(",");f="#";for(var d=0;d<3;d++){f+=E[Number(g[d])]}if(g.length==4&&c.substr(3,1)=="a"){e=g[3]}}else{f=c}return{color:f,alpha:e}}function P(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function M(c){this.m_=N();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=A*1;this.globalAlpha=1;this.canvas=c;var Z=c.ownerDocument.createElement("div");Z.style.width=c.clientWidth+"px";Z.style.height=c.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";c.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var I=M.prototype;I.clearRect=function(){this.element_.innerHTML=""};I.beginPath=function(){this.currentPath_=[]};I.moveTo=function(c,Z){var d=this.getCoords_(c,Z);this.currentPath_.push({type:"moveTo",x:d.x,y:d.y});this.currentX_=d.x;this.currentY_=d.y};I.lineTo=function(c,Z){var d=this.getCoords_(c,Z);this.currentPath_.push({type:"lineTo",x:d.x,y:d.y});this.currentX_=d.x;this.currentY_=d.y};I.bezierCurveTo=function(d,c,j,i,h,f){var Z=this.getCoords_(h,f);var g=this.getCoords_(d,c);var e=this.getCoords_(j,i);L(this,g,e,Z)};function L(Z,e,d,c){Z.currentPath_.push({type:"bezierCurveTo",cp1x:e.x,cp1y:e.y,cp2x:d.x,cp2y:d.y,x:c.x,y:c.y});Z.currentX_=c.x;Z.currentY_=c.y}I.quadraticCurveTo=function(h,d,c,Z){var g=this.getCoords_(h,d);var f=this.getCoords_(c,Z);var i={x:this.currentX_+2/3*(g.x-this.currentX_),y:this.currentY_+2/3*(g.y-this.currentY_)};var e={x:i.x+(f.x-this.currentX_)/3,y:i.y+(f.y-this.currentY_)/3};L(this,i,e,f)};I.arc=function(k,i,j,f,c,d){j*=A;var o=d?"at":"wa";var l=k+a(f)*j-K;var n=i+O(f)*j-K;var Z=k+a(c)*j-K;var m=i+O(c)*j-K;if(l==Z&&!d){l+=0.125}var e=this.getCoords_(k,i);var h=this.getCoords_(l,n);var g=this.getCoords_(Z,m);this.currentPath_.push({type:o,x:e.x,y:e.y,radius:j,xStart:h.x,yStart:h.y,xEnd:g.x,yEnd:g.y})};I.rect=function(d,c,Z,e){this.moveTo(d,c);this.lineTo(d+Z,c);this.lineTo(d+Z,c+e);this.lineTo(d,c+e);this.closePath()};I.strokeRect=function(d,c,Z,e){var f=this.currentPath_;this.beginPath();this.moveTo(d,c);this.lineTo(d+Z,c);this.lineTo(d+Z,c+e);this.lineTo(d,c+e);this.closePath();this.stroke();this.currentPath_=f};I.fillRect=function(d,c,Z,e){var f=this.currentPath_;this.beginPath();this.moveTo(d,c);this.lineTo(d+Z,c);this.lineTo(d+Z,c+e);this.lineTo(d,c+e);this.closePath();this.fill();this.currentPath_=f};I.createLinearGradient=function(c,e,Z,d){var f=new W("gradient");f.x0_=c;f.y0_=e;f.x1_=Z;f.y1_=d;return f};I.createRadialGradient=function(e,g,d,c,f,Z){var h=new W("gradientradial");h.x0_=e;h.y0_=g;h.r0_=d;h.x1_=c;h.y1_=f;h.r1_=Z;return h};I.drawImage=function(s,e){var l,j,n,AA,q,o,u,AC;var m=s.runtimeStyle.width;var r=s.runtimeStyle.height;s.runtimeStyle.width="auto";s.runtimeStyle.height="auto";var k=s.width;var y=s.height;s.runtimeStyle.width=m;s.runtimeStyle.height=r;if(arguments.length==3){l=arguments[1];j=arguments[2];q=o=0;u=n=k;AC=AA=y}else{if(arguments.length==5){l=arguments[1];j=arguments[2];n=arguments[3];AA=arguments[4];q=o=0;u=k;AC=y}else{if(arguments.length==9){q=arguments[1];o=arguments[2];u=arguments[3];AC=arguments[4];l=arguments[5];j=arguments[6];n=arguments[7];AA=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AB=this.getCoords_(l,j);var f=u/2;var c=AC/2;var z=[];var Z=10;var i=10;z.push(" <g_vml_:group",' coordsize="',A*Z,",",A*i,'"',' coordorigin="0,0"',' style="width:',Z,"px;height:",i,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]){var g=[];g.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",S(AB.x/A),",","Dy=",S(AB.y/A),"");var x=AB;var v=this.getCoords_(l+n,j);var t=this.getCoords_(l,j+AA);var p=this.getCoords_(l+n,j+AA);x.x=R.max(x.x,v.x,t.x,p.x);x.y=R.max(x.y,v.y,t.y,p.y);z.push("padding:0 ",S(x.x/A),"px ",S(x.y/A),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",g.join(""),", sizingmethod='clip');")}else{z.push("top:",S(AB.y/A),"px;left:",S(AB.x/A),"px;")}z.push(' ">','<g_vml_:image src="',s.src,'"',' style="width:',A*n,"px;"," height:",A*AA,'px;"',' cropleft="',q/k,'"',' croptop="',o/y,'"',' cropright="',(k-q-u)/k,'"',' cropbottom="',(y-o-AC)/y,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",z.join(""))};I.stroke=function(AE){var j=[];var k=false;var AP=C(AE?this.fillStyle:this.strokeStyle);var AA=AP.color;var AK=AP.alpha*this.globalAlpha;var f=10;var m=10;j.push("<g_vml_:shape",' filled="',!!AE,'"',' style="position:absolute;width:',f,"px;height:",m,'px;"',' coordorigin="0 0" coordsize="',A*f," ",A*m,'"',' stroked="',!AE,'"',' path="');var l=false;var AO={x:null,y:null};var w={x:null,y:null};for(var AJ=0;AJ<this.currentPath_.length;AJ++){var AI=this.currentPath_[AJ];var AN;switch(AI.type){case"moveTo":AN=AI;j.push(" m ",S(AI.x),",",S(AI.y));break;case"lineTo":j.push(" l ",S(AI.x),",",S(AI.y));break;case"close":j.push(" x ");AI=null;break;case"bezierCurveTo":j.push(" c ",S(AI.cp1x),",",S(AI.cp1y),",",S(AI.cp2x),",",S(AI.cp2y),",",S(AI.x),",",S(AI.y));break;case"at":case"wa":j.push(" ",AI.type," ",S(AI.x-this.arcScaleX_*AI.radius),",",S(AI.y-this.arcScaleY_*AI.radius)," ",S(AI.x+this.arcScaleX_*AI.radius),",",S(AI.y+this.arcScaleY_*AI.radius)," ",S(AI.xStart),",",S(AI.yStart)," ",S(AI.xEnd),",",S(AI.yEnd));break}if(AI){if(AO.x==null||AI.x<AO.x){AO.x=AI.x}if(w.x==null||AI.x>w.x){w.x=AI.x}if(AO.y==null||AI.y<AO.y){AO.y=AI.y}if(w.y==null||AI.y>w.y){w.y=AI.y}}}j.push(' ">');if(!AE){var v=this.lineScale_*this.lineWidth;if(v<1){AK*=v}j.push("<g_vml_:stroke",' opacity="',AK,'"',' joinstyle="',this.lineJoin,'"',' miterlimit="',this.miterLimit,'"',' endcap="',P(this.lineCap),'"',' weight="',v,'px"',' color="',AA,'" />')}else{if(typeof this.fillStyle=="object"){var n=this.fillStyle;var t=0;var AH={x:0,y:0};var AB=0;var r=1;if(n.type_=="gradient"){var q=n.x0_/this.arcScaleX_;var d=n.y0_/this.arcScaleY_;var o=n.x1_/this.arcScaleX_;var AQ=n.y1_/this.arcScaleY_;var AM=this.getCoords_(q,d);var AL=this.getCoords_(o,AQ);var h=AL.x-AM.x;var g=AL.y-AM.y;t=Math.atan2(h,g)*180/Math.PI;if(t<0){t+=360}if(t<0.000001){t=0}}else{var AM=this.getCoords_(n.x0_,n.y0_);var Z=w.x-AO.x;var e=w.y-AO.y;AH={x:(AM.x-AO.x)/Z,y:(AM.y-AO.y)/e};Z/=this.arcScaleX_*A;e/=this.arcScaleY_*A;var AG=R.max(Z,e);AB=2*n.r0_/AG;r=2*n.r1_/AG-AB}var z=n.colors_;z.sort(function(i,c){return i.offset-c.offset});var u=z.length;var y=z[0].color;var x=z[u-1].color;var AD=z[0].alpha*this.globalAlpha;var AC=z[u-1].alpha*this.globalAlpha;var AF=[];for(var AJ=0;AJ<u;AJ++){var s=z[AJ];AF.push(s.offset*r+AB+" "+s.color)}j.push('<g_vml_:fill type="',n.type_,'"',' method="none" focus="100%"',' color="',y,'"',' color2="',x,'"',' colors="',AF.join(","),'"',' opacity="',AC,'"',' g_o_:opacity2="',AD,'"',' angle="',t,'"',' focusposition="',AH.x,",",AH.y,'" />')}else{j.push('<g_vml_:fill color="',AA,'" opacity="',AK,'" />')}}j.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",j.join(""))};I.fill=function(){this.stroke(true)};I.closePath=function(){this.currentPath_.push({type:"close"})};I.getCoords_=function(d,c){var Z=this.m_;return{x:A*(d*Z[0][0]+c*Z[1][0]+Z[2][0])-K,y:A*(d*Z[0][1]+c*Z[1][1]+Z[2][1])-K}};I.save=function(){var Z={};T(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=D(N(),this.m_)};I.restore=function(){T(this.aStack_.pop(),this);this.m_=this.mStack_.pop()};I.translate=function(d,c){var Z=[[1,0,0],[0,1,0],[d,c,1]];this.m_=D(Z,this.m_)};I.rotate=function(d){var f=a(d);var e=O(d);var Z=[[f,e,0],[-e,f,0],[0,0,1]];this.m_=D(Z,this.m_)};I.scale=function(f,e){this.arcScaleX_*=f;this.arcScaleY_*=e;var c=[[f,0,0],[0,e,0],[0,0,1]];var Z=this.m_=D(c,this.m_);var d=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];this.lineScale_=Y(J(d))};I.clip=function(){};I.arcTo=function(){};I.createPattern=function(){return new F};function W(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}W.prototype.addColorStop=function(c,Z){Z=C(Z);this.colors_.push({offset:c,color:Z.color,alpha:Z.alpha})};function F(){}G_vmlCanvasManager=H;CanvasRenderingContext2D=M;CanvasGradient=W;CanvasPattern=F})()};
\ No newline at end of file
if(!window.CanvasRenderingContext2D){(function(){var m=Math;var mr=m.round;var ms=m.sin;var mc=m.cos;var Z=10;var Z2=Z/2;var G_vmlCanvasManager_={init:function(opt_doc){var doc=opt_doc||document;if(/MSIE/.test(navigator.userAgent)&&!window.opera){var self=this;doc.attachEvent("onreadystatechange",function(){self.init_(doc)})}},init_:function(doc){if(doc.readyState=="complete"){if(!doc.namespaces["g_vml_"]){doc.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml")}var ss=doc.createStyleSheet();ss.cssText="canvas{display:inline-block;overflow:hidden;"+"text-align:left;width:300px;height:150px}"+"g_vml_\\:*{behavior:url(#default#VML)}";var els=doc.getElementsByTagName("canvas");for(var i=0;i<els.length;i++){if(!els[i].getContext){this.initElement(els[i])}}}},fixElement_:function(el){var outerHTML=el.outerHTML;var newEl=el.ownerDocument.createElement(outerHTML);if(outerHTML.slice(-2)!="/>"){var tagName="/"+el.tagName;var ns;while((ns=el.nextSibling)&&ns.tagName!=tagName){ns.removeNode()}if(ns){ns.removeNode()}}el.parentNode.replaceChild(newEl,el);return newEl},initElement:function(el){el=this.fixElement_(el);el.getContext=function(){if(this.context_){return this.context_}return this.context_=new CanvasRenderingContext2D_(this)};el.attachEvent('onpropertychange',onPropertyChange);el.attachEvent('onresize',onResize);var attrs=el.attributes;if(attrs.width&&attrs.width.specified){el.style.width=attrs.width.nodeValue+"px"}else{el.width=el.clientWidth}if(attrs.height&&attrs.height.specified){el.style.height=attrs.height.nodeValue+"px"}else{el.height=el.clientHeight}return el}};function onPropertyChange(e){var el=e.srcElement;switch(e.propertyName){case'width':el.style.width=el.attributes.width.nodeValue+"px";el.getContext().clearRect();break;case'height':el.style.height=el.attributes.height.nodeValue+"px";el.getContext().clearRect();break}}function onResize(e){var el=e.srcElement;if(el.firstChild){el.firstChild.style.width=el.clientWidth+'px';el.firstChild.style.height=el.clientHeight+'px'}}G_vmlCanvasManager_.init();var dec2hex=[];for(var i=0;i<16;i++){for(var j=0;j<16;j++){dec2hex[i*16+j]=i.toString(16)+j.toString(16)}}function createMatrixIdentity(){return[[1,0,0],[0,1,0],[0,0,1]]}function matrixMultiply(m1,m2){var result=createMatrixIdentity();for(var x=0;x<3;x++){for(var y=0;y<3;y++){var sum=0;for(var z=0;z<3;z++){sum+=m1[x][z]*m2[z][y]}result[x][y]=sum}}return result}function copyState(o1,o2){o2.fillStyle=o1.fillStyle;o2.lineCap=o1.lineCap;o2.lineJoin=o1.lineJoin;o2.lineWidth=o1.lineWidth;o2.miterLimit=o1.miterLimit;o2.shadowBlur=o1.shadowBlur;o2.shadowColor=o1.shadowColor;o2.shadowOffsetX=o1.shadowOffsetX;o2.shadowOffsetY=o1.shadowOffsetY;o2.strokeStyle=o1.strokeStyle;o2.arcScaleX_=o1.arcScaleX_;o2.arcScaleY_=o1.arcScaleY_}function processStyle(styleString){var str,alpha=1;styleString=String(styleString);if(styleString.substring(0,3)=="rgb"){var start=styleString.indexOf("(",3);var end=styleString.indexOf(")",start+1);var guts=styleString.substring(start+1,end).split(",");str="#";for(var i=0;i<3;i++){str+=dec2hex[Number(guts[i])]}if((guts.length==4)&&(styleString.substr(3,1)=="a")){alpha=guts[3]}}else{str=styleString}return[str,alpha]}function processLineCap(lineCap){switch(lineCap){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function CanvasRenderingContext2D_(surfaceElement){this.m_=createMatrixIdentity();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=Z*1;this.globalAlpha=1;this.canvas=surfaceElement;var el=surfaceElement.ownerDocument.createElement('div');el.style.width=surfaceElement.clientWidth+'px';el.style.height=surfaceElement.clientHeight+'px';el.style.overflow='hidden';el.style.position='absolute';surfaceElement.appendChild(el);this.element_=el;this.arcScaleX_=1;this.arcScaleY_=1}var contextPrototype=CanvasRenderingContext2D_.prototype;contextPrototype.clearRect=function(){this.element_.innerHTML="";this.currentPath_=[]};contextPrototype.beginPath=function(){this.currentPath_=[]};contextPrototype.moveTo=function(aX,aY){this.currentPath_.push({type:"moveTo",x:aX,y:aY});this.currentX_=aX;this.currentY_=aY};contextPrototype.lineTo=function(aX,aY){this.currentPath_.push({type:"lineTo",x:aX,y:aY});this.currentX_=aX;this.currentY_=aY};contextPrototype.bezierCurveTo=function(aCP1x,aCP1y,aCP2x,aCP2y,aX,aY){this.currentPath_.push({type:"bezierCurveTo",cp1x:aCP1x,cp1y:aCP1y,cp2x:aCP2x,cp2y:aCP2y,x:aX,y:aY});this.currentX_=aX;this.currentY_=aY};contextPrototype.quadraticCurveTo=function(aCPx,aCPy,aX,aY){var cp1x=this.currentX_+2.0/3.0*(aCPx-this.currentX_);var cp1y=this.currentY_+2.0/3.0*(aCPy-this.currentY_);var cp2x=cp1x+(aX-this.currentX_)/3.0;var cp2y=cp1y+(aY-this.currentY_)/3.0;this.bezierCurveTo(cp1x,cp1y,cp2x,cp2y,aX,aY)};contextPrototype.arc=function(aX,aY,aRadius,aStartAngle,aEndAngle,aClockwise){aRadius*=Z;var arcType=aClockwise?"at":"wa";var xStart=aX+(mc(aStartAngle)*aRadius)-Z2;var yStart=aY+(ms(aStartAngle)*aRadius)-Z2;var xEnd=aX+(mc(aEndAngle)*aRadius)-Z2;var yEnd=aY+(ms(aEndAngle)*aRadius)-Z2;if(xStart==xEnd&&!aClockwise){xStart+=0.125}this.currentPath_.push({type:arcType,x:aX,y:aY,radius:aRadius,xStart:xStart,yStart:yStart,xEnd:xEnd,yEnd:yEnd})};contextPrototype.rect=function(aX,aY,aWidth,aHeight){this.moveTo(aX,aY);this.lineTo(aX+aWidth,aY);this.lineTo(aX+aWidth,aY+aHeight);this.lineTo(aX,aY+aHeight);this.closePath()};contextPrototype.strokeRect=function(aX,aY,aWidth,aHeight){this.beginPath();this.moveTo(aX,aY);this.lineTo(aX+aWidth,aY);this.lineTo(aX+aWidth,aY+aHeight);this.lineTo(aX,aY+aHeight);this.closePath();this.stroke()};contextPrototype.fillRect=function(aX,aY,aWidth,aHeight){this.beginPath();this.moveTo(aX,aY);this.lineTo(aX+aWidth,aY);this.lineTo(aX+aWidth,aY+aHeight);this.lineTo(aX,aY+aHeight);this.closePath();this.fill()};contextPrototype.createLinearGradient=function(aX0,aY0,aX1,aY1){var gradient=new CanvasGradient_("gradient");return gradient};contextPrototype.createRadialGradient=function(aX0,aY0,aR0,aX1,aY1,aR1){var gradient=new CanvasGradient_("gradientradial");gradient.radius1_=aR0;gradient.radius2_=aR1;gradient.focus_.x=aX0;gradient.focus_.y=aY0;return gradient};contextPrototype.drawImage=function(image,var_args){var dx,dy,dw,dh,sx,sy,sw,sh;var oldRuntimeWidth=image.runtimeStyle.width;var oldRuntimeHeight=image.runtimeStyle.height;image.runtimeStyle.width='auto';image.runtimeStyle.height='auto';var w=image.width;var h=image.height;image.runtimeStyle.width=oldRuntimeWidth;image.runtimeStyle.height=oldRuntimeHeight;if(arguments.length==3){dx=arguments[1];dy=arguments[2];sx=sy=0;sw=dw=w;sh=dh=h}else if(arguments.length==5){dx=arguments[1];dy=arguments[2];dw=arguments[3];dh=arguments[4];sx=sy=0;sw=w;sh=h}else if(arguments.length==9){sx=arguments[1];sy=arguments[2];sw=arguments[3];sh=arguments[4];dx=arguments[5];dy=arguments[6];dw=arguments[7];dh=arguments[8]}else{throw"Invalid number of arguments";}var d=this.getCoords_(dx,dy);var w2=sw/2;var h2=sh/2;var vmlStr=[];var W=10;var H=10;vmlStr.push(' <g_vml_:group',' coordsize="',Z*W,',',Z*H,'"',' coordorigin="0,0"',' style="width:',W,';height:',H,';position:absolute;');if(this.m_[0][0]!=1||this.m_[0][1]){var filter=[];filter.push("M11='",this.m_[0][0],"',","M12='",this.m_[1][0],"',","M21='",this.m_[0][1],"',","M22='",this.m_[1][1],"',","Dx='",mr(d.x/Z),"',","Dy='",mr(d.y/Z),"'");var max=d;var c2=this.getCoords_(dx+dw,dy);var c3=this.getCoords_(dx,dy+dh);var c4=this.getCoords_(dx+dw,dy+dh);max.x=Math.max(max.x,c2.x,c3.x,c4.x);max.y=Math.max(max.y,c2.y,c3.y,c4.y);vmlStr.push("padding:0 ",mr(max.x/Z),"px ",mr(max.y/Z),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",filter.join(""),", sizingmethod='clip');")}else{vmlStr.push("top:",mr(d.y/Z),"px;left:",mr(d.x/Z),"px;")}vmlStr.push(' ">','<g_vml_:image src="',image.src,'"',' style="width:',Z*dw,';',' height:',Z*dh,';"',' cropleft="',sx/w,'"',' croptop="',sy/h,'"',' cropright="',(w-sx-sw)/w,'"',' cropbottom="',(h-sy-sh)/h,'"',' />','</g_vml_:group>');this.element_.insertAdjacentHTML("BeforeEnd",vmlStr.join(""))};contextPrototype.stroke=function(aFill){var lineStr=[];var lineOpen=false;var a=processStyle(aFill?this.fillStyle:this.strokeStyle);var color=a[0];var opacity=a[1]*this.globalAlpha;var W=10;var H=10;lineStr.push('<g_vml_:shape',' fillcolor="',color,'"',' filled="',Boolean(aFill),'"',' style="position:absolute;width:',W,';height:',H,';"',' coordorigin="0 0" coordsize="',Z*W,' ',Z*H,'"',' stroked="',!aFill,'"',' strokeweight="',this.lineWidth,'"',' strokecolor="',color,'"',' path="');var newSeq=false;var min={x:null,y:null};var max={x:null,y:null};for(var i=0;i<this.currentPath_.length;i++){var p=this.currentPath_[i];if(p.type=="moveTo"){lineStr.push(" m ");var c=this.getCoords_(p.x,p.y);lineStr.push(mr(c.x),",",mr(c.y))}else if(p.type=="lineTo"){lineStr.push(" l ");var c=this.getCoords_(p.x,p.y);lineStr.push(mr(c.x),",",mr(c.y))}else if(p.type=="close"){lineStr.push(" x ")}else if(p.type=="bezierCurveTo"){lineStr.push(" c ");var c=this.getCoords_(p.x,p.y);var c1=this.getCoords_(p.cp1x,p.cp1y);var c2=this.getCoords_(p.cp2x,p.cp2y);lineStr.push(mr(c1.x),",",mr(c1.y),",",mr(c2.x),",",mr(c2.y),",",mr(c.x),",",mr(c.y))}else if(p.type=="at"||p.type=="wa"){lineStr.push(" ",p.type," ");var c=this.getCoords_(p.x,p.y);var cStart=this.getCoords_(p.xStart,p.yStart);var cEnd=this.getCoords_(p.xEnd,p.yEnd);lineStr.push(mr(c.x-this.arcScaleX_*p.radius),",",mr(c.y-this.arcScaleY_*p.radius)," ",mr(c.x+this.arcScaleX_*p.radius),",",mr(c.y+this.arcScaleY_*p.radius)," ",mr(cStart.x),",",mr(cStart.y)," ",mr(cEnd.x),",",mr(cEnd.y))}if(c){if(min.x==null||c.x<min.x){min.x=c.x}if(max.x==null||c.x>max.x){max.x=c.x}if(min.y==null||c.y<min.y){min.y=c.y}if(max.y==null||c.y>max.y){max.y=c.y}}}lineStr.push(' ">');if(typeof this.fillStyle=="object"){var focus={x:"50%",y:"50%"};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)+"%";focus.y=mr((this.fillStyle.focus_.y/height)*100+50)+"%";var colors=[];if(this.fillStyle.type_=="gradientradial"){var inside=(this.fillStyle.radius1_/dimension*100);var expansion=(this.fillStyle.radius2_/dimension*100)-inside}else{var inside=0;var expansion=100}var insidecolor={offset:null,color:null};var outsidecolor={offset:null,color:null};this.fillStyle.colors_.sort(function(cs1,cs2){return cs1.offset-cs2.offset});for(var i=0;i<this.fillStyle.colors_.length;i++){var fs=this.fillStyle.colors_[i];colors.push((fs.offset*expansion)+inside,"% ",fs.color,",");if(fs.offset>insidecolor.offset||insidecolor.offset==null){insidecolor.offset=fs.offset;insidecolor.color=fs.color}if(fs.offset<outsidecolor.offset||outsidecolor.offset==null){outsidecolor.offset=fs.offset;outsidecolor.color=fs.color}}colors.pop();lineStr.push('<g_vml_:fill',' color="',outsidecolor.color,'"',' color2="',insidecolor.color,'"',' type="',this.fillStyle.type_,'"',' focusposition="',focus.x,', ',focus.y,'"',' colors="',colors.join(""),'"',' opacity="',opacity,'" />')}else if(aFill){lineStr.push('<g_vml_:fill color="',color,'" opacity="',opacity,'" />')}else{lineStr.push('<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>");this.element_.insertAdjacentHTML("beforeEnd",lineStr.join(""))};contextPrototype.fill=function(){this.stroke(true)};contextPrototype.closePath=function(){this.currentPath_.push({type:"close"})};contextPrototype.getCoords_=function(aX,aY){return{x:Z*(aX*this.m_[0][0]+aY*this.m_[1][0]+this.m_[2][0])-Z2,y:Z*(aX*this.m_[0][1]+aY*this.m_[1][1]+this.m_[2][1])-Z2}};contextPrototype.save=function(){var o={};copyState(this,o);this.aStack_.push(o);this.mStack_.push(this.m_);this.m_=matrixMultiply(createMatrixIdentity(),this.m_)};contextPrototype.restore=function(){copyState(this.aStack_.pop(),this);this.m_=this.mStack_.pop()};contextPrototype.translate=function(aX,aY){var m1=[[1,0,0],[0,1,0],[aX,aY,1]];this.m_=matrixMultiply(m1,this.m_)};contextPrototype.rotate=function(aRot){var c=mc(aRot);var s=ms(aRot);var m1=[[c,s,0],[-s,c,0],[0,0,1]];this.m_=matrixMultiply(m1,this.m_)};contextPrototype.scale=function(aX,aY){this.arcScaleX_*=aX;this.arcScaleY_*=aY;var m1=[[aX,0,0],[0,aY,0],[0,0,1]];this.m_=matrixMultiply(m1,this.m_)};contextPrototype.clip=function(){};contextPrototype.arcTo=function(){};contextPrototype.createPattern=function(){return new CanvasPattern_};function CanvasGradient_(aType){this.type_=aType;this.radius1_=0;this.radius2_=0;this.colors_=[];this.focus_={x:0,y:0}}CanvasGradient_.prototype.addColorStop=function(aOffset,aColor){aColor=processStyle(aColor);this.colors_.push({offset:1-aOffset,color:aColor})};function CanvasPattern_(){}G_vmlCanvasManager=G_vmlCanvasManager_;CanvasRenderingContext2D=CanvasRenderingContext2D_;CanvasGradient=CanvasGradient_;CanvasPattern=CanvasPattern_})()}
...@@ -328,6 +328,15 @@ ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment