Commit c3b2a913 authored by JC Brand's avatar JC Brand

Don't open the controlbox on requesting contacts.

Can get annoying very quickly
parent 06cbd5cd
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
- Bugfix: Trying to save data on the `ControlBox` model before `ChatBoxes` - Bugfix: Trying to save data on the `ControlBox` model before `ChatBoxes`
collection has its `browserStorage` configured. collection has its `browserStorage` configured.
Causes `Error: A "url" property or function must be specified`. [jcbrand] 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) ## 2.0.1 (2016-11-07)
- #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand] - #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand]
......
...@@ -926,9 +926,6 @@ ...@@ -926,9 +926,6 @@
fullname: mock.req_names[i] fullname: mock.req_names[i]
}); });
expect(converse.rosterview.update).toHaveBeenCalled(); 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 // Check that they are sorted alphabetically
children = converse.rosterview.get('Contact requests').$el.siblings('dd.requesting-xmpp-contact').children('span'); children = converse.rosterview.get('Contact requests').$el.siblings('dd.requesting-xmpp-contact').children('span');
......
...@@ -592,7 +592,6 @@ ...@@ -592,7 +592,6 @@
'allow_chat_pending_contacts': converse.allow_chat_pending_contacts 'allow_chat_pending_contacts': converse.allow_chat_pending_contacts
}) })
)); ));
converse.controlboxtoggle.showControlBox();
} else if (subscription === 'both' || subscription === 'to') { } else if (subscription === 'both' || subscription === 'to') {
this.$el.addClass('current-xmpp-contact'); this.$el.addClass('current-xmpp-contact');
this.$el.removeClass(_.without(['both', 'to'], subscription)[0]).addClass(subscription); this.$el.removeClass(_.without(['both', 'to'], subscription)[0]).addClass(subscription);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment