From 196cd4464ac95bcd8db5c95de85080a40599758d Mon Sep 17 00:00:00 2001 From: Vincent Broute Date: Mon, 15 Jul 2013 23:22:12 +0200 Subject: [PATCH] fix plot type (square / circle) in the legend --- js/jquery.mapael.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/js/jquery.mapael.js b/js/jquery.mapael.js index 5bd949397..c90f73529 100644 --- a/js/jquery.mapael.js +++ b/js/jquery.mapael.js @@ -357,13 +357,7 @@ , legendParams.slices[i].attrsHover ); - if (legendParams.slices[i].type == "circle") { - elem = paper.circle( - legendParams.marginLeft + legendParams.slices[i].size / 2 - , height + legendParams.slices[i].size / 2 - , legendParams.slices[i].size / 2 - ).attr(legendParams.slices[i].attrs); - } else { + if(legendType == 'area' || legendParams.slices[i].type == "square") { // Draw a square for squared plots AND areas !legendParams.slices[i].size && (legendParams.slices[i].size = 20); @@ -373,7 +367,13 @@ , legendParams.slices[i].size , legendParams.slices[i].size ).attr(legendParams.slices[i].attrs); - } + } else { + elem = paper.circle( + legendParams.marginLeft + legendParams.slices[i].size / 2 + , height + legendParams.slices[i].size / 2 + , legendParams.slices[i].size / 2 + ).attr(legendParams.slices[i].attrs); + } label = paper.text( legendParams.marginLeft + legendParams.slices[i].size + legendParams.marginLeftLabel