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

[svn_fusion at osgeo.org]

Author: jng
Date: 2016-04-18 04:52:40 -0700 (Mon, 18 Apr 2016)
New Revision: 2932

Modified:
   trunk/
   trunk/widgets/Legend.js
Log:
Merged revision(s) 2927 from sandbox/adsk/3.1n:
Fix error that base layer legend cannot be displayed. 
The type of base layer tree item/folder is Jx.TreeItem/Jx.TreeFolder.
........



Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2926
/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-2927
/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:46:08 UTC (rev 2931)
+++ trunk/widgets/Legend.js	2016-04-18 11:52:40 UTC (rev 2932)
@@ -636,7 +636,8 @@
                 if (!layer.legend.treeItem) {
                     layer.legend.treeItem = this.createFolderItem(layer);
                     this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
-                } else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeItem) {
+                } else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeItem ||
+                           layer.legend.treeItem instanceof Jx.TreeItem) {
                     this.clearTreeItem(layer);
                     layer.legend.treeItem = this.createFolderItem(layer);
                     this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
@@ -674,7 +675,8 @@
                 if (!layer.legend.treeItem) {
                     layer.legend.treeItem = this.createTreeItem(layer, style, fScale, !layer.isBaseMapLayer);
                     this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
-                } else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeFolder) {
+                } else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeFolder ||
+                           layer.legend.treeItem instanceof Jx.TreeFolder) {
                     this.clearTreeItem(layer);
                     layer.legend.treeItem = this.createTreeItem(layer, style, fScale, !layer.isBaseMapLayer);
                     this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);