浏览代码

Remove duplicate allow_muc and sort

JC Brand 11 年之前
父节点
当前提交
3a1bd7c4e6
共有 1 个文件被更改,包括 7 次插入8 次删除
  1. 7 8
      converse.js

+ 7 - 8
converse.js

@@ -70,20 +70,19 @@
             'auto_list_rooms',
             'auto_list_rooms',
             'auto_subscribe',
             'auto_subscribe',
             'bosh_service_url',
             'bosh_service_url',
-            'fullname',
+            'connection',
             'debug',
             'debug',
+            'fullname',
             'hide_muc_server',
             'hide_muc_server',
             'i18n',
             'i18n',
-            'allow_muc',
+            'jid',
             'prebind',
             'prebind',
+            'rid',
             'show_controlbox_by_default',
             'show_controlbox_by_default',
-            'xhr_user_search',
-            'xhr_custom_status',
-            'connection',
-            'testing',
-            'jid',
             'sid',
             'sid',
-            'rid'
+            'testing',
+            'xhr_custom_status',
+            'xhr_user_search'
         ];
         ];
         _.extend(this, _.pick(settings, whitelist));
         _.extend(this, _.pick(settings, whitelist));