Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
1,933 Commits 2 Branches 109 Tags 304 MiB
6879405e85
Commit Graph

795 Commits

Author SHA1 Message Date
JC Brand
6100aaf114 Refactor the API. updates #46 
API methods now consist of simple accessors and mutators that are logically
grouped.
 2014-11-09 13:06:09 +01:00
JC Brand
36db4c8b27 Merge branch 'master' into plugin-api 2014-11-08 16:59:25 +01:00
JC Brand
e1efb6042e Bugfix. Previous commit didn't take closed chat boxes into consideration 2014-11-08 16:58:42 +01:00
JC Brand
dc31057cb9 Bugfix. Don't show duplicate messages. 2014-11-08 15:53:29 +01:00
JC Brand
3ab1ad88dd Use namespace const 2014-11-08 15:34:12 +01:00
JC Brand
147e62d000 Don't increment unread msgs counter for <paused> chat state. 
Also update release notes. updates #267
 2014-10-30 11:48:58 +01:00
JC Brand
0f06902bf4 Merge pull request #267 from Deuteu/message-counter-fixes 
Fix num_unread*2 on minimized chat
 2014-10-30 11:06:26 +01:00
Guillermo Bonvehí
5620f007ea Fix locale set during initialize not being used in utils.translation 2014-10-29 13:13:54 -03:00
Deuteu
c9e031e1c6 Fix num_unread*2 on minimized chat 
When chat was minimized the counter num_unread of unread message was increment when receiving a compose message so the number of unread messages was doubled.
 2014-10-29 13:53:08 +01:00
JC Brand
52cabd0d23 Merge branch 'profiling' 2014-10-28 18:12:50 +01:00
JC Brand
682cc8471a Update main.js to work properly with mainConfigFile 2014-10-28 18:02:17 +01:00
JC Brand
55e32c735d Fix tests 2014-10-27 23:06:11 +01:00
JC Brand
37eefa67d0 Performance fix. Don't query for the roster on each page load. 
Instead, just populate the roster from sessionStorage if available.
 2014-10-27 21:53:05 +01:00
JC Brand
b2b4474439 Performance fix. Don't loop through whole roster when only one item changed. updates #151 2014-10-27 21:41:41 +01:00
JC Brand
c2063eb1a7 Keep on getting disconnected. This fixed it. 
Seems like the RID gets incremented once too many (outside of upper bound of
expected window), and then server responds with item-not-found.

See: http://xmpp.org/extensions/xep-0124.html
 2014-10-27 21:35:25 +01:00
JC Brand
ec00a04068 Bugfix. .roster-group elements must be found relative to 2014-10-27 21:35:06 +01:00
JC Brand
8998a057da Make sure that subscribeToRosterSuggestions is ... 
called sequentially with enough time between each call.
 2014-10-27 18:48:54 +01:00
JC Brand
d03a9a0192 bugfix in positionGroup. 
Index must always be 0 if there aren't any group elements in the dom yet.
 2014-10-26 23:13:04 +01:00
JC Brand
902e833dec Some refactoring. Add showInRoster method 
which checks if a contact should appear in the roster (depends on
show_only_online_users setting)
 2014-10-26 23:10:43 +01:00
JC Brand
07186bcecd Performance fix. Set display "none" on the roster element. 2014-10-26 20:20:05 +01:00
JC Brand
695c8f441d Minimize debounce time for update method to 100ms. 2014-10-26 17:10:58 +01:00
Deuteu
30ccc0437c Remove unnecessary commas for ie8 compatibility 2014-10-26 15:52:27 +01:00
JC Brand
2f968f7095 More optimizations. 
Don't sort the global ContactRosters collection (we only need to sort the
individual groups).
Only add the roster to the DOM once the users have been added.
 2014-10-25 12:33:24 +02:00
JC Brand
f4ff6370b9 Performance fix. Debounce the update method on the roster. 2014-10-25 09:57:05 +02:00
JC Brand
7e42783c62 Don't remove requesting users when clearing the roster cache. updates #262 2014-10-24 18:55:32 +02:00
JC Brand
0963f5c4d5 Add 'override' method for overriding converse Views and Models. 2014-10-22 22:17:21 +02:00
JC Brand
bb54874f35 Add extra check before accepting a passed in connection. 
No use in using a passed in connection that's not connected.
 2014-10-19 20:41:16 +02:00
JC Brand
aa2c38548c Tweak participants' toggle so that widths don't need to be hardcoded. 2014-10-19 15:09:29 +02:00
JC Brand
35928308c8 Bugfix. "ev" isn't necessarily defined. 2014-10-15 22:56:45 +02:00
JC Brand
80b8fed6cd New method createChatRoomMessage 2014-10-15 22:28:43 +02:00
JC Brand
b93d43d2cb Also store message id for received messages. updates #240 2014-10-15 19:51:30 +02:00
JC Brand
a717cc464a bugfix. msgid should be string. 2014-10-15 19:35:03 +02:00
JC Brand
a88c786991 Instead of using a hash, use milliseconds since epoch for groupchat id. 
That way, if need be, we could sort messages.
 2014-10-15 19:15:28 +02:00
JC Brand
55c57a346d Move translation factory to utils 
So that it can be used by plugins.
 2014-10-13 22:02:55 +02:00
JC Brand
970da2acf0 Keep track of groupchat messages... fixes #240 
by way of msgid attribute.
 2014-10-13 21:15:25 +02:00
JC Brand
24cd78a78d Call plugins after Backbone models and views have been parsed. 2014-10-12 16:24:57 +02:00
JC Brand
490f26031e Add registerPlugin API method. 2014-10-12 14:49:45 +02:00
JC Brand
60367f82f7 Bugfix. Proxy methods to ensure proper context. updates #46 2014-10-12 11:11:28 +02:00
JC Brand
48dd0cc674 Trying to organize doc chapters a bit more logically. 2014-10-12 11:03:25 +02:00
JC Brand
5b46e27c41 Add 2 new API methods. updates #46 
Added openChatBox and getChatBox.
 2014-10-12 10:34:33 +02:00
JC Brand
8493b4f423 Add space between function name and brackets 
to visually differentiate between function declarations and instantiations.
 2014-10-10 11:05:16 +02:00
JC Brand
eaa18cc4c2 Merge branch 'master' of github.com:jcbrand/converse.js 2014-10-10 10:52:41 +02:00
Sergey Fedoseev
6e0c173f44 fix prebind reference error 2014-10-10 02:03:23 +06:00
Sergey Fedoseev
6addfdabb0 fix event prevention on chat restore 2014-10-09 20:32:24 +06:00
JC Brand
0c83ac4524 Explicitly set jQuery as a dependency of converse.js 
Also in utils.js and otr.js (this will help reach to goal of having a private
jquery which doesn't pollute the global $ var).
 2014-10-06 20:23:59 +02:00
JC Brand
5bad6b02b6 Clarify how one should use prebind and keepalive together. 2014-09-30 12:27:53 +02:00
JC Brand
64847bcb96 Add new event noResumeableSession 2014-09-26 17:20:52 +02:00
JC Brand
b803267555 Bugfix. Return after attaching with prebind data. 2014-09-24 10:57:07 +02:00
JC Brand
5bc1286a64 Take <gone> chat state into consideration. 2014-09-22 16:35:36 +02:00
JC Brand
8843910d52 Add API method to retrieve buddy attributes. fixes #223 2014-09-22 15:03:57 +02:00
JC Brand
297259fdb7 Remember toggle state of control box. updates #222 2014-09-22 13:08:56 +02:00
JC Brand
e860343eb2 Bugfix. The chatroom was being joined twice, causing duplication. 2014-09-21 00:19:59 +02:00
JC Brand
dbd45397a3 Move password form for chatrooms to an external template. 2014-09-20 22:59:29 +02:00
JC Brand
0babac2b17 More fixes to properly tear down session after logout. 
Fixed problem with Strophe handlers zombies.
Remove zombie handlers for minimized chats (caused duplicate minimized chats).
 2014-09-20 15:08:53 +02:00
JC Brand
6f4ea8a5aa More session fixes. 
* Make sure to rebroadcast presence when logging in after having just
logged out.
* Remove roster contacts when logging out, to avoid artifacts when logging in
with a different account.
 2014-09-18 19:24:32 +02:00
JC Brand
26f6ec98c6 Merge branch 'session-issues' 2014-09-18 18:51:55 +02:00
JC Brand
041d5aca51 Fix issues with rendering login form after session crash. 2014-09-18 18:51:23 +02:00
JC Brand
108a57c53d keepalive should not be true by default. 
Also, scrollDown after toggling occupants sidebar.
 2014-09-18 09:33:51 +02:00
JC Brand
ce06e7d2d6 Initial attempt to sort out session issues. 2014-09-18 09:29:31 +02:00
JC Brand
9b0f701893 Need to configure _.templateSettings in converse.js 
The tpl configuration in main.js is only for externally loaded templates, if we
use inline templates (as is the case with the room invite feature), we need to
configure _.templateSettings as well.
 2014-09-17 23:05:17 +02:00
JC Brand
f26e709a4b Let prebinding take precedence over keepalive. 2014-09-17 22:07:58 +02:00
JC Brand
47e9e963fd Remember state of chat room sidebar. 2014-09-17 22:04:47 +02:00
JC Brand
ba6b72011c Show groupchat messages where user is mentioned in bold. 2014-09-17 21:40:19 +02:00
JC Brand
eefce8286e Fix tests but killing zombies. 2014-09-17 10:35:24 +02:00
JC Brand
9f251f729b Fix. Make sure that a user appears as pending once you've added them. 2014-09-15 23:28:07 +02:00
JC Brand
fdff512225 Bugfix. Make sure we fall back to jid if no fullname is set. 2014-09-15 23:09:04 +02:00
JC Brand
443ee80b6e Recreate the roster each time initRoster is called. 
Otherwise we will reuse old/stale objects for which we receive no add events
(resulting in an empty roster).
 2014-09-15 23:00:52 +02:00
JC Brand
60070b52d2 Some work on fixing the broken subscription flow. 
Looks like the subsription flow was broken since the roster groups refactor.
Requesting and pending contacts weren't being properly added to (and removed
from) roster groups.

Requesting contacts are now properly added and remove. Next up, handling
outgoing requets (i.e. pending contacts).
 2014-09-15 22:48:04 +02:00
JC Brand
597e3693c7 Call initRoster only after controlbox is connected. 2014-09-15 21:33:44 +02:00
JC Brand
3a30f30fb7 Bugfix concerning trimmed chats. 
Chats were being trimmed even though there was enough room.
 2014-09-15 20:08:13 +02:00
JC Brand
bab04a4d97 Fixed a timing issue with keepalive. 
When loading a page with an existing session, the roster view's elements were
being added too early, resulting in event handlers not being properly
registered.
 2014-09-15 20:04:36 +02:00
JC Brand
95a77e3f92 Chat room messages are now stored in browser storage. 2014-09-12 22:23:42 +02:00
JC Brand
c04ed35b65 Properly remove chat room occupants who leave. 2014-09-12 19:46:52 +02:00
JC Brand
fa2ff46cee Give chatroom's occupants view a ref to the chatroom view 
and thereby fix bug with directInvites.
 2014-09-12 19:31:53 +02:00
JC Brand
450ce04fd9 Refactor chat rooms. 
When re-attaching to an existing session, chat rooms are fetched from
sessionStorage and we join them again.

However, unless we send a presence of type unavailable before reloading the
page, from the XMPP server's perspective we never left the chat room.

It therefore doesn't send us again the room occupants or room messages.

To send a presence of type unavailable is a hack and not desireable. Rather, we
want to stay in the room and just re-attach to it upon page reload.
In order to do this, we need some new functionality.

* Refactor the chat room sidebar into a new Backbone Model/View combo. (done).
* Store/fetch room occupants in/from sessionStorage (done).
* Store/fetch room messages in/from sessionStorage (not yet done).
* Instead of re-joining a chat room which we never left, just register the event handlers again. (not yet done).
 2014-09-12 15:30:28 +02:00
JC Brand
e59071aeea Add the ability to log out of a session. updates #80 2014-09-07 13:18:36 +02:00
JC Brand
b7c9c0f508 Only save the session if it's valid. 2014-09-07 00:18:36 +02:00
JC Brand
aa046654bf Provide single-session support. 2014-09-06 23:34:39 +02:00
JC Brand
9e5dc21aa4 Refactor showing of chat room status messages. 
onChatRoomPresence and showStatusMessages have been refactored to give more
detailed information and to also show the reasons given to actions taken by
moderators.
 2014-09-06 12:25:37 +02:00
JC Brand
e8a70abcc1 Bugfix. Chat room status messages weren't being shown in certain cases. 2014-09-05 23:24:35 +02:00
JC Brand
a3e540fa67 Provide feedback if a chat room command didn't work. 2014-09-05 19:36:31 +02:00
JC Brand
82659e87d7 Add extra chat room commands: /nick, /mute and /voice. 
Also document the available chat room commands.
 2014-09-05 18:27:32 +02:00
JC Brand
ae90c7420e Update docs and rename option to use underscore instead of dash. 2014-09-03 20:15:46 +02:00
JC Brand
e64153b83f Implement the participants show/hide feature. 2014-09-03 20:04:32 +02:00
JC Brand
3aaa8df41a Notification sound now also plays when nickname is mentioned in chat room. 
updates #62
 2014-09-03 18:47:24 +02:00
JC Brand
9d886a9f1d Add a test for the onInvite method. refs #215 2014-09-02 20:01:49 +02:00
JC Brand
14ce4a0e6d Bugfix. Don't override chat_status retrieved from sessionStorage. 
See http://librelist.com/browser//conversejs/2014/8/26/problem-with-contact-list-everyone-is-offline/
 2014-09-02 16:42:08 +02:00
JC Brand
1b4658745c Add a magnifying glass icon to invitee search field. updates #215 2014-09-01 13:05:10 +02:00
JC Brand
bf0d0320c5 Emit an event after the user has sent out a chat room invitation. refs #215 2014-08-31 21:54:17 +02:00
JC Brand
67c00d779d Tweak invite widget style and make the placeholder text translateable. 
updates #215
 2014-08-31 21:29:47 +02:00
JC Brand
37255a2692 updates #215, see below. 
* Filter by both fullname and jid when searching for users to invite.
* Combine the confirm and prompt popups into a single confirm popup.
* Bugfix in groups filter. Make sure to show group that were previously filtered out.
 2014-08-31 19:44:05 +02:00
JC Brand
156d231c95 Converse.js now responds to XEP-0030 Service discovery requests. 2014-08-31 14:14:50 +02:00
JC Brand
9f6e36e38d Merge branch 'master' into user-invite 2014-08-31 02:18:28 +02:00
JC Brand
db24bf7a70 Bugfix. Don't append, replace. 
Otherwise, if the same error presence is received twice, the form will render
twice.
 2014-08-31 02:17:48 +02:00
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