fix(layer-selector-ui): layer is correctly set to invisible when its …

…opacity set to 0 Closes #9616
RAMP-PCAR · Apr 28, 2015 · d1bc831 · d1bc831
1 parent d44d085
commit d1bc831
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/js/RAMP/Modules/filterManager.js b/src/js/RAMP/Modules/filterManager.js
@@ -124,7 +124,9 @@ define([
                                     // Setting Opacity to >0.0, sets layer to visible
                                     newState = leftValue === 0 ? false : slider.hasClass("disabled") ? true : newState;
 
-                                    if (newState && cause && cause !== "refresh") {
+                                    // TODO: refactor; this is a bit unclear
+                                    // fire event only if newState is false or true; do nothing if undefined
+                                    if (typeof newState !== 'undefined' && cause && cause !== "refresh") {
                                         topic.publish(EventManager.FilterManager.TOGGLE_LAYER_VISIBILITY, {
                                             state: newState,
                                             layerId: sliderId

diff --git a/src/js/RAMP/Utils/checkboxGroup.js b/src/js/RAMP/Utils/checkboxGroup.js
@@ -186,14 +186,14 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/_base/arr
                         nodes: nodes
                     }
                 );
-                
+
                 masterCheckboxOptions = {
                     nodeIdAttr: this.nodeIdAttr,
                     cssClass: this.cssClass,
                     label: this.label,
                     onChange: this.onChange
                 };
-                
+
                 if (this.master.node) {
                     this.master.checkbox = new Checkbox(
                         this.master.node,
@@ -312,7 +312,10 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/_base/arr
                         }
                     }
 
-                    checkbox.setState(state);
+                    // make sure there is a checkbox to set state on
+                    if (checkbox) {
+                        checkbox.setState(state);
+                    }
 
                     this._checkMaster();
                 }