From aec966e36aacc70ad60fb29daa095fd1a2f2e00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20R=C3=BCprich?= Date: Thu, 11 Feb 2016 01:23:50 +0100 Subject: [PATCH] Fix for issue #261 When converse is first initialized this.model.get('closed') is undefined, at least with some configurations. This patch initializes the attribute with !show_controlbox_by_default if it is undefined. Update CHANGES.md fix make check Update CHANGES.md --- converse.js | 3 +++ docs/CHANGES.md | 1 + 2 files changed, 4 insertions(+) diff --git a/converse.js b/converse.js index ddad41f64..abc3d39bb 100755 --- a/converse.js +++ b/converse.js @@ -2555,6 +2555,9 @@ if (this.model.get('connected')) { this.initRoster(); } + if (typeof this.model.get('closed')==='undefined') { + this.model.set('closed', !converse.show_controlbox_by_default); + } if (!this.model.get('closed')) { this.show(); } else { diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 7ccf1f58c..4dd1c88c4 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -2,6 +2,7 @@ ## 0.10.2 (Unreleased) +- #261 show_controlbox_by_default config not working [diditopher] - #573 xgettext build error: `'javascript' unknown` ## 0.10.1 (2016-02-06)