瀏覽代碼

Add setting to enable/disable MUC

JC Brand 11 年之前
父節點
當前提交
feaff64aab
共有 4 個文件被更改,包括 25 次插入9 次删除
  1. 1 0
      CHANGES.rst
  2. 6 2
      converse.js
  3. 17 7
      docs/source/index.rst
  4. 1 0
      index.html

+ 1 - 0
CHANGES.rst

@@ -8,6 +8,7 @@ Changelog
 * Hungarian translation [w3host]
 * Hungarian translation [w3host]
 * Russian translation [bkocherov]
 * Russian translation [bkocherov]
 * Update CSS to avoid clash with bootstrap [seocam]
 * 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)
 0.6.4 (2013-09-15)
 ------------------
 ------------------

+ 6 - 2
converse.js

@@ -50,6 +50,7 @@
         this.debug = false;
         this.debug = false;
         this.hide_muc_server = false;
         this.hide_muc_server = false;
         this.i18n = locales.en;
         this.i18n = locales.en;
+        this.allow_muc = true;
         this.prebind = false;
         this.prebind = false;
         this.show_controlbox_by_default = false;
         this.show_controlbox_by_default = false;
         this.xhr_user_search = false;
         this.xhr_user_search = false;
@@ -68,6 +69,7 @@
             'debug',
             'debug',
             'hide_muc_server',
             'hide_muc_server',
             'i18n',
             'i18n',
+            'allow_muc',
             'prebind',
             'prebind',
             'show_controlbox_by_default',
             'show_controlbox_by_default',
             'xhr_user_search',
             'xhr_user_search',
@@ -1131,8 +1133,10 @@
                     this.contactspanel.render();
                     this.contactspanel.render();
                     converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus});
                     converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus});
                     converse.xmppstatusview.render();
                     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;
                 return this;
             }
             }

+ 17 - 7
docs/source/index.rst

@@ -465,17 +465,25 @@ JS file so that it will include the new settings. Please refer to the
 Configuration variables
 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
 animate
 -------
 -------
 
 
-Default = True
+Default = ``true``
 
 
 Show animations, for example when opening and closing chat boxes.
 Show animations, for example when opening and closing chat boxes.
 
 
 auto_list_rooms
 auto_list_rooms
 ---------------
 ---------------
 
 
-Default = False
+Default = ``false``
 
 
 If true, and the XMPP server on which the current user is logged in supports
 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.
 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
 auto_subscribe
 --------------
 --------------
 
 
-Default = False
+Default = ``false``
 
 
 If true, the user will automatically subscribe back to any contact requests.
 If true, the user will automatically subscribe back to any contact requests.
 
 
@@ -504,6 +512,8 @@ See `here <http://metajack.im/2008/09/08/which-bosh-server-do-you-need>`_ for mo
 debug
 debug
 -----
 -----
 
 
+Default = ``false``
+
 If set to true, debugging output will be logged to the browser console.
 If set to true, debugging output will be logged to the browser console.
 
 
 fullname
 fullname
@@ -515,7 +525,7 @@ logged in user, otherwise the user's vCard will be fetched.
 hide_muc_server
 hide_muc_server
 ---------------
 ---------------
 
 
-Default = false
+Default = ``false``
 
 
 Hide the ``server`` input field of the form inside the ``Room`` panel of the
 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
 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
 prebind
 --------
 --------
 
 
-Default = false
+Default = ``false``
 
 
 Use this option when you want to attach to an existing XMPP connection that was
 Use this option when you want to attach to an existing XMPP connection that was
 already authenticated (usually on the backend before page load).
 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
 show_controlbox_by_default
 --------------------------
 --------------------------
 
 
-Default = false
+Default = ``false``
 
 
 The "controlbox" refers to the special chatbox containing your contacts roster,
 The "controlbox" refers to the special chatbox containing your contacts roster,
 status widget, chatrooms and other controls.
 status widget, chatrooms and other controls.
@@ -565,7 +575,7 @@ page load.
 xhr_user_search
 xhr_user_search
 ---------------
 ---------------
 
 
-Default = False
+Default = ``false``
 
 
 There are two ways to add users. 
 There are two ways to add users. 
 
 

+ 1 - 0
index.html

@@ -192,6 +192,7 @@
 <script>
 <script>
     require(['converse'], function (converse) {
     require(['converse'], function (converse) {
         converse.initialize({
         converse.initialize({
+            allow_muc: true,
             auto_list_rooms: false,
             auto_list_rooms: false,
             auto_subscribe: false,
             auto_subscribe: false,
             bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
             bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes