g.circular.js

diff --git a/g.circular.js b/g.circular.js
index 17d463f..2c121fb 100644 (file)
--- a/g.circular.js
+++ b/g.circular.js
@@ -147,9 +147,7 @@ Roo = typeof(Roo) != 'undefined' ? Roo:  (imports ? imports.seed.Roo.Roo: {});
                     txt;
 
                 var l = values[i].others ? (otherslabel || "Others") : labels[j];
-                if(values[i].others){
-                    continue;
-                }
+                
                 chart.labels.push(paper.set());
                 chart.labels[i].push(paper[mark](x + 5, y, 5).attr({ fill: colors[i] || chartinst.colors[i], stroke: "none" }));
                 chart.labels[i].push(
@@ -157,6 +155,38 @@ Roo = typeof(Roo) != 'undefined' ? Roo:  (imports ? imports.seed.Roo.Roo: {});
                 
                 y += txt.getBBox().height * 1.2;
             }
+            
+//            for (var i = 0; i < len; i++) {
+//                var j = values[i].order,
+//                    txt;
+//
+//                if(values[i].others){
+//                    continue;
+//                }
+//                
+//                chart.labels.push(paper.set());
+//                chart.labels[i].push(paper[mark](x + 5, y, 5).attr({ fill: colors[i] || chartinst.colors[i], stroke: "none" }));
+//                chart.labels[i].push(
+//                    txt = paper.text(x + 20, y, labels[j] || values[i]).attr(opts.txtattr || chartinst.txtattr).attr({ fill: opts.legendcolor || "#000", "text-anchor": "start"}));
+//                
+//                y += txt.getBBox().height * 1.2;
+//            }
+            
+//            for (var i = 0; i < len; i++) {
+//                var j = values[i].order,
+//                    txt;
+//
+//                if(!values[i].others){
+//                    continue;
+//                }
+//                
+//                chart.labels.push(paper.set());
+//                chart.labels[len - 1].push(paper[mark](x + 5, y, 5).attr({ fill: colors[i] || chartinst.colors[i], stroke: "none" }));
+//                chart.labels[len - 1].push(
+//                    txt = paper.text(x + 20, y, otherslabel || 'Others').attr(opts.txtattr || chartinst.txtattr).attr({ fill: opts.legendcolor || "#000", "text-anchor": "start"}));
+//                
+//                y += txt.getBBox().height * 1.2;
+//            }
 
             var bb = chart.labels.getBBox(),
                 tr = {