[fusion-commits] r2930 - in trunk: . widgets

[svn_fusion at osgeo.org]

Author: jng
Date: 2016-04-18 04:42:39 -0700 (Mon, 18 Apr 2016)
New Revision: 2930

Modified:
   trunk/
   trunk/widgets/Legend.js
Log:
Merged revision(s) 2925 from sandbox/adsk/3.1n:
Revert revision #2912 because it is for 2.6. It should not be merged to 3.0+ versions.
........



Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
   + /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846

Modified: trunk/widgets/Legend.js
===================================================================
--- trunk/widgets/Legend.js	2016-04-18 11:28:46 UTC (rev 2929)
+++ trunk/widgets/Legend.js	2016-04-18 11:42:39 UTC (rev 2930)
@@ -840,15 +840,7 @@
                 opt.image = layer.oMap.getLegendImageURL(scale, layer, style);
             }
         }
-        // MapGuide DWF and Raster layer
-        // MapGuide Raster and DWF layer
-        if(layer.layerTypes[0] == 4){
-            opt.image = this.imgLayerRasterIcon;
-            opt.enabled = true;
-        } else if(layer.layerTypes[0] == 5){
-            opt.image = this.imgLayerDWFIcon;
-            opt.enabled = true;
-        }
+
         var item;
         if (!layer.isBaseMapLayer&&checkbox) {
             // opt.contextMenu = this.getContextMenu();