Skip to content

Commit

Permalink
collapsible property of panes was being ignored in some situations …
Browse files Browse the repository at this point in the history
…so collaspe button was not placed.
  • Loading branch information
tmcgee committed Sep 10, 2016
1 parent 00f0ab7 commit 1fb42bd
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions viewer/js/viewer/_LayoutMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,10 @@ define([
initPanes: function () {
var key,
panes = this.config.panes || {};
this.defaultPanes = lang.clone(this.panes);
for (key in this.panes) {
if (this.panes.hasOwnProperty(key)) {
panes[key] = lang.mixin(this.panes[key], panes[key]);
if (this.defaultPanes.hasOwnProperty(key)) {
panes[key] = lang.mixin(this.defaultPanes[key], panes[key]);
}
}

Expand Down Expand Up @@ -166,8 +167,8 @@ define([
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]);
if (this.defaultPanes.hasOwnProperty(key)) {
panes[key] = lang.mixin(this.defaultPanes[key], panes[key]);
}
}
// where to place the buttons
Expand Down

0 comments on commit 1fb42bd

Please sign in to comment.