From b495f837456937983a120061065b3852e00001eb Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sun, 24 Mar 2013 12:36:40 +0200
Subject: [PATCH] Now also remove openControlBox

---
 converse.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/converse.js b/converse.js
index c59e86e42..40d4a2d2b 100644
--- a/converse.js
+++ b/converse.js
@@ -1123,19 +1123,6 @@
             return view;
         },
 
-        openControlBox: function () {
-            var controlbox = this.model.get('controlbox')
-            if (controlbox) {
-                controlbox.trigger('show');
-            } else {
-                this.options.model.add({
-                    id: 'controlbox',
-                    box_id: 'controlbox',
-                    visible: true
-                });
-            }
-        },
-
         initialize: function () {
             // boxesviewinit
             this.views = {};
@@ -1990,8 +1977,16 @@
             if ($("div#controlbox").is(':visible')) {
                 this.chatboxes.get('controlbox').destroy();
             } else {
-                this.chatboxesview.openControlBox();
-            }
+                var controlbox = this.chatboxes.get('controlbox')
+                if (controlbox) {
+                    controlbox.trigger('show');
+                } else {
+                    this.create({
+                        id: 'controlbox',
+                        box_id: 'controlbox',
+                        visible: true
+                    });
+                }
         }, this));
 
         $(document).bind('jarnxmpp.connecting', $.proxy(function (ev, conn) {