From feaff64aab0beb4ae15ef9062782d12d42c95239 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 3 Oct 2013 13:16:26 +0200 Subject: [PATCH 1/3] Add setting to enable/disable MUC --- CHANGES.rst | 1 + converse.js | 8 ++++++-- docs/source/index.rst | 24 +++++++++++++++++------- index.html | 1 + 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5f7bb118f..f11951be2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,7 @@ Changelog * Hungarian translation [w3host] * Russian translation [bkocherov] * Update CSS to avoid clash with bootstrap [seocam] +* Add config option ``allow_muc`` to enable/disable multi-user chat (MUC) [jcbrand] 0.6.4 (2013-09-15) ------------------ diff --git a/converse.js b/converse.js index 7ef2d2ca9..9a755e380 100644 --- a/converse.js +++ b/converse.js @@ -50,6 +50,7 @@ this.debug = false; this.hide_muc_server = false; this.i18n = locales.en; + this.allow_muc = true; this.prebind = false; this.show_controlbox_by_default = false; this.xhr_user_search = false; @@ -68,6 +69,7 @@ 'debug', 'hide_muc_server', 'i18n', + 'allow_muc', 'prebind', 'show_controlbox_by_default', 'xhr_user_search', @@ -1131,8 +1133,10 @@ this.contactspanel.render(); converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus}); converse.xmppstatusview.render(); - this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('#controlbox-panes')}); - this.roomspanel.render(); + if (converse.allow_muc) { + this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('.controlbox-panes')}); + this.roomspanel.render(); + } } return this; } diff --git a/docs/source/index.rst b/docs/source/index.rst index 98761421e..68e1c4d8b 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -465,17 +465,25 @@ JS file so that it will include the new settings. Please refer to the Configuration variables ======================= +allow_muc +--------- + +Default = ``true`` + +Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove +the ``Chatrooms`` tab from the control box. + animate ------- -Default = True +Default = ``true`` Show animations, for example when opening and closing chat boxes. auto_list_rooms --------------- -Default = False +Default = ``false`` If true, and the XMPP server on which the current user is logged in supports multi-user chat, then a list of rooms on that server will be fetched. @@ -489,7 +497,7 @@ option will create lots of extra connection traffic. auto_subscribe -------------- -Default = False +Default = ``false`` If true, the user will automatically subscribe back to any contact requests. @@ -504,6 +512,8 @@ See `here `_ for mo debug ----- +Default = ``false`` + If set to true, debugging output will be logged to the browser console. fullname @@ -515,7 +525,7 @@ logged in user, otherwise the user's vCard will be fetched. hide_muc_server --------------- -Default = false +Default = ``false`` Hide the ``server`` input field of the form inside the ``Room`` panel of the controlbox. Useful if you want to restrict users to a specific XMPP server of @@ -530,7 +540,7 @@ Specify the locale/language. The language must be in the ``locales`` object. Ref prebind -------- -Default = false +Default = ``false`` Use this option when you want to attach to an existing XMPP connection that was already authenticated (usually on the backend before page load). @@ -550,7 +560,7 @@ Additionally, you have to specify ``bosh_service_url``. show_controlbox_by_default -------------------------- -Default = false +Default = ``false`` The "controlbox" refers to the special chatbox containing your contacts roster, status widget, chatrooms and other controls. @@ -565,7 +575,7 @@ page load. xhr_user_search --------------- -Default = False +Default = ``false`` There are two ways to add users. diff --git a/index.html b/index.html index e4a748fb5..c03ad7265 100644 --- a/index.html +++ b/index.html @@ -192,6 +192,7 @@