Don't prompt for reason if auto_join_on_invite
This commit is contained in:
parent
ce539ac685
commit
0957b7086f
@ -21,6 +21,7 @@
|
|||||||
- #1457: Wrong tooltip shown for "unbookmark" icon
|
- #1457: Wrong tooltip shown for "unbookmark" icon
|
||||||
- #1479: Allow file upload by drag & drop also in MUCs
|
- #1479: Allow file upload by drag & drop also in MUCs
|
||||||
- #1487: New config option [muc_respect_autojoin](https://conversejs.org/docs/html/configuration.html#muc-respect-autojoin)
|
- #1487: New config option [muc_respect_autojoin](https://conversejs.org/docs/html/configuration.html#muc-respect-autojoin)
|
||||||
|
- #1501: Don't prompt for a reason if [auto_join_on_invite](https://conversejs.org/docs/html/configuration.html#auto-join-on-invite) is `true`
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
6
dist/converse.js
vendored
6
dist/converse.js
vendored
@ -55708,7 +55708,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins
|
|||||||
},
|
},
|
||||||
|
|
||||||
promptForInvite(suggestion) {
|
promptForInvite(suggestion) {
|
||||||
const reason = prompt(__('You are about to invite %1$s to the groupchat "%2$s". ' + 'You may optionally include a message, explaining the reason for the invitation.', suggestion.text.label, this.model.get('id')));
|
let reason = '';
|
||||||
|
|
||||||
|
if (!_converse.auto_join_on_invite) {
|
||||||
|
reason = prompt(__('You are about to invite %1$s to the groupchat "%2$s". ' + 'You may optionally include a message, explaining the reason for the invitation.', suggestion.text.label, this.model.get('id')));
|
||||||
|
}
|
||||||
|
|
||||||
if (reason !== null) {
|
if (reason !== null) {
|
||||||
this.chatroomview.model.directInvite(suggestion.text.value, reason);
|
this.chatroomview.model.directInvite(suggestion.text.value, reason);
|
||||||
|
@ -363,6 +363,7 @@ auto_join_on_invite
|
|||||||
* Default: ``false``
|
* Default: ``false``
|
||||||
|
|
||||||
If true, the user will automatically join a chatroom on invite without any confirm.
|
If true, the user will automatically join a chatroom on invite without any confirm.
|
||||||
|
Also inviting users won't be prompted for a reason.
|
||||||
|
|
||||||
|
|
||||||
auto_join_private_chats
|
auto_join_private_chats
|
||||||
|
@ -1948,11 +1948,14 @@ converse.plugins.add('converse-muc-views', {
|
|||||||
|
|
||||||
|
|
||||||
promptForInvite (suggestion) {
|
promptForInvite (suggestion) {
|
||||||
const reason = prompt(
|
let reason = '';
|
||||||
__('You are about to invite %1$s to the groupchat "%2$s". '+
|
if (!_converse.auto_join_on_invite) {
|
||||||
'You may optionally include a message, explaining the reason for the invitation.',
|
reason = prompt(
|
||||||
suggestion.text.label, this.model.get('id'))
|
__('You are about to invite %1$s to the groupchat "%2$s". '+
|
||||||
);
|
'You may optionally include a message, explaining the reason for the invitation.',
|
||||||
|
suggestion.text.label, this.model.get('id'))
|
||||||
|
);
|
||||||
|
}
|
||||||
if (reason !== null) {
|
if (reason !== null) {
|
||||||
this.chatroomview.model.directInvite(suggestion.text.value, reason);
|
this.chatroomview.model.directInvite(suggestion.text.value, reason);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user