mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-08-10 00:37:54 +02:00
Update jqplot to
jquery.jqplot.1.0.0b2_r947
This commit is contained in:
12
phpgwapi/js/jquery/jqplot/excanvas.js
vendored
12
phpgwapi/js/jquery/jqplot/excanvas.js
vendored
@ -561,6 +561,9 @@ if (!document.createElement('canvas').getContext) {
|
||||
// trial and error to get the same size as non VML text.
|
||||
computedStyle.size *= 0.981;
|
||||
|
||||
// Fix for VML handling of bare font family names. Add a '' around font family names.
|
||||
computedStyle.family = "'" + computedStyle.family.replace(/(\'|\")/g,'').replace(/\s*,\s*/g, "', '") + "'";
|
||||
|
||||
return computedStyle;
|
||||
}
|
||||
|
||||
@ -1228,8 +1231,7 @@ if (!document.createElement('canvas').getContext) {
|
||||
offset = {x: 0, y: 0},
|
||||
lineStr = [];
|
||||
|
||||
var fontStyle = getComputedStyle(processFontStyle(this.font),
|
||||
this.element_);
|
||||
var fontStyle = getComputedStyle(processFontStyle(this.font), this.element_);
|
||||
|
||||
var fontStyleString = buildStyle(fontStyle);
|
||||
|
||||
@ -1295,7 +1297,8 @@ if (!document.createElement('canvas').getContext) {
|
||||
var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' +
|
||||
m[0][1].toFixed(3) + ',' + m[1][1].toFixed(3) + ',0,0';
|
||||
|
||||
var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z);
|
||||
var skewOffset = mr(d.x / Z + 1 - m[0][0]) + ',' + mr(d.y / Z - 2 * m[1][0]);
|
||||
|
||||
|
||||
lineStr.push('<g_vml_:skew on="t" matrix="', skewM ,'" ',
|
||||
' offset="', skewOffset, '" origin="', left ,' 0" />',
|
||||
@ -1372,7 +1375,7 @@ if (!document.createElement('canvas').getContext) {
|
||||
case null:
|
||||
case '':
|
||||
this.repetition_ = 'repeat';
|
||||
break
|
||||
break;
|
||||
case 'repeat-x':
|
||||
case 'repeat-y':
|
||||
case 'no-repeat':
|
||||
@ -1429,6 +1432,7 @@ if (!document.createElement('canvas').getContext) {
|
||||
CanvasGradient = CanvasGradient_;
|
||||
CanvasPattern = CanvasPattern_;
|
||||
DOMException = DOMException_;
|
||||
G_vmlCanvasManager._version = 888;
|
||||
})();
|
||||
|
||||
} // if
|
||||
|
Reference in New Issue
Block a user