Fix #6099 - issues with dashboards

diff --git a/g.line.js b/g.line.js
index 176823f..243ba8c 100644 (file)
--- a/g.line.js
+++ b/g.line.js
@@ -178,27 +178,27 @@ if (typeof(Raphael) == 'undefined') {
                     roffset :   Math.round(gutter / 100 + (1)) + 20,
             };
             //Roo.log(ax_args);
-            +ax[2] && axis.push(
-                // bottom
-                // x, y, length, from, to, steps, orientation, labels, type, dashsize, paper
-                chartinst.axis( ax_args)
-            );
-            
 //            +ax[2] && axis.push(
 //                // bottom
 //                // x, y, length, from, to, steps, orientation, labels, type, dashsize, paper
-//                chartinst.axis(
-//                    x + gutter,
-//                    y + height - gutter,
-//                    width - 2 * gutter,
-//                    minx,
-//                    maxx,
-//                    opts.axisxstep || Math.floor((width - 2 * gutter) / 20),
-//                    0,
-//                    opts.axisxlabels || false,
-//                    paper
-//                    
-//                    ));
+ //               //chartinst.axis( ax_args, paper)
+ //           );
+            
+           +ax[2] && axis.push(
+               // bottom
+               // x, y, length, from, to, steps, orientation, labels, type, dashsize, paper
+               chartinst.axis(
+                   x + gutter,
+                   y + height - gutter,
+                   width - 2 * gutter,
+                   minx,
+                   maxx,
+                   opts.axisxstep || Math.floor((width - 2 * gutter) / 20),
+                   0,
+                   opts.axisxlabels || false,
+                   paper
+                   
+                   ));
             // left axis
             +ax[3] && axis.push(
                 chartinst.axis(

diff --git a/g.raphael.js b/g.raphael.js
index 3e24006..b68494c 100644 (file)
--- a/g.raphael.js
+++ b/g.raphael.js
@@ -811,7 +811,7 @@ Raphael.g = {
             i = ends.power,
             j = 0,
             txtattr = { font: "11px Arial, sans-serif" },
-            text = paper.set(),
+            text =  paper.set(),
             d;
 
         d = (t - f) / steps;
@@ -858,6 +858,7 @@ Raphael.g = {
                 txt = 0,
                 prev = 0;
 
+            //Roo.log([X,x,length, dx]); return;
             while (X <= x + length) {
                 type != "-" && type != " " && (path = path.concat(["M", X + .5, y - (type == "+" ? dashsize : !!orientation * dashsize * 2), "l", 0, dashsize * 2 + 1]));
                 text.push(txt = paper.text(X, y + addon, (labels && labels[j++]) || (Math.round(label) == label ? label : +label.toFixed(rnd))).attr(txtattr));