Merge branch 'develop' into feature/update-grunt-packages-and-eslint-…

…rules
cmv · Apr 11, 2016 · bb4614c · bb4614c
2 parents 425afa4 + e7ac203
commit bb4614c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/viewer/js/viewer/_LayoutMixin.js b/viewer/js/viewer/_LayoutMixin.js
@@ -75,7 +75,7 @@ define([
         addTopics: function () {
             // toggle a sidebar pane
             topic.subscribe('viewer/togglePane', lang.hitch(this, function (args) {
-                this.toggleSidebar(args.pane, args.show);
+                this.togglePane(args.pane, args.show);
             }));
 
             // load a widget
@@ -160,12 +160,17 @@ define([
                 }
             }
             this.panes.outer.startup();
-            this.createPanes(panes);
         },
 
-        createPanes: function (panes) {
-            var key;
-            // where to place the buttons
+        createPanes: function () {
+            var key,
+                panes = this.config.panes || {};
+            for (key in this.panes) {
+                if (this.panes.hasOwnProperty(key)) {
+                    panes[key] = lang.mixin(this.panes[key], panes[key]);
+                }
+            }
+                        // where to place the buttons
             // either the center map pane or the outer pane?
             this.collapseButtonsPane = this.config.collapseButtonsPane || 'outer';
 
@@ -204,6 +209,7 @@ define([
                 }
             }
 
+            this.resizeLayout();
         },
 
         togglePane: function (id, show) {

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -177,7 +177,7 @@ define([
             });
 
             // in _LayoutsMixin
-            this.resizeLayout();
+            this.createPanes();
 
             // in _WidgetsMixin
             this.initWidgets();