Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
905 Commits 2 Branches 109 Tags 304 MiB
7a57712434
Commit Graph

349 Commits

Author SHA1 Message Date
JC Brand
6a45eee6da Rename methods to trying and get some consistency. 2013-08-25 12:06:53 +02:00
JC Brand
044fb84c3a More work on Off-the-record support. Updates #11 
OTR key exchange now works and encrypted messages can be sent.
Lots of rough edges however and no proper UI.
 2013-08-24 23:11:22 +02:00
JC Brand
104f905641 Merge branch 'master' into otr 
Conflicts:
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
 2013-08-24 16:34:07 +02:00
JC Brand
7e854edb48 Make sure to show the submit button if connecting failed 2013-08-24 16:11:08 +02:00
JC Brand
810f5dec95 Merge branch 'sane-mockup' 
Conflicts:
	docs/html/searchindex.js
	index.html
 2013-08-24 15:44:58 +02:00
JC Brand
4bc2b7227f Fixed tests initialization (broken during recent refactor) 2013-08-24 03:10:06 +02:00
JC Brand
75b61fda6f Allow only a whitelist of settings attrs to be overridden 
Makes it more secure, since the enclosed converse object as access to
privileged data, we don't want people to inject code that could expose that.
 2013-08-24 02:43:41 +02:00
JC Brand
502b922515 Only show the controlbox after attaching. Updates #41. 2013-08-24 02:29:13 +02:00
JC Brand
f96c52a09a Bugfix. Set the connection attr on converse. Updates #41 2013-08-24 02:20:00 +02:00
JC Brand
5551ff0127 When prebinding, attach automatically. Fixes #41 
This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).

Updated the docs to reflect these changes.
 2013-08-23 00:51:32 +02:00
JC Brand
4253c9aeae Restrict logging only to when debug=true. 2013-08-23 00:51:32 +02:00
JC Brand
c788041a0c Merge branch 'sane-mockup' into otr 
Conflicts:
	docs/html/searchindex.js
	index.html
 2013-08-20 22:38:24 +02:00
JC Brand
cf4cec1e29 Refactored sendMessage 
Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.
 2013-08-16 16:05:24 +02:00
JC Brand
a2aeec8449 Add initial OTR code. 
- /otr will generate a new private key (or fetch it from storage).
 2013-08-16 15:48:23 +02:00
JC Brand
57fc8b9832 Merge branch 'master' into otr 
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
 2013-08-16 11:28:34 +02:00
JC Brand
72d0f566fc Merge branch 'master' into mockup 2013-08-15 20:47:50 +02:00
JC Brand
cf161a729a Add contacts regardless of how getVCard failed 2013-08-15 20:47:19 +02:00
JC Brand
c43c34013b Add font icon required changes for chatrooms. 2013-08-15 20:36:06 +02:00
JC Brand
f846e70c10 Merge branch 'master' into mockup 2013-08-15 20:34:04 +02:00
JC Brand
7e0f538029 Bugfix. removeRoom doesn't exist anymore 2013-08-15 20:33:42 +02:00
JC Brand
15ed513345 Start making the markup changes required for the font icons 2013-08-15 20:14:00 +02:00
JC Brand
359dbc68f7 Merge branch 'master' into mockup 2013-08-15 19:36:46 +02:00
JC Brand
44d094f56f Add a debug option (logs to browser console) 2013-08-15 19:34:40 +02:00
JC Brand
53359b7ddc Register presence and message handlers before getting the roster 
Otherwise some presence notifications might be lost
 2013-08-15 19:30:33 +02:00
JC Brand
ae0c561d88 Indentation 2013-08-15 18:32:07 +02:00
JC Brand
84f4e47127 More tweaks and fixes 2013-08-12 21:32:00 +02:00
JC Brand
f7c579e7e6 Add OTR to bower.json and converse.js 2013-08-09 19:22:49 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally. 
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
 2013-08-05 09:25:29 +02:00
JC Brand
457a11c54e Send messages from full JID. Fixes #13. 
Messages sent between two Gtalk accounts weren't being received.
 2013-08-04 18:31:45 +02:00
JC Brand
c5192f8ade Bugfix. Updates #32 
Users without roster contacts didn't have XMPPStatus.initStatus called and
therefore had a default status of offline.

Fixed this by setting the status to online from the start. The fetch command
will get the true status from localStorage (if available).

Made sure that the rest of converse's onConnected code is called in the
callback from fetch (so that we know the user's status is correct).

Updated and fixed tests.
 2013-08-04 15:39:46 +02:00
JC Brand
72ca5158f3 Attach panels to the DOM upon initialize. 
On Plone I've been having issues with event handlers being registered on
elements not yet added to the DOM not being called.

Also, get rid of the misnamed $parent attribute on the panels. Instead, pass in
the correct parent to initialize.
 2013-08-02 12:26:16 +02:00
JC Brand
99ae726209 Specifically include strophe, 
otherwise the optimizer doesn't include it
 2013-07-30 22:28:54 +02:00
JC Brand
9f2e5d291f Bugfix. Get value from val() method, not attr. 2013-07-30 00:16:17 +02:00
JC Brand
7ed30139d6 Move path and shim configs from converse.js to main.js 
This should make it easier to create custom builds, e.g. with more or less
dependencies.
 2013-07-29 22:34:33 +02:00
JC Brand
62c314ff66 Remove the Libraries dir and fix paths in converse.js 2013-07-29 22:22:12 +02:00
JC Brand
8f8ecbd78c Add missing semi-colon (jshint) 2013-07-27 10:53:22 +02:00
JC Brand
48e3c73d2c Merge pull request #29 from matheus-morfi/spinnertocss 
Removing spinner after login attempt
 2013-07-26 16:52:06 -07:00
Sergio Oliveira
95a2f23d15 Removing spinner after login attempt 2013-07-26 15:30:30 -03:00
JC Brand
fd526a1832 Fix for the previous fix :) 2013-07-24 23:10:56 +02:00
JC Brand
4c0d4f2ac5 bugfix. Fixes #26. Only the first minute digit was shown. 2013-07-24 22:58:53 +02:00
Matheus Figueiredo
19a1be391d using span with css instead of img 
using span instead of img to avoid problems with relative paths
 2013-07-23 13:42:45 -03:00
JC Brand
8293bd0da5 Bugfix in jquery element query 2013-06-02 22:32:33 +02:00
JC Brand
9b5c9138fb Add a config option to by default show the controlbox 2013-06-02 21:40:05 +02:00
JC Brand
4d9b9a7ba4 Move locales.js to locale dir 
Trying to make it simpler and easier for people to add new translations by
reducing the amount of places where edits need to be made (e.g. no new edits
required in converse.js now).
 2013-06-02 19:38:11 +02:00
JC Brand
befcadbd91 Add de.js with DE translations 2013-06-02 18:48:25 +02:00
JC Brand
9b9e514e4f Move everything into the initialize method 
This is so that the code only gets parsed once initialized is called.

We want the code to be parsed only then, because this allows us to
specifiy the translation language as a configuration setting to initialize.
 2013-06-02 00:21:06 +02:00
JC Brand
debb773ea5 Add jed.js for i18n support and wrap all strings 2013-06-01 13:18:33 +02:00
JC Brand
ba82f7bbce Auto-reconnect when the connection drops. 2013-05-31 21:53:49 +02:00
JC Brand
8c6a37b2ef Bugfix. Error presence stanzas don't have a from attr 2013-05-31 21:00:54 +02:00
JC Brand
9913cb6f98 Fallback to JID when no fullname in vcard. 
Also a bugfix: make sure to render the status widget when the user doesn't have
any roster contacts.
 2013-05-31 21:00:26 +02:00
JC Brand
91bdb56bdb Fixed race condition bug. More intelligent fetching of vcards 2013-05-31 16:55:58 +02:00
JC Brand
c845d11f26 Make sure chat-info msgs are not auto-removed 2013-05-31 09:58:12 +02:00
JC Brand
18fc903563 Use addHelpMessages method 2013-05-31 09:50:01 +02:00
JC Brand
0a0e4f2a3e Enable user to reconnect to an open disconnected room 
When a user has been removed from a room and the room is still open,
we want to re-use that same room once they join it again.
 2013-05-31 09:41:09 +02:00
JC Brand
49b99d9693 Refactored status message rendering code 
As a result we now implement more status codes from the spec.
Specifically the codes related to forced removal form the room

Also fixed a bug related to wrong authentication when logging in.
 2013-05-30 21:25:54 +02:00
JC Brand
7d1a7fd6b4 Add /me messages to chatboxes (they're already in chatrooms) 2013-05-30 18:06:40 +02:00
JC Brand
75adfc92f2 Bugfix. ejabbed doesn't seem to send a 110 status message 2013-05-28 20:51:01 +02:00
JC Brand
f84bf9259d Bugfix. Couldn't open chatroom when clicking from a list 2013-05-28 20:21:21 +02:00
JC Brand
e7debe0188 Fixed room join form styling. 
- list of rooms dropped off the controlbox
 2013-05-26 19:02:30 +02:00
JC Brand
4e2745a47d Add bosh_service_url to list of default config pars 2013-05-26 09:35:16 +02:00
JC Brand
7db90a5eb8 Make sure to display the stauts message when opening a chatbox 2013-05-23 11:33:21 +02:00
JC Brand
7f4f3d7def Add default config options to converse.js 2013-05-21 16:48:51 +02:00
JC Brand
a48a1f3d79 Add a config setting to hide the MUC server form input 2013-05-21 16:30:39 +02:00
JC Brand
d582e0f3bb Bugfix 2013-05-21 14:10:10 +02:00
JC Brand
18410ca4bf Add new form input for nickname when joining chatrooms 2013-05-21 14:07:17 +02:00
JC Brand
5cb2a473f3 Fix spinner so that it also renders properly in Plone 2013-05-21 13:37:47 +02:00
JC Brand
f763757879 No need for variables 2013-05-21 09:11:53 +02:00
JC Brand
feac7363ae Bugfix in room configuration code. 2013-05-20 22:16:35 +02:00
JC Brand
316d3f3396 Fixed an IE bug and fixed a bug in sendPresence. 2013-05-20 20:59:57 +02:00
JC Brand
0799d286fb CSS tweaks after testing standalone again 2013-05-20 20:08:47 +02:00
JC Brand
9aabe16155 CSS fixes for fancy dropdowns after some browser testing 2013-05-20 19:54:22 +02:00
JC Brand
feb3695ebe Tweak the error message styling 2013-05-14 22:13:05 +02:00
JC Brand
946bb7730b Fix tests 2013-05-14 09:43:49 +02:00
JC Brand
8467dc7016 Add contact even if vcard fetching didn't work. 
Also fixed a bug. We DO have to listen to the 'remove' event for roster items.
 2013-05-13 23:38:37 +02:00
JC Brand
c1423928ab It's now possible to enter password protected chatrooms 2013-05-13 23:17:16 +02:00
JC Brand
631c252e83 Next task is to render password form for restricted rooms 
For now just make sure the user is informed that pw is required.
 2013-05-13 09:22:45 +02:00
JC Brand
01336fefd9 Defer rendering of the messages area and roster 
until after we are sure that the user has actually entered the room
 2013-05-13 09:10:47 +02:00
JC Brand
5f0a90d00e Make sure that checkboxes are ticked in chat config 2013-05-12 15:17:58 +02:00
JC Brand
0e1386cb60 Room configuration settings can now be saved. 2013-05-12 13:53:37 +02:00
JC Brand
b470d2a571 More work towards making chatroom configurable 
Added a form with inputs for the configuration options (not yet usable)
 2013-05-11 18:14:06 +02:00
JC Brand
0914887b4f More work towards letting users configure chatrooms 
Add a configure button on chatrooms when the user is the chatroom owner.
 2013-05-11 16:58:08 +02:00
JC Brand
ef38fd0973 Add initial support for configuring chatrooms. 
For now we just create an instant chatroom, but eventually we must provide a
way through the UI in which the user can request to configure the room.
 2013-05-11 16:19:42 +02:00
JC Brand
fc06d46baa Give visual indication/tooltips about MUC user roles 2013-05-11 14:19:07 +02:00
JC Brand
7c1a9242d5 Add logic to parse error messages when trying to enter a room 2013-05-11 09:59:32 +02:00
JC Brand
c392a4e598 Show all available room features 
when clicking the info icon next to a room's name
 2013-05-11 08:50:01 +02:00
JC Brand
7142dc58c7 Don't call disco#info for all chatrooms 
It's way to inefficient when there are multiple chatrooms. Instead, I added an
info icon that can be clicked and which will fetch and display additional info
on the chatroom.
 2013-05-10 21:05:58 +02:00
JC Brand
d1618300a3 Make sure fullname is saved to localStorage 
Also make sure that logged in user's fullname is fetched from xmppstatus obj.
 2013-05-10 10:58:25 +02:00
JC Brand
1d9dda374b Fetch own vcard on startup 2013-05-10 10:00:25 +02:00
JC Brand
93a80e0db6 Add semi-colons 2013-05-10 08:47:25 +02:00
JC Brand
19cf4c753b Pad spinner which replaces login button 2013-05-09 22:38:17 +02:00
JC Brand
472280ae5d Add some padding around the login submit button 2013-05-09 19:01:34 +02:00
JC Brand
97c978bcfc Indicate when chatrooms are password protected 2013-05-09 18:34:15 +02:00
JC Brand
b3ed43c450 Don't fetch rooms on roster or when leaving a room 
Inefficient, causes way too much traffic and takes very long
 2013-05-09 17:07:52 +02:00
JC Brand
df7f1ccf2c Use feature discovery on chatrooms 2013-05-09 15:39:27 +02:00
JC Brand
07664ed350 Also inform if no rooms were found 2013-05-09 09:22:54 +02:00
JC Brand
5b2af5b03d Add a button to manually fetch rooms from server. 
Also show a spinner when logging in (to disable resubmitting login form)
and when refreshing the available chatrooms.
 2013-05-09 00:09:24 +02:00
JC Brand
da483d63f3 Optimize showing of chatrooms 
- by using documentFragment
 2013-05-08 22:31:33 +02:00
witek
6078ab5924 fixed message counter to be windowState aware. 2013-05-08 16:27:47 +02:00
JC Brand
308b4c6bd6 Show error messages in red 2013-05-08 14:25:21 +02:00
JC Brand
4b69a89090 Properly proxy callbacks 2013-05-08 12:16:11 +02:00