Merge pull request #568 from cmv/fix/minor-layerControl-fixes

Minor fixes to layerControl widget
cmv · Jul 11, 2016 · 53ef38e · 53ef38e
2 parents 29b53f0 + 4239faa
commit 53ef38e
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/viewer/js/gis/dijit/LayerControl.js b/viewer/js/gis/dijit/LayerControl.js
@@ -206,7 +206,7 @@ define([
                 if (layer.loaded) {
                     this._applyLayerControlOptions(layerInfo.controlOptions, layer);
                 } else {
-                    layer.on('load', lang.hitch(this, '_applyLayerControlOptions', layer.controlOptions));
+                    layer.on('load', lang.hitch(this, '_applyLayerControlOptions', layerInfo.controlOptions));
                 }
             }
             var layerControl = new Control({
@@ -346,29 +346,37 @@ define([
             if (this.separated) {
                 if (this.vectorReorder) {
                     array.forEach(this._vectorContainer.getChildren(), function (child) {
-                        if (!child.getPreviousSibling()) {
-                            child._reorderUp.set('disabled', true);
-                        } else {
-                            child._reorderUp.set('disabled', false);
+                        if (child._reorderUp) {
+                            if (!child.getPreviousSibling()) {
+                                child._reorderUp.set('disabled', true);
+                            } else {
+                                child._reorderUp.set('disabled', false);
+                            }
                         }
-                        if (!child.getNextSibling()) {
-                            child._reorderDown.set('disabled', true);
-                        } else {
-                            child._reorderDown.set('disabled', false);
+                        if (child._reorderDown) {
+                            if (!child.getNextSibling()) {
+                                child._reorderDown.set('disabled', true);
+                            } else {
+                                child._reorderDown.set('disabled', false);
+                            }
                         }
                     }, this);
                 }
                 if (this.overlayReorder) {
                     array.forEach(this._overlayContainer.getChildren(), function (child) {
-                        if (!child.getPreviousSibling()) {
-                            child._reorderUp.set('disabled', true);
-                        } else {
-                            child._reorderUp.set('disabled', false);
+                        if (child._reorderUp) {
+                            if (!child.getPreviousSibling()) {
+                                child._reorderUp.set('disabled', true);
+                            } else {
+                                child._reorderUp.set('disabled', false);
+                            }
                         }
-                        if (!child.getNextSibling()) {
-                            child._reorderDown.set('disabled', true);
-                        } else {
-                            child._reorderDown.set('disabled', false);
+                        if (child._reorderDown) {
+                            if (!child.getNextSibling()) {
+                                child._reorderDown.set('disabled', true);
+                            } else {
+                                child._reorderDown.set('disabled', false);
+                            }
                         }
                     }, this);
                 }