Commit Graph

651 Commits

Author SHA1 Message Date
JC Brand
59505c0c48 Show the invitation reason if it exists. updates #215
Also, call the directInvite method on the XmppRoom obj of Strophe.MUC. This
will automatically include the room name and password.
2014-08-31 01:17:52 +02:00
JC Brand
b158c328dd Include reason for invite, if there is one. updates #215 2014-08-30 17:56:45 +02:00
JC Brand
bea7687bac Add protocol code for sending and receiving invites. updates #215 2014-08-30 16:00:52 +02:00
JC Brand
0a7d05c0e5 Handle contact selection. update #215 2014-08-30 13:34:57 +02:00
JC Brand
c17f085d30 updates #215
* Fix filter predicates.
* Include contact JID in suggestions list
2014-08-30 13:26:33 +02:00
JC Brand
172d18fa0a Typeahead now has actual queried suggestions. updates #215 2014-08-27 18:57:03 +02:00
JC Brand
84c2242c91 Enable typeahead on the input and style the suggestions dropdown. updates #215 2014-08-27 11:16:29 +02:00
JC Brand
8061171b9c Rename the sound files to make their role clearer. updates #62 2014-08-23 10:55:04 +02:00
JC Brand
882bbcb02e Add support for sound notifications. updates #62
(on incoming messages)
2014-08-20 21:00:28 +02:00
JC Brand
278c2c428d Add tests for the live filter functionality. updates #212 2014-08-18 22:39:24 +02:00
JC Brand
c4a8101070 Bugfix. Make sure to hide the filter type as well. 2014-08-11 22:26:10 +02:00
JC Brand
9bda651137 Bugfix. Detach the element before positioning it again.
Otherwise the index of the element relative to which we place it changes
depending on whether the element being positioned is placed before or after it.
2014-08-11 22:16:36 +02:00
JC Brand
1299a1d4ba Add support for filtering by group. update #212 2014-08-11 21:48:48 +02:00
JC Brand
729bea2abb Add button to clear the filter value. update #212 2014-08-08 21:41:47 +02:00
JC Brand
52ce812694 Much better live filter implementation. updates #212 2014-08-08 19:08:47 +02:00
JC Brand
aff91fc683 updates #212
* Make sure that the roster container has a fixed height, so that we can better
check whether the roster is overflowing.
* Call update after inserting the roster into the DOM
2014-08-08 18:00:48 +02:00
JC Brand
ef519342e9 Bugfix. browserStorage of contacts wasn't changing accross users. 2014-08-07 22:38:52 +02:00
JC Brand
00e05c029b Style the live filter and make sure that it...
only shows when the roster is overflowing. updates #212
2014-08-07 22:18:44 +02:00
JC Brand
1441f4ab64 Add text input to act as live filter. updates #212 2014-08-07 21:33:19 +02:00
JC Brand
4f3eee3401 Bugfix. Make sure url is always defined. 2014-08-04 22:19:18 +02:00
JC Brand
21fd082c9b Bugfix. Only position groups once all of them have been fetched.
updates #83
2014-08-04 21:57:53 +02:00
JC Brand
31decd1723 Disable 'strict' mode to avoid Safari bug.
See: https://github.com/jcbrand/converse.js/issues/196
and: https://github.com/jrburke/requirejs/issues/392

updates #196
2014-08-04 19:38:48 +02:00
JC Brand
d5b9af7558 Bugfix. Make sure group toggle state is persisted to browser storage.
updates #83
2014-08-04 19:12:03 +02:00
JC Brand
be1d1f6652 Remove unused code 2014-08-04 19:01:15 +02:00
JC Brand
cdf0a0d279 Make sure contacts added to a collapsed group header are hidden.
updates #83
2014-08-04 18:48:48 +02:00
JC Brand
5171d88c91 Bugfix. data attr is not set via jquery.data 2014-08-04 18:17:34 +02:00
JC Brand
539bd2db10 Fixed some problems with rendering roster contacts 2014-08-03 23:55:20 +02:00
JC Brand
4e7de9e5ba Handle case where groups are added from browser storage.
update #83
2014-08-03 23:27:10 +02:00
JC Brand
6a28420d09 Fix linting errors 2014-08-03 23:07:48 +02:00
JC Brand
33d84a0c8e Store roster on converse obj.
Storing it on the rosterview causes race conditions.
2014-08-03 23:05:36 +02:00
JC Brand
ce0096de33 Remember toggle state of group headers. updates #83 2014-08-03 20:48:49 +02:00
JC Brand
1810e8090e Some cleanup. Remove unused methods, renamed certain vars 2014-08-03 19:42:23 +02:00
JC Brand
219d5c8a30 Major refactor.
The RosterView view is now an overview of RosterGroup objects.

RosterGroup objects each have their own collection of contacts which fall under that group.
Additionally, the RosterView has a collection of all contacts.

The comparator of RosterContacts is now used to correctly position roster
contacts and we therefore no longer need to explicitly sort them afterwards.

updates #83
updates #151
2014-08-02 19:31:53 +02:00
JC Brand
ca260f7b4f Add support for separe group objects and collection 2014-08-02 14:25:24 +02:00
JC Brand
fdd0583a0c Rename RosterItem to RosterContact 2014-08-02 11:35:03 +02:00
JC Brand
2b927f21be Big refactor. The RosterView is no longer an overview.
This is because we can no longer assume a one to one mapping between roster
contacts and their views. Roster contacts can belong to more than one group,
each group needs to show the contact, which means we need a view for each group
the contact belongs to.

updates #83
2014-08-01 21:31:21 +02:00
JC Brand
6a82c087c3 Refactor to eventually allow buddies to belong to multiple groups.
In order to make group values non-distinct, (i.e. buddies can be in multiple
groups), we can't assume there's one view per roster item.

This means we cannot manage the rosterview as an overview (since it makes this
assumption).
2014-07-31 21:50:34 +02:00
JC Brand
d0f07f26a5 Check that users are sorted per group and that groups are in the correct order.
updates #83
2014-07-31 20:52:38 +02:00
JC Brand
64580bfd3d Refactor to make more manageable 2014-07-31 18:20:20 +02:00
JC Brand
9b65b57024 Ensure that group headings appear in alphabetical order.
updates #83
2014-07-30 19:20:38 +02:00
JC Brand
3984aadb9f More work (with tests) on showing roster items under groups.
updates #83
2014-07-29 19:53:57 +02:00
JC Brand
be76156292 All tests pass \o/ 2014-07-25 10:18:59 +02:00
JC Brand
cfa55896a5 Trying to use a document fragment for the roster view 2014-07-25 09:58:42 +02:00
JC Brand
a9f9328682 Lazy querying of groupings 2014-07-25 09:05:33 +02:00
JC Brand
0640dd5ae5 Clean up the initialize method of RosterView
by moving event handers out
2014-07-25 08:59:38 +02:00
JC Brand
434e21d046 Some sorting optimizations
* Differentiate between adding new roster items and rendering existing ones.
* Also, only sort pending and requesting contacts once they've all been added
  (similar to what was already being done with existing contacts)
2014-07-24 20:48:52 +02:00
JC Brand
b1b63b0267 Refactor updateRoster and renderRosterItemView
Simplified updateRoster by removing the duplicate checks that RosterItemView's
render method was doing.
2014-07-23 20:10:10 +02:00
JC Brand
4322e9032b Bugfix.
Can't know whether existing roster item is already shown under the existing group.
2014-07-23 19:21:14 +02:00
JC Brand
1705aa8f48 Bugfix. Handle case where user accepts request.
But other user is not online to quickly subscribe back.
2014-07-23 19:11:29 +02:00
JC Brand
2886479b9b Merge branch 'master' into groups
Conflicts:
	converse.js
2014-07-23 13:23:30 +02:00
g8g3
05a54ba054 Assignment to writable property style.height instead of readonly offsetHeight.
Fixes #196.
2014-07-21 10:57:12 +02:00
JC Brand
ce617f1f31 Some refactoring of RosterView and skeleton for groups test 2014-07-20 22:44:50 +02:00
JC Brand
e1a19678ad Allow group headings to be toggleable. updates #83 2014-07-20 19:11:34 +02:00
JC Brand
29c822a6b5 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-20 00:16:22 +02:00
JC Brand
0aca9ef3c2 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-19 23:54:52 +02:00
JC Brand
04d2b3aefd Some initial refactoring to support roster groups. updates #83
Made sure that the non-group usecase is still covered.
2014-07-19 23:45:21 +02:00
JC Brand
7c9a86293d Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:43:56 +02:00
JC Brand
df374d3d3e Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:41:53 +02:00
JC Brand
a338ede0d1 Replace accept/decline buttons with font icons 2014-07-19 14:50:25 +02:00
JC Brand
37ac91dc1e Bugfix. Two undefined vars (now an issue because of strict mode) 2014-07-19 12:31:02 +02:00
JC Brand
53f38dcc71 Two changes, see below:
* Call refreshWebkit hack when opening a chat room
* New event emitted when a chat room is opened.
2014-07-17 19:18:48 +02:00
JC Brand
3423f7bc74 Bugfix. fixes #180 2014-07-17 17:44:44 +02:00
JC Brand
66e45f91e9 Bugfix. First render before fetching msgs. Fixes #191 2014-07-17 17:29:05 +02:00
JC Brand
9846f89a2c If no resource exists, add one which mentions converse.js
updates #123
2014-07-15 07:57:28 +02:00
JC Brand
01c2c5d93c Save groups on RosterItem. updates #83 2014-07-14 21:44:18 +02:00
JC Brand
6bded11304 Add connection feedback on the controlbox.
Now that the toggle is hidden when the controlbox is visible.
2014-07-14 20:41:26 +02:00
JC Brand
fe3e9f5294 Bugfix, xhr_user_search_url is not a global. Fixes #192 2014-07-11 16:12:56 +02:00
JC Brand
012cbfb61a Rename events.
Remove the "on" prefix. Events are listened to via "on" method, so it's
redundant.
2014-07-06 18:31:17 +02:00
JC Brand
4f5534ed66 Finally fixed the non-AMD case to work with external templates. 2014-07-06 17:32:06 +02:00
JC Brand
166b3bd003 Increase the clickable area for restoring a minimized chat 2014-07-06 12:40:50 +02:00
JC Brand
5034ae33f2 Work on getting proper separation between tests. 2014-06-30 20:26:45 +02:00
JC Brand
75a94fb2b7 Merge branch 'master' of https://github.com/derek-wangpch/converse.js into derek-wangpch-master 2014-06-30 18:59:49 +02:00
JC Brand
8aedc3fcf7 Integrate backbone.browserStorage. Fixes #176
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
2014-06-30 18:53:58 +02:00
JC Brand
180d175e54 Fix tests. Make sure the min chats toggle gets updated 2014-06-29 18:30:01 +02:00
JC Brand
27cce2c229 Refactor to store number of unread messages 2014-06-29 15:59:39 +02:00
JC Brand
4b8196cd7e Add more tests around minimized chats. 2014-06-21 23:01:56 +02:00
JC Brand
c9d7e17a10 Fix test failures due to previous commit 2014-06-14 22:03:04 +02:00
JC Brand
4273e19716 rid and sid are on the _proto obj. Fixes #180 2014-06-14 20:41:20 +02:00
JC Brand
0d3977d3d4 Remember the state of the minimized chats toggle 2014-06-14 20:32:45 +02:00
JC Brand
30a6e6cb58 Remove redundant function wrapping 2014-06-14 19:47:19 +02:00
JC Brand
7ff99a5025 Only need a reference to the toggle view 2014-06-14 19:44:00 +02:00
JC Brand
d45ba9e57e Try to fix some corner cases resulting from narrow window widths. 2014-06-14 18:21:52 +02:00
JC Brand
190142a0b0 Call trimChats when the window is resized.
Also fixed 2 bugs.

1. Instead of checking whether minimized chats toggle is visible, check whether
there ae aleady minimized chats (visuals might be delayed).
2. Don't call restore from removeChat. Chat gets restored earlier.
2014-06-14 16:22:52 +02:00
JC Brand
9c2b19c71d 2 bugfixes.
When a chat is minimized in trimChats, trimChats needs to be called again (in
case the minimized chats toggle is newly shown).

Debounce the "restore" method to avoid breakage due to double click.
2014-06-11 22:53:14 +02:00
JC Brand
7d6595435e Add the logic for toggling minimized chats 2014-06-11 22:01:18 +02:00
JC Brand
f416a455d1 Add a toggle to show/hide the minimized chat boxes.
Still rough around the edges
2014-06-05 00:12:53 +02:00
JC Brand
e2d494f0ad Unread chat messages now appear on the minimized chat view. 2014-06-04 09:32:40 +02:00
JC Brand
0d3c101cbf Start fixing message count bugs 2014-06-02 21:51:30 +02:00
JC Brand
c6a32b847e Fix chatroom tests 2014-06-02 05:13:53 +02:00
JC Brand
ef9fd9617d Fix rendering of minimized chatrooms 2014-06-02 04:47:23 +02:00
JC Brand
afcb49b6b6 Show the consolidation in the mockup. 2014-06-01 20:56:58 +02:00
JC Brand
6e5bf44ada This branch marks the start of a significant conceptual change.
Instead of differentiating between trimmed chats and minimized chats, the two
are now combined into the same thing.

This commit contains some initial work, but functionality is still impaired.
2014-06-01 20:09:09 +02:00
JC Brand
c594e5a1e9 Add new test for trimmed chats 2014-06-01 17:57:03 +02:00
JC Brand
81f3814e32 Refactor code out into backbone.overview 2014-06-01 15:28:52 +02:00
JC Brand
76545632fc More work on properly restoring trimmed chats.
* Make sure that a restored (grown) chat is inserted to the right
* Make sure restoring via the contacts roster works
2014-06-01 02:09:05 +02:00
JC Brand
b84fb41341 Trimmed chats can now be restored. 2014-05-27 22:51:11 +02:00
JC Brand
38e0668372 Fix tests. 2014-05-27 19:18:02 +02:00
JC Brand
ad51e1c0f7 More working on trimming chats. (still very buggy)
More flesh on the view and superview for trimmed chats.
Add event handlers.
Renamed some methods to make them shorter, more consistent.
2014-05-27 18:34:22 +02:00
JC Brand
2d237f9e6d More work on trimming chat boxes.
Added a view for trimmed chat boxes and a super-view for keeping track of them.
2014-05-27 09:57:06 +02:00
Derek Wang
f0bb123e7f Fix a bug that emoticon of '<3' and '>:)' cannot be displayed correctly in the message 2014-05-19 22:06:11 +08:00