Commit Graph

1323 Commits

Author SHA1 Message Date
JC Brand
e344bf769a New modal for adding contacts.
Remove the xhr_user_search and xhr_user_search_url options
Lazily create modals
2018-02-23 16:33:09 +01:00
JC Brand
b3409fd01b Move common modal view code into a base class 2018-02-22 18:41:01 +01:00
JC Brand
249ee2b5ca Bugfix. Method wasn't called 2018-02-22 17:47:08 +01:00
JC Brand
4e508cfe88 Add a modal to list rooms 2018-02-22 17:40:01 +01:00
JC Brand
e143c88475 More work on the "add chatroom" modal. Working now. 2018-02-22 15:58:23 +01:00
JC Brand
224e1eee29 Merge branch 'master' into bootstrap4 2018-02-22 14:39:20 +01:00
JC Brand
1e5b6243be Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server 2018-02-22 13:55:17 +01:00
JC Brand
5e320d031d Don't remove the minimized chats element upon logout 2018-02-22 13:35:05 +01:00
JC Brand
33cfe07331 Recreate promises upon logout. 2018-02-22 13:35:05 +01:00
JC Brand
68b839d0d1 Add onMultipleEvents utility method.
And use it instead of listening to multiple Promises.

Promises get resolved once, which means using them doesn't work for
cases where the user logs out, and then in again (because the handlers
don't get called upon 2nd login).
2018-02-22 13:35:05 +01:00
JC Brand
a5513229de Work on showing auto_joined chatrooms 2018-02-22 11:49:59 +01:00
JC Brand
1ce46a84ae Make sure that statusInitialized is always called
regardless of wether it's a connection or reconnection event.

We can then only listen for `statusInitialized` to handle both cases.
2018-02-22 11:20:26 +01:00
JC Brand
5968eec783 Set backbone.nativeview as dependency for backbone.vdomview 2018-02-22 10:49:22 +01:00
JC Brand
47aad31899 Tricky refactoring.
Removed `_converse.chatboxviews.showChat` and trying to simplify how
chats are created and when they're shown.

Prompted by the work to split the MUC views into a separate plugin
2018-02-21 23:47:02 +01:00
JC Brand
d1d43edf52 Move MUC views into a new plugin 2018-02-21 22:40:30 +01:00
JC Brand
d9709af7cf Initial work on the new chatroom modal 2018-02-21 16:59:16 +01:00
JC Brand
b5812e257d Work on the status modal 2018-02-21 16:17:57 +01:00
JC Brand
ec2bda338b Refactor XMPPStatus.
- Remove undocumented and unused event `update-status-ui`
- Remove xhr_custom_status and xhr_custom_status_url options
- Use default value
- Remove unnecessary getter and setter
2018-02-21 14:41:54 +01:00
JC Brand
ad01ab3041 Add status modal 2018-02-21 14:03:07 +01:00
JC Brand
1470b86896 Fix logout 2018-02-20 16:51:59 +01:00
JC Brand
21556832f8 Update chatbox headers and buttons 2018-02-20 16:48:01 +01:00
JC Brand
83e9395868 Highlight info icon when room info is shown 2018-02-20 16:00:23 +01:00
JC Brand
2b935fa57b Show subdued grey for icons (and darker when hovering) 2018-02-20 15:57:01 +01:00
JC Brand
6b89a6c106 Only show img tag if we have image data 2018-02-20 15:56:58 +01:00
JC Brand
5e6860754f Update chatbox head with new markup 2018-02-19 22:36:37 +01:00
JC Brand
d8f80bc0e6 Merge branch 'master' into bootstrap4 2018-02-19 22:13:01 +01:00
JC Brand
c4367e7a0a Show own avatar 2018-02-19 22:12:50 +01:00
JC Brand
745b821848 Bugfix. Avatars weren't being shown 2018-02-19 21:33:27 +01:00
JC Brand
c12e361ebe Remove unused method 2018-02-19 21:03:16 +01:00
JC Brand
08c016da0e Get ancestor element via selector 2018-02-19 20:54:58 +01:00
JC Brand
658c27730c Fix showing of room info in rooms list 2018-02-19 18:11:02 +01:00
JC Brand
6cdaa47493 Fix roster filter functionality 2018-02-19 17:37:47 +01:00
JC Brand
493ecb2e4f Update markup for the roster filter 2018-02-19 16:08:54 +01:00
JC Brand
2fa8304945 Improve and update roster markup 2018-02-19 15:01:02 +01:00
JC Brand
e6fdcc610f Merge branch 'master' into bootstrap4 2018-02-19 14:28:46 +01:00
JC Brand
fa6569352c Don't use _.template for variable interpolation
It depends on `eval` which is unsafe.
2018-02-19 11:08:32 +01:00
JC Brand
4d34952eae Consider elements with class hidden as invisible 2018-02-19 10:35:42 +01:00
JC Brand
48c806c9d0 Shorten utils to u 2018-02-19 10:34:52 +01:00
JC Brand
650ed22da7 Update requesting contacts and tweak bookmark icons 2018-02-16 15:24:17 +01:00
JC Brand
c4a99c7f29 Render rooms and bookmarks lists according to mockups 2018-02-16 15:08:16 +01:00
JC Brand
ede21e7c32 Remove controlbox tabs and show rooms and contacts panels together 2018-02-16 14:16:55 +01:00
JC Brand
b6501bcf09 Render .row inside #conversejs element 2018-02-15 15:50:37 +01:00
JC Brand
617019af0e Merge remote-tracking branch 'origin' into bootstrap4 2018-02-15 14:15:04 +01:00
JC Brand
db85cb7f1d Release 3.3.3 2018-02-14 16:53:07 +01:00
JC Brand
d8f2a1eb57 In embedded mode, allow fetching of rooms from sessionStorage
Otherwise we lose the MUC session upon reload.
2018-02-14 15:50:47 +01:00
JC Brand
732c923324 Bugfix. Don't show hidden MUCs when new message received. 2018-02-14 13:44:17 +01:00
JC Brand
fc560bf8ac Use this.content instead of ev.target, which is null
when using converse.js inside a webcomponent
2018-02-14 12:30:30 +01:00
JC Brand
9edcea1181 Include converse-muc-embedded in main build 2018-02-14 02:40:56 +01:00
JC Brand
08a76d8a6b Merge branch 'webcomponent-embedded' 2018-02-14 02:15:49 +01:00
linkmauve
af6867e638 improve @title on roster item (#1013) 2018-02-14 00:43:33 +01:00