From 128335e1dcaa83c282016c6514a6162940099f4e Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 27 Feb 2017 21:12:15 +0000 Subject: [PATCH] 50 seems like a better default --- docs/CHANGES.md | 2 +- docs/source/configuration.rst | 2 +- src/converse-mam.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 6ac132429..6076d7969 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -19,7 +19,7 @@ - The no-jQuery build has been renamed from `converse.nojquery.js` to `converse-no-jquery.js` to fit the convention used for other build names. [jcbrand] -- 100 is the new default [archived_messages_page_size](https://conversejs.org/docs/html/configuration.html#archived-messages-page-size) +- 50 is the new default [archived_messages_page_size](https://conversejs.org/docs/html/configuration.html#archived-messages-page-size) [jcbrand] - Better support for delayed delivery of presence stanzas (XEP-0203). [jcbrand] - The chat room `description` is now shown in the heading, not the `subject`. diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index c1928756e..76370aaac 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -211,7 +211,7 @@ Show animations, for example when opening and closing chat boxes. archived_messages_page_size --------------------------- -* Default: ``100`` +* Default: ``50`` See also: `message_archiving`_ diff --git a/src/converse-mam.js b/src/converse-mam.js index 8d76691cd..0e34a1101 100644 --- a/src/converse-mam.js +++ b/src/converse-mam.js @@ -181,7 +181,7 @@ var _converse = this._converse; this.updateSettings({ - archived_messages_page_size: '100', + archived_messages_page_size: '50', message_archiving: undefined, // Supported values are 'always', 'never', 'roster' (https://xmpp.org/extensions/xep-0313.html#prefs) message_archiving_timeout: 8000, // Time (in milliseconds) to wait before aborting MAM request });