[fusion-commits] r2363 - branches/fusion-2.2/widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2011-04-13 10:32:06 -0700 (Wed, 13 Apr 2011)
New Revision: 2363

Modified:
   branches/fusion-2.2/widgets/Legend.js
Log:
closes #376: applying Arthur's patch

Modified: branches/fusion-2.2/widgets/Legend.js
===================================================================
--- branches/fusion-2.2/widgets/Legend.js	2011-04-12 15:35:34 UTC (rev 2362)
+++ branches/fusion-2.2/widgets/Legend.js	2011-04-13 17:32:06 UTC (rev 2363)
@@ -714,12 +714,13 @@
         //set the label
         if (style && style.legendLabel) {
             opt.label = style.legendLabel == '' ? ' ' : style.legendLabel;
-        } else {
-            opt.label = layer.legendLabel == '' ? ' ' : layer.legendLabel;
         }
-
+            
         //set the checkbox rendererer
         if (bCheckBox ) {
+            if (!opt.label){
+                opt.label = layer.legendLabel == '' ? ' ' : layer.legendLabel;
+            }
             opt.draw = this.renderItemCheckBox;
         } else {
             opt.draw = this.renderItem;