gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflict

Browse Source
This commit is contained in:
Ammar Yasir 2011-07-22 17:50:09 +05:30
parent 830f2fdaa7
commit bedd413217
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/highcharts/exporting.js
View File

@ -281,7 +281,8 @@ extend(Chart.prototype, {
canvas=createElement('canvas');
$('body').append(canvas);
$(canvas).hide();
$(canvas).css('position','absolute');
$(canvas).css('left','-10000px');
var submitData = function(chartData) {
// merge the options
@ -320,11 +321,19 @@ extend(Chart.prototype, {
if(options && options.type=='image/svg+xml') {
submitData(chart.getSVG(chartOptions));
} else {
if (typeof FlashCanvas != "undefined") {
FlashCanvas.initElement(canvas);
}
// Generate data uri and submit once done
canvg(canvas, chart.getSVG(chartOptions),{
ignoreAnimation:true,
ignoreMouse:true,
renderCallback:function() { submitData(canvas.toDataURL()); }
renderCallback:function() {
// IE8 fix: flashcanvas doesn't update the canvas immediately, thus requiring setTimeout.
// See also http://groups.google.com/group/flashcanvas/browse_thread/thread/e36ff7a03e1bfb0a
setTimeout(function() { submitData(canvas.toDataURL()); }, 100);
}
});
}
},

5
js/highcharts/highcharts.js
View File

@ -2305,15 +2305,10 @@ SVGRenderer.prototype = {
// Webkit and opera sometimes return 'normal' as the line height. In that
// case, webkit uses offsetHeight, while Opera falls back to 18
<<<<<<< HEAD
lineHeight = pInt(window.getComputedStyle(lastLine, null).getPropertyValue('line-height'));
if (isNaN(lineHeight)) {
=======
lineHeight = win[GET_COMPUTED_STYLE] &&
win[GET_COMPUTED_STYLE](lastLine, null).getPropertyValue('line-height');
if (!lineHeight || isNaN(lineHeight)) {
>>>>>>> phpmyadmin/master
lineHeight = textLineHeight || lastLine.offsetHeight || 18;
}
attr(tspan, 'dy', lineHeight);