Don't open the controlbox on requesting contacts.

Can get annoying very quickly
This commit is contained in:
JC Brand 2016-11-22 17:40:03 +01:00
parent 06cbd5cdd0
commit c3b2a913bb
3 changed files with 1 additions and 4 deletions

View File

@ -9,6 +9,7 @@
- Bugfix: Trying to save data on the `ControlBox` model before `ChatBoxes`
collection has its `browserStorage` configured.
Causes `Error: A "url" property or function must be specified`. [jcbrand]
- Don't open the controlbox on contact requests. [jcbrand]
## 2.0.1 (2016-11-07)
- #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand]

View File

@ -926,9 +926,6 @@
fullname: mock.req_names[i]
});
expect(converse.rosterview.update).toHaveBeenCalled();
// When a requesting contact is added, the controlbox must
// be opened.
expect(converse.controlboxtoggle.showControlBox).toHaveBeenCalled();
}
// Check that they are sorted alphabetically
children = converse.rosterview.get('Contact requests').$el.siblings('dd.requesting-xmpp-contact').children('span');

View File

@ -592,7 +592,6 @@
'allow_chat_pending_contacts': converse.allow_chat_pending_contacts
})
));
converse.controlboxtoggle.showControlBox();
} else if (subscription === 'both' || subscription === 'to') {
this.$el.addClass('current-xmpp-contact');
this.$el.removeClass(_.without(['both', 'to'], subscription)[0]).addClass(subscription);