Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
2,761 Commits 2 Branches 109 Tags 304 MiB
4d28ae3c11
Commit Graph

1048 Commits

Author SHA1 Message Date
Deuteu
9a8d1921c7 Multiple bind 
Restoring a chatbox wasnt unbinding event then the unread counter for a chatbox was multiply by the time you minized it.
 2014-11-13 10:56:52 +01:00
JC Brand
572b3e8d74 Use 'extend' instead of 'override'. updates #46 2014-11-09 21:27:08 +01:00
JC Brand
25b56e3538 Rename "buddy" to "contact". Fixes #226 2014-11-09 18:07:06 +01:00
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
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
Derek Wang
40bc3ec55d Revert "Fix a bug that emoticon of <3 and >:) cannot display correctly in the message." 
This reverts commit f7e7d1a658.
 2014-05-19 22:03:26 +08:00
Derek Wang
f7e7d1a658 Fix a bug that emoticon of <3 and >:) cannot display correctly in the message. 2014-05-19 18:27:22 +08:00
JC Brand
1a92db8946 Override save on ChatBox to not persist the 'trimmed' attribute 2014-05-13 11:50:33 +02:00
JC Brand
0c0a3f86b6 Remove the need for having an HTML snippet in the body. 2014-05-13 09:26:57 +02:00
JC Brand
0b10ad00fd Some initial work on adding trimmed chat functionality 2014-05-11 20:45:28 +02:00
JC Brand
d1aead81d7 Fix to remove artifact when switching control box tabs. 2014-05-11 20:08:36 +02:00
JC Brand
ad466b62a0 Rewrite and improve trimOpenChats. updates #61 2014-05-05 23:37:52 +02:00
JC Brand
aa52ba5b94 Add method trimOpenChats. Updates #61 2014-04-26 06:55:52 +02:00
JC Brand
c7b900859d Bugfix. use !isBefore instead of isAfter 
moment.js is accurate to the second, instead of milliseconds. This causes
timing errors while testing.
 2014-04-25 23:59:05 +02:00
JC Brand
b307d5170b Date handling is now done with moment.js 2014-04-25 23:44:10 +02:00
JC Brand
22c7243043 Initial work on managing the number of open chat boxes 2014-04-25 21:48:56 +02:00
JC Brand
dec674fae2 Bugfix. Opened chatboxes weren't focused... 
...when clicking on a contact in the roster
 2014-04-24 20:55:07 +02:00
JC Brand
4937fafea4 Add tests for new "clear" button. 2014-04-24 19:21:38 +02:00
JC Brand
9b3601314e Add a new toolbar button to clear chat messages 
Configuration options have changed a bit.

show_emoticons and show_call_button are now removed. Instead the toolbar is
configured via a new config option: "visible_toolbar_buttons".
 2014-04-24 18:10:04 +02:00
JC Brand
d69a165b05 Use strict mode. Emit an event when the connection drops. 2014-04-24 09:51:21 +02:00
JC Brand
1c26e9016c Fixed chatbox positioning and better disabling of effects 
* The animate config option now disables jQuery effects
* Make sure the controlbox is always to the right of all other chatboxes
* Make sure new chatboxes are always created immediately left of the controlbox
 2014-04-24 07:58:35 +02:00
JC Brand
eca42fbb2f Add support for XEP-0280 Message Carbons. updates #132 2014-04-19 06:58:26 +02:00
JC Brand
968f8bb223 Add new configuration setting "forward_messages". 
What was before default behavior is now optional and disabled by default.
 2014-04-19 06:18:17 +02:00
JC Brand
14d90bc99c Upgrade dependencies to their latest versions 2014-04-19 05:12:24 +02:00
JC Brand
7d472eb26d Add new dependency moment.js 
Use it to better compare dates when trying to determine whether a message falls
on a different day.

Also upgraded some dependencies' versions.
 2014-04-19 01:30:48 +02:00
JC Brand
b88113c246 Fixed some failing tests. 
Some of the tests were failing because they didn't expect the controlbox to be
returned from localStorage.
It's too long ago that I've looked at this branch for me to say whether this is
a legitimate bug or not.
Will have to investigate further.
 2014-04-18 17:42:35 +02:00
JC Brand
3cfcb2ae34 2 controlbox bugfixes and spec typo. 
* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox
 2014-03-15 05:52:00 +02:00
JC Brand
fae9b84577 Bugfix: undefined template and a typo 2014-03-15 05:49:11 +02:00
JC Brand
bb0f49cf4d Add a counter to show unread msgs when chat is minimized 2014-03-09 13:31:01 +02:00
JC Brand
9849daacf9 Merge branch 'master' into 0.8 
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
 2014-03-09 08:18:00 +02:00
JC Brand
9b3af57d13 Release version 0.7.4 2014-03-05 08:44:01 +02:00
JC Brand
74779afd66 Ensure that URLs in messages are properly escaped 2014-03-05 08:03:52 +02:00
JC Brand
25cc229019 Refactor message handling 
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Conflicts:
	converse.js
	tests/utils.js
 2014-03-05 01:46:19 +02:00
JC Brand
317ab95cd8 Refactor message handling 
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
 2014-03-05 01:23:45 +02:00
JC Brand
ec39e6e802 Emit new event onChatBoxToggled 2014-03-04 20:16:03 +02:00
JC Brand
b14538b441 Rename ChatBoxesView to ChatBoxViews 2014-03-04 15:54:36 +02:00
JC Brand
1567b212c3 Add closure get/set methods for rosteritem views 2014-03-04 15:49:02 +02:00
JC Brand
d20ca10638 Add closured get/set methods for views from chatboxesview 2014-03-04 15:09:16 +02:00
JC Brand
ac0042fdf9 Extend the "close chat" test with a normal chatbox usecase 2014-03-04 13:22:49 +02:00
JC Brand
c030494ef0 Fix tests and simplify code for showing controlbox 2014-03-01 08:21:36 +02:00
JC Brand
4f2125c20e Simplified by setting height via template, not JS 
Also dropped the minimum height restriction
 2014-03-01 01:57:20 +02:00
JC Brand
7d58d856b8 Save chat box's toggle state between page loads. 2014-03-01 01:57:20 +02:00
JC Brand
8294162f9d Store and maintain a chatbox's custom size. 2014-03-01 01:57:20 +02:00
JC Brand
11b59b31d3 Fix tests after all the refactoring... 2014-03-01 01:57:20 +02:00
JC Brand
8feeb73320 Fix webkit bug that prevents boxes from reordering when one is closed 2014-02-23 05:49:30 +02:00
JC Brand
0414fa02c2 Add some resistance around chatbox's original height when resizing 2014-02-23 03:38:26 +02:00
JC Brand
1ce7620b88 Merge remote-tracking branch 'origin' into 0.8 
Conflicts:
	converse.js
	docs/CHANGES.rst
	index.html
 2014-02-23 02:54:35 +02:00
JC Brand
319a955f65 Add code that allows resize by click+drag. 
Removed dragresize.js and instead wrote new much smaller and simpler code
in converse.js.
 2014-02-22 23:20:36 +02:00
JC Brand
94c135a6d8 Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default 
Conflicts:
	converse.js

Fixes #102
 2014-02-12 12:52:57 +02:00
JC Brand
18d6a91881 Add API method to retrieve the SID. Fixes #93 2014-02-12 12:37:39 +02:00
JC Brand
30f3114c7c Add method to get the latest RID. Updates #93 2014-02-12 12:19:12 +02:00
JC Brand
1a4044dd2a Slight refactor of generatePrivateKey... 
to avoid having to give pass it a callback method
 2014-02-12 11:30:05 +02:00
JC Brand
62d59ff3e4 Refactor some OTR code into a Backbone model and adapt tests. 2014-02-12 07:12:00 +02:00
JC Brand
398142c7de Add a test for the passphrase storage. Updates #111 2014-02-12 02:02:45 +02:00
JC Brand
ca9c215cac Use a random passphrase to encrypt the private key. Updates #111 2014-02-12 00:45:25 +02:00
JC Brand
2026305791 Remove code for re-attaching a prebinded session. 
I couldn't get it to work. Suspect that a new session needs to be
created/authenticated instead of attaching to the existing connection.
 2014-02-11 23:48:38 +02:00
JC Brand
dc858cc38b Register connection addHandlers when reconnecting 2014-02-11 15:52:12 +02:00
JC Brand
c3b98fd2fd Refactor and improve the reconnecting code and make it configurable 
There is still the apparent problem that after reconnecting, event listeners
hvae to bre reregistered (which doesn't happen currently).

So messages can be sent but not received...
 2014-02-11 13:14:36 +02:00
JC Brand
d0f023dbb1 Allow the OTR private key to be cached. Updates #111 2014-01-31 18:07:44 +02:00
JC Brand
5406df1bc7 Add an animated spinner when generating a private key. 2014-01-31 13:40:33 +02:00
JC Brand
8232cdaff2 Bugfix. Updates #111 
When using OTR with prebind, the user password isn't defined.
=============================================================

When not using prebind, the user password is used to encrypt the private key
for the OTR session before it's saved in session storage.

When using prebind, we ideally want to use the same OTR private key across page
loads, so that we don't have to spend the time generating a new one together
with AKE on every page load. To do this, we need to store it somewhere, like
the browser's session storage.

However, I have yet to find a secure way to store the OTR private key that does
not expose it to maliciously injected javascript.

For now, I've updated the code to generate a new private key and do the AKE
with every page reload.

I'm considering adding code to store the private key in Session Storage and
letting the user explicitly enable this (while making them aware of the risks
involved).
 2014-01-31 05:50:38 +02:00
JC Brand
9bce25109c Allow non-amd usage of converse.js without requiring OTR modules. 2014-01-30 09:35:35 +02:00
JC Brand
d7c31d5b73 Minor correction of OTR/SMP explanation. Fixes #113 2014-01-28 03:50:51 +02:00
JC Brand
12fc286ca6 Various changes, see below: 
- disable drag resizing when chatboxes are minimized.
- refactored chat box and chat room markup so that they are more similar.
- don't make the chat box title clickable if no vcard URL is available
- make only the title text clickable, not the whitespace
- fixed toggling of resized chats
 2014-01-27 02:26:55 +02:00
JC Brand
62f6997a25 Chat boxes and rooms can now be resized vertically 
The new size is not stored/persisted.
 2014-01-23 00:55:52 +02:00
JC Brand
680548612c Make controlbox appear in a smoother fashion in webkit 
when clicking the controlbox toggle
 2014-01-23 00:33:55 +02:00
JC Brand
d0af974206 Chat boxes can now be minimized. Updates #71 2014-01-22 23:51:15 +02:00
JC Brand
d2358a6a93 Controlbox and its toggle are now mutually exclusive. 
When the one is visible, the other is hidden and vice versa.
 2014-01-22 23:19:45 +02:00
JC Brand
823f93f006 Merge branch 'templates' into 0.8 
Conflicts:
	converse.js
 2014-01-22 19:29:47 +02:00
JC Brand
ee6c6102fb CSS changes, see below: 
- Rename some classes to make clearer.
- Fixed resizing of chat rooms.
- Changed controlbox so that only contacts are scrollable
 2014-01-22 16:01:49 +02:00
JC Brand
18cacdc94b More templates refactored into separate files. 2014-01-19 11:22:56 +02:00
JC Brand
feb81a02f3 Move more templates out into separate files. 2014-01-19 06:37:55 +02:00
JC Brand
55b9a4e568 Initial support for external HTMl templates. Updates #77 2013-12-31 01:07:11 +02:00
Pete Nicholls
1d3aa9f450 Add model to onCallButtonClicked event payload 2013-12-26 14:48:48 +13:00
Pete Nicholls
6002e0fdf9 Use converse.emit to dispatch call button event 2013-12-19 12:26:11 +13:00
Pete Nicholls
db60894834 Add optional call button to chat box toolbar 2013-12-19 12:26:07 +13:00
Pete Nicholls
201004f815 Order options alphabetically 2013-12-19 12:02:57 +13:00
Pete Nicholls
fd918a5243 Support using OTR by default 2013-12-19 12:02:50 +13:00
JC Brand
478653aebd Bugfix. Wrong number of online contacts shown. Fixes #97 2013-12-18 16:48:02 +02:00
JC Brand
4186bf3ca3 Throw event onRosterViewUpdated whenever the roster HTML changes. Fixes #101 2013-12-18 16:30:19 +02:00
JC Brand
8633d23738 Sanitize text messages to disable Javascript injection attacks. 
Thanks to hejsan.
 2013-12-18 13:51:59 +02:00
JC Brand
cbde2a1d49 Make the fetching of VCards optional. Updates #100 2013-12-17 19:24:36 +02:00
JC Brand
7b2d16afbc Bugfix. The 'get' function complains when there's no callback 2013-12-17 18:51:47 +02:00
JC Brand
d1bf5b8466 Add event emitter tests for chatrooms. Updates #48 2013-12-16 19:19:25 +02:00
JC Brand
cdc350f592 Add more tests for events emitting. Updates #48 2013-12-16 15:27:07 +02:00
JC Brand
986c17884b Bugfix. 'this' doesn't refer to converse obj. 2013-12-16 14:37:30 +02:00
JC Brand
9a8975f5b0 Add two more emitted events. Updates #48 2013-12-15 18:04:51 +02:00
JC Brand
e729471bbf Event emitting code. Updates #48 
Include the event emitting code in converse.js itself and start emitting events.

Still needs tests and to be thoroughly tested manually.
Still needs docs.
 2013-12-15 16:58:46 +02:00
JC Brand
512a463750 Create 3 different builds. 
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
 2013-11-17 16:55:38 +02:00
JC Brand
d1d896a3be HAS_CRYPTO was actually checking for the opposite 2013-11-16 11:52:45 +02:00
JC Brand
f73ab4e832 Allow otr and CryptoJS to not be defined. 
Will allow builds without OTR functionality.
 2013-11-16 11:24:22 +02:00
JC Brand
67c99f60fe Don't put define in try/catch. Breaks optimizer. 
Add check HAS_CSPRNG instead of the previous check
 2013-11-15 23:33:05 +02:00
JC Brand
518c0fca8a We can't not load the crypto libs, breaks r.js optimizer 2013-11-15 22:57:29 +02:00
JC Brand
4a1eac06cb Check if canvas is supported before trying to render the user avatar. 2013-11-15 22:27:24 +02:00
JC Brand
490d96fd26 Don't load the Crypto libraries if the browser doesn't have CSRNG 2013-11-15 22:16:18 +02:00
JC Brand
18ba56bcfc Remove duplicated crypto code and fixed crypto dependencies on non_amd.html page 2013-11-13 08:16:53 +02:00
JC Brand
f90fa641b8 Typeof returns a string 2013-11-12 08:17:40 +02:00
JC Brand
84e28a33b8 Bugfix. Handle case where pass_check is undefined. 2013-11-12 08:16:07 +02:00
JC Brand
0369f11dc5 Bugfix. Contact's name got replaced with JID. updates #58 2013-11-11 21:56:11 +02:00
JC Brand
e8af60e12b OTR Bugfix. Check the data parameter for confirmation. 2013-11-11 21:45:18 +02:00
JC Brand
c15bcf0a23 Bugfix. Menu slid up again after ending OTR session. 2013-11-11 21:03:41 +02:00
JC Brand
cd3540de55 Finally figured out the subscription='from' ask='subscribe' thing 2013-11-06 19:38:16 +02:00
JC Brand
5944ed99e6 Bugfix. Make sure to remove 'requesting' attr again. 2013-11-06 19:07:58 +02:00
JC Brand
7a5bc7fe65 'ask' attribute of 'subscribe' is only for 'pending out' requests. 
Did more investigation with regards to subscription requests.

As far as I can tell, roster updates will only show ask='request' for 'pending
out' requests.

For 'pending in' requests (what converse.js calls requesting contacts), roster
updates are not used and instead a presence stanza with type 'subscribe' is
used.

This makes sense. When sending a presence with type 'subscribe', we need a way
to keep track of our outgoing subscriptions. The XMPP server helps us do this by
adding a user to our roster with ask='request' and subscription='none'.

When our contact receives our presence with type 'subscribe', they have the
information they need. If they go offline and online again, the XMPP server
will resend the presence with type 'subscribe'. So a roster item is not needed.

In convere.js's internal representation of the roster (via the RosterItems backbone
object) we need to add roster items for 'pending in' contacts so that we can
render them and we need to know whether they are 'pending in' or 'pending out'.

We already know they're 'pending out' when ask='subscribe' and
subscription='none'. For 'pending in', since these roster items are only stored
locally and not on the XMPP server (because 'pending in' requests are handled
via <presence> stanzas and not the roster) we add a special attribute
'requesting'.
 2013-11-06 09:54:58 +02:00
JC Brand
fb8e2cde72 Roster item 'ask' property is always 'subscribe' for subscription requests 
* 'pending' state is denoted by subscription='none', ask='subscribe'
* 'requesting' state is denoted by subscription='from', ask='subscribe'

Reference: http://xmpp.org/rfcs/rfc3921.html#int

I'm not yet 100% sure with regards to the 'requesting' state, I can't find
anything about it in the above mentioned reference, but apparantly that's what
prosody's roster response looks like (e.g. <item jid='XYZ' ask='subscribe'
subscription='from'/> ).

With ejabberd I haven't yet received such a roster response and contact
requests are always handled via presence stanzas.

updates #81
 2013-11-06 09:04:44 +02:00
JC Brand
4b9054066d Fall back to user's JID when fullname not found 2013-11-04 15:57:22 +02:00
JC Brand
fc3a08400e Add tests for the chat toolbar. 
Including the emoticon menu and the OTR menu.
More tests needed for OTR in particular.
 2013-11-03 22:28:44 +02:00
JC Brand
d7d8948eba Refactor ChatRoom tests (move code to utils.js) 2013-11-03 12:02:25 +02:00
JC Brand
d4fa43109f Don't use 'testing' attr override. 
Can be used to get the unwrapper 'inner' converse object.

Instead, check that the bosh service value of the connection corresponds to the
mock object used for jasmine tests.
The value tested for is not usable in production, so we're sure we're only
running tests.
 2013-11-03 11:38:36 +02:00
JC Brand
38c26013d0 Simplify the boilerplate HTML require even more. 
Use id 'conversejs' instead of 'chatpanel'.

The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
 2013-10-20 22:42:34 +02:00
JC Brand
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
25dc4a27e2 Add smiley support for chatrooms as well 2013-10-20 18:13:34 +02:00
JC Brand
4ab3498285 Bugfix. Roster didn't appear in some cases. 
Make sure the last roster item is still added (even if it's a zombie), so that
the roster will be shown (roster is only shown when last_item property is
true).
 2013-10-20 12:16:14 +02:00
JC Brand
a5daeb017e Emoticons now supported for single-user chat. 2013-10-19 23:18:17 +02:00
JC Brand
546204bed6 Merge branch '0.6.x' 2013-10-19 18:28:31 +02:00
JC Brand
fd349b217f Don't unnecessarily create objects for roster items 2013-10-19 18:24:06 +02:00
JC Brand
3d84b3e7ae IE8 bugfix. Fixes #52 2013-10-19 17:10:56 +02:00
JC Brand
3c57892cbf Add smiley menu to the chat toolbar 
Still to do is rendering smileys in the chat area and chatrooms.
 2013-10-17 20:30:37 +02:00
JC Brand
b061f403b3 Remove superfluous element #collective-xmpp-chat-data 2013-10-16 22:29:13 +02:00
JC Brand
6e15986a87 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-15 19:16:11 +02:00
JC Brand
150846849d Bugfix. Don't reconnect while strophe is still disconnecting 
Causes infinit loop of connects and disconnects
 2013-10-15 19:03:10 +02:00
JC Brand
d53caf115a Make sure presence stanza is sent out after roster update 
specifically also when localstorage is populated
 2013-10-15 18:29:16 +02:00
JC Brand
b6a6562de9 Merge branch '0.6.x' 
Conflicts:
	Makefile
	converse.css
	converse.min.css
	converse.min.js
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
 2013-10-08 22:12:12 +02:00
JC Brand
f68712a58c Bugfix. Presence stanza sent out before roster initialized 2013-10-08 22:10:00 +02:00
JC Brand
8a2e4e83e7 Remove getItem. 
It's a relic from a time before the class subclassed a Backbone.Collection
 2013-10-08 08:45:17 +02:00
JC Brand
a3dc23bf3e Bugfix. When trying to reconnect: 'connection' is not defined. 
Conflicts:
	converse.js
 2013-10-07 21:36:50 +02:00
JC Brand
b943d4ca35 Bugfix. When trying to reconnect: 'connection' is not defined. 2013-10-07 21:35:52 +02:00
JC Brand
e883d137fc Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect. 
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
 2013-10-07 09:16:26 +02:00
JC Brand
4f44be9e29 Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html
 2013-10-07 09:16:02 +02:00
JC Brand
18091308be Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect. 
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
 2013-10-07 09:13:16 +02:00
JC Brand
37f2f8ca0c Merge branch '0.6.x' 
Conflicts:
	converse.js
 2013-10-05 23:11:17 +02:00
JC Brand
3bf27e8b5f New config option `show_only_online_users` 
If true, only users with a status of 'online' will be shown in the contacts
roster.
 2013-10-05 23:07:42 +02:00
JC Brand
b111e60c1d Merge branch '0.6.x' 
Conflicts:
	converse.js
 2013-10-05 22:38:14 +02:00
JC Brand
fcc1f5adf4 A bit of reordering. 
Move all module-level functions/variables and Backbone Modules/Views together.
Add headings to indicate logical sections.
Make statuses variable module-level and indicate that it's a constant (all caps)
 2013-10-05 22:34:47 +02:00
JC Brand
ef1c834090 Don't check for allow_contact_requests in RosterItemView render method 
This method shouldn't be called when contact requests aren't allowed because
roster items are then not created for contact requests.
 2013-10-05 22:16:09 +02:00
JC Brand
0752a0e2ed Merge branch '0.6.x' 
Conflicts:
	converse.min.css
	converse.min.js
 2013-10-05 16:50:26 +02:00
JC Brand
feda94178c Refactor incoming subscription handling code into its own method 2013-10-05 16:46:57 +02:00
JC Brand
3a1bd7c4e6 Remove duplicate allow_muc and sort 2013-10-03 19:01:58 +02:00
JC Brand
646fcb36c7 Merge branch '0.6.x' 2013-10-03 18:52:39 +02:00
JC Brand
a5b5e7538f 2 Bugfixes. 
- Register handlers that depend on the roster inside initRoster and the
  message handler inside chatboxes.onConnected. This solves problem of presence
  stanzas being received before handlers are initialized. Updates #65

- Check if MUC is allowed during feature discovery
 2013-10-03 18:43:49 +02:00
JC Brand
cf137c607b Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html
 2013-10-03 16:05:21 +02:00
JC Brand
7f371b883e Add config option `allow_contact_requests` to toggle user adding 2013-10-03 15:58:09 +02:00
JC Brand
b8e096ffd1 Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding
 2013-10-03 14:25:39 +02:00
JC Brand
a57d0e9818 Sort default values 2013-10-03 14:24:23 +02:00
JC Brand
0d6e29f067 Add config option `allow_contact_requests` to toggle user adding 2013-10-03 14:22:33 +02:00
JC Brand
e4c9fcbc4e Merge branch '0.6.x' 
Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
 2013-10-03 13:53:47 +02:00
JC Brand
7f4bdb4098 Don't use id for controlbox panes 2013-10-03 13:45:50 +02:00
JC Brand
feaff64aab Add setting to enable/disable MUC 2013-10-03 13:16:26 +02:00
JC Brand
8f14c32b48 Use newest (unreleased) otr.js so that we can specify paths ourselves 2013-10-03 10:18:07 +02:00
JC Brand
e4a1ccf1c0 Remove old classes before adding new ones. Updates #38 2013-09-26 21:48:45 +02:00
JC Brand
122cb937fe Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 21:48:44 +02:00
JC Brand
3dfcd3c04a Remove old classes before adding new ones. Updates #38 2013-09-26 21:46:10 +02:00
JC Brand
b36e6bbce1 Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 11:53:47 +02:00
JC Brand
1d14a2b950 Use const for enter key 2013-09-18 09:25:40 +02:00
JC Brand
367803d6ef The xa chat state wasn't being handled properly 2013-09-13 10:58:00 +02:00
JC Brand
59fc3182b1 The xa chat state wasn't being handled properly 2013-09-13 10:57:28 +02:00
JC Brand
b34a706132 We didn't have an icon for unavailable state. 
Also, the status description was not translation aware
 2013-09-13 10:35:37 +02:00
JC Brand
8977505f11 We didn't have an icon for unavailable state. 
Also, the status description was not translation aware
 2013-09-13 10:35:00 +02:00
JC Brand
f15eb5a7d4 Remove messages from localStorage when calling /clear 2013-09-13 09:59:06 +02:00
JC Brand
0dd4b3e52c Remove messages from localStorage when calling /clear 2013-09-13 09:57:14 +02:00
JC Brand
d402ed8e8e Merge branch 'master' into otr 
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
 2013-09-12 20:57:51 +02:00
JC Brand
37f3a95a20 For uniqueness, we need both JIDs for messages localStorage Fixes #49 2013-09-12 15:30:09 +02:00
JC Brand
4ab6f28181 Bugfix. Messages were stored against buddy JID and not own JID 2013-09-12 15:24:56 +02:00
JC Brand
9734ccdeff The word 'me' wasn't translation aware. 
Conflicts:
	locale/converse.pot
 2013-09-12 08:37:41 +02:00
JC Brand
00cb015d6a Merge branch 'master' into otr 
Conflicts:
	converse.js
 2013-09-10 23:33:30 +02:00
JC Brand
778b8a7c2e The word 'me' wasn't translation aware. 2013-09-10 23:31:29 +02:00
JC Brand
4bb22b5c97 Translated strings may not be broken up. Regenerated POT file 2013-09-10 22:52:15 +02:00
JC Brand
1574acb37b Save the private key and instance tag in session storage. 2013-09-10 22:37:12 +02:00
JC Brand
9967b955c8 Show an alert before generating private key 
To make it clear to the user that the browser might freeze up while generating
the key.
 2013-09-08 18:13:49 +02:00
JC Brand
36c2a2ac45 Add option to hide the toolbar 2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59 Allow chat statuses to be translated. 
Add conf setting for allowing OTR.
 2013-09-08 16:39:46 +02:00
JC Brand
a092d6e440 Updates #47 
Mention FR translations.
Make sure "... is typing" gets translated.
 2013-09-03 12:30:56 +02:00
JC Brand
3b62580ccd Don't use ids for the login form inputs 2013-09-02 11:48:09 +02:00
JC Brand
e2c97e389f Add allow_otr option (doesn't nothing yet) 2013-09-02 11:30:54 +02:00
JC Brand
a50e2d73e5 Various bugfixes after testing OTR converse2converse 
Previously only tested pidgin2converse
 2013-09-01 21:37:22 +02:00
JC Brand
2f7524f14f Only mention generation of key if it's actually happening. 2013-08-31 23:42:48 +02:00
JC Brand
4c1e0564f8 Nicer prompts for SMP authentication. 
Off-the-record is now functional and mostly done. Updates #11
 2013-08-31 23:20:07 +02:00
JC Brand
9add3e3d94 Add support for Socialist's Millionaire Protocol authentication 2013-08-31 22:30:34 +02:00
JC Brand
942d262622 Implement a check that the user's password is still the same 
before trusting the decrypted private key, otherwise generate a new one.
 2013-08-31 20:44:43 +02:00
JC Brand
3fbf572ac6 Bugfix. Plaintext msgs sent after OTR termination weren't saved 2013-08-31 17:43:38 +02:00
JC Brand
8e8987a877 Added a way to verify your buddies identity 
(by enabling fingerprint comparisons)
 2013-08-31 17:27:14 +02:00
JC Brand
7a31d8cae2 User can now end an encrypted session. 2013-08-31 16:06:47 +02:00
JC Brand
6ac24c3b31 Show many more info messages to inform user of OTR status 2013-08-31 15:45:23 +02:00
JC Brand
e8976dc448 More UI improvements. 
Don't show encrypted messages when we don't have an encrypted session set up on
our side (show error message instead).
 2013-08-31 15:00:04 +02:00
JC Brand
f0204dd54b Use class instead of id for controlbox-panes element 2013-08-31 14:29:58 +02:00
JC Brand
fcd488c452 Improved UI. The chat toolbar now gives better feedback. 2013-08-30 22:49:33 +02:00
JC Brand
ccfccfb2cf Handle case where buddy starts OTR better. 2013-08-30 21:18:46 +02:00
JC Brand
e4cf875d24 Merge branch 'master' into otr 
Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js
 2013-08-30 20:26:48 +02:00
JC Brand
42c3bc2b38 Bugfix. 
With auto_subscribe=True, "Pending Contacts" header didn't disappear
after user was added to the roster.
 2013-08-29 21:56:56 +02:00
JC Brand
9463778185 Some optimization changes. 
Don't sort roster contacts needlessly.
Don't call show() or hide() needlessly.
No need for setting a 'sorted' attr on the last item.
 2013-08-29 21:24:47 +02:00
JC Brand
c5e44a02fa Bugfix. The remove icon wasn't being shown for contacts. 2013-08-29 20:06:17 +02:00
JC Brand
1430689c43 Bugfix. Fall back to 'en' if non-existing locale was specified. 2013-08-28 00:47:14 +02:00
JC Brand
fd187533fd Add special option xhr_custom_status. 
Allows for sending the custom status to the server via ajax.
 2013-08-27 23:52:44 +02:00
JC Brand
e530094acc Update roster snippet to be same as mockup. 2013-08-27 11:19:18 +02:00
JC Brand
563987cf29 Include Jed for the nolocales option. 
We need variable sprintf type var interpolation
 2013-08-27 09:37:33 +02:00
JC Brand
5682473426 Whitelist jid, sid and rid as well. 2013-08-26 16:40:34 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
1d6f2dbe5a Bugfix. i18n is attr, not variable. 2013-08-26 15:05:08 +02:00
JC Brand
d4502d6e6f As with localstorage, give tinysort it's full name 
(Aids with bungle integration)
 2013-08-26 14:45:24 +02:00
JC Brand
7b0e1d331b Working on a way to build converse without locales. 
- Add nolocales.js and let the __ function handle case where there aren't any
  locales specified.

Also:
In require config, change localstorage to backbone.localStorage (for better
integration with bungle).
 2013-08-26 14:37:35 +02:00
JC Brand
ef1a57c6d0 Bugfix. Pencil icon not visible (for setting status update). 2013-08-26 10:54:58 +02:00
JC Brand
a607e09eef Better textarea styling. Ensure all boxes are same height. 
Conflicts:
	converse.css
 2013-08-26 09:29:14 +02:00
JC Brand
2c0ae11fb7 Remove sjcl, which is not being used anymore 2013-08-25 23:27:07 +02:00
JC Brand
664e2090ba Add initial UI and handlers for starting OTR to converse.js 2013-08-25 22:10:32 +02:00
JC Brand
887d27ae59 Merge branch 'mockup' into otr 2013-08-25 14:32:36 +02:00
JC Brand
9c88aa1929 Better textarea styling. Ensure all boxes are same height. 2013-08-25 13:50:55 +02:00
JC Brand
921ae7ec7e More renamings/refactoring to add consistency 2013-08-25 12:17:46 +02:00
JC Brand
6a45eee6da Rename methods to trying and get some consistency. 2013-08-25 12:06:53 +02:00