From 3a4da2f3c5ac47ddd746e220fd6abfd083023790 Mon Sep 17 00:00:00 2001 From: arieger Date: Fri, 18 Dec 2015 09:50:37 +0100 Subject: [PATCH 1/2] add additional check whether the tree node has a 'layer' property --- src/GeoExt/tree/Util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GeoExt/tree/Util.js b/src/GeoExt/tree/Util.js index 8233842f9..03fa71fab 100644 --- a/src/GeoExt/tree/Util.js +++ b/src/GeoExt/tree/Util.js @@ -8,7 +8,7 @@ Ext.define('GeoExt.tree.Util', { * @param {boolean} checked the new checked state. */ updateLayerVisibilityByNode: function(node, checked) { - if(checked != node.get('layer').getVisibility()) { + if(node.get('layer') && checked != node.get('layer').getVisibility()) { node._visibilityChanging = true; var layer = node.get('layer'); if(checked && layer.isBaseLayer && layer.map) { From ac7bcbb002e0f682fc607605752137728ac7f707 Mon Sep 17 00:00:00 2001 From: arieger Date: Fri, 18 Dec 2015 11:54:02 +0100 Subject: [PATCH 2/2] - Small code refactoring to be able to reuse the `layer` variable - jshint --- src/GeoExt/tree/Util.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GeoExt/tree/Util.js b/src/GeoExt/tree/Util.js index 03fa71fab..403e271f3 100644 --- a/src/GeoExt/tree/Util.js +++ b/src/GeoExt/tree/Util.js @@ -8,9 +8,9 @@ Ext.define('GeoExt.tree.Util', { * @param {boolean} checked the new checked state. */ updateLayerVisibilityByNode: function(node, checked) { - if(node.get('layer') && checked != node.get('layer').getVisibility()) { + var layer = node.get('layer'); + if(layer && checked != layer.getVisibility()) { node._visibilityChanging = true; - var layer = node.get('layer'); if(checked && layer.isBaseLayer && layer.map) { layer.map.setBaseLayer(layer); } else if(!checked && layer.isBaseLayer && layer.map && @@ -52,7 +52,7 @@ Ext.define('GeoExt.tree.Util', { } }); // enforce "at least one visible" - if(checkedCount === 0 && attributes.checked == false) { + if(checkedCount === 0 && attributes.checked === false) { layer.setVisibility(true); } }