Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use the new plugin helper method updateSettings

Browse Source
This commit is contained in:
JC Brand 2016-03-13 16:22:42 +00:00
parent fe47773c7f
commit f55b593791
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/converse-controlbox.js
View File

@ -10,6 +10,7 @@
define("converse-controlbox", [
"converse-core",
"converse-api",
"converse-rosterview",
// TODO: remove this dependency
"converse-chatview"
], factory);
@ -172,12 +173,9 @@
* loaded by converse.js's plugin machinery.
*/
var converse = this.converse;
var settings = {
this.updateSettings({
show_controlbox_by_default: false,
};
_.extend(converse.default_settings, settings);
_.extend(converse, settings);
_.extend(converse, _.pick(converse.user_settings, Object.keys(settings)));
});
var STATUSES = {
'dnd': __('This contact is busy'),

10
src/converse-notification.js
View File

@ -28,16 +28,14 @@
* loaded by converse.js's plugin machinery.
*/
var converse = this.converse;
// Configuration values for this plugin
var settings = {
this.updateSettings({
show_desktop_notifications: true,
play_sounds: false,
sounds_path: '/sounds/',
notification_icon: '/logo/conversejs.png'
};
_.extend(converse.default_settings, settings);
_.extend(converse, settings);
_.extend(converse, _.pick(converse.user_settings, Object.keys(settings)));
});
converse.isOnlyChatStateNotification = function ($msg) {
// See XEP-0085 Chat State Notification

9
src/converse-ping.js
View File

@ -46,13 +46,10 @@
* loaded by converse.js's plugin machinery.
*/
var converse = this.converse;
// Configuration values for this plugin
var settings = {
this.updateSettings({
ping_interval: 180 //in seconds
};
_.extend(converse.default_settings, settings);
_.extend(converse, settings);
_.extend(converse, _.pick(converse.user_settings, Object.keys(settings)));
});
converse.ping = function (jid, success, error, timeout) {
// XXX: We could first check here if the server advertised that

10
src/converse-register.js
View File

@ -80,16 +80,12 @@
* loaded by converse.js's plugin machinery.
*/
var converse = this.converse;
// For translations
// Configuration values for this plugin
var settings = {
this.updateSettings({
allow_registration: true,
domain_placeholder: __(" e.g. conversejs.org"), // Placeholder text shown in the domain input on the registration form
providers_link: 'https://xmpp.net/directory.php', // Link to XMPP providers shown on registration page
};
_.extend(converse.default_settings, settings);
_.extend(converse, settings);
_.extend(converse, _.pick(converse.user_settings, Object.keys(settings)));
});
converse.RegisterPanel = Backbone.View.extend({