Commit Graph

292 Commits

Author SHA1 Message Date
JC Brand
2c0ae11fb7 Remove sjcl, which is not being used anymore 2013-08-25 23:27: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
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
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