From bedd413217a87770852671c4a2b211ca067df5e0 Mon Sep 17 00:00:00 2001
From: Ammar Yasir <ammaryasir.88@gmail.com>
Date: Fri, 22 Jul 2011 17:50:09 +0530
Subject: [PATCH] Resolved merge conflict

---
 js/highcharts/exporting.js  | 13 +++++++++++--
 js/highcharts/highcharts.js |  5 -----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/js/highcharts/exporting.js b/js/highcharts/exporting.js
index 301e5e2475..cb04357b32 100644
--- a/js/highcharts/exporting.js
+++ b/js/highcharts/exporting.js
@@ -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); 
+                }
             });
         }
     },
diff --git a/js/highcharts/highcharts.js b/js/highcharts/highcharts.js
index fee96bf1b3..b3b8e9d571 100644
--- a/js/highcharts/highcharts.js
+++ b/js/highcharts/highcharts.js
@@ -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);