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
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
JC Brand
c07c0f5633
Communicate status code information to chatroom users.
...
Also bugfix that showed the wrong time for delayed messages.
2013-04-30 10:01:19 +02:00
JC Brand
dd1d56b9d8
Enable users to specify the XMPP server for chatrooms
2013-04-30 07:36:16 +02:00
JC Brand
7a824ac4f4
Bugfix in topic setting for chatrooms
2013-04-29 23:12:10 +02:00
JC Brand
e389913444
Better service discovery support
...
Features are saved to localStorage so that service discovery doesn't have to
happen during every request.
2013-04-26 14:30:14 +02:00
JC Brand
62a2e307a5
Add initial service discovery (XEP 30) support.
...
- Still needs caching and optimisation
2013-04-25 23:53:33 +02:00
JC Brand
b36d2f18e5
Add support for the BOSH bind URL as a setting parameter
2013-04-25 00:21:54 +02:00
JC Brand
27dec86caa
Clear connect form fields so that it cannot be resubmitted
2013-04-20 23:57:33 +02:00
JC Brand
d937d32d3b
Fix quirks with the add-contact dropdown
2013-04-20 22:55:22 +02:00
JC Brand
6de997681b
Fetch the user's vcard when you subscribe to them
2013-04-20 15:27:48 +02:00
JC Brand
cb2dab38fd
Fetch the user's vcard when you subscribe to them
2013-04-20 15:21:23 +02:00
JC Brand
98bbb79176
Fixed auth.
...
It depended on triggering events for which we've removed the handlers
2013-04-20 11:51:01 +02:00
JC Brand
58241cbb74
Make converse.js more modular
...
- Removed the $(document).ready handler. Instead, converse.initialize must be
called manually together with settings data.
- As a result the Plone specific event listeners are now also gone.
- Update tests and index.html to deal wit these changes
2013-04-20 11:32:54 +02:00
JC Brand
1cae33b06b
Globally rename xmppchat to converse
2013-04-20 10:41:10 +02:00
JC Brand
71f4cdb931
Initial work towards decoupling contact adding
...
New conf variable in converse.js to indicate how contacts are added (either via
XHR or directly).
2013-04-20 00:38:54 +02:00
JC Brand
a306e1a716
Clear the chatroom input when form was submitted
2013-04-19 22:10:52 +02:00
JC Brand
d394ad7ff2
Update index.html with Demo section
2013-04-19 00:09:04 +02:00
JC Brand
6aed43818c
Add XMPP Status Widget tests
2013-04-18 22:13:28 +02:00
JC Brand
4faf7f2a02
Style tweaks
...
Truncate pending contacts with too long names
Position accept/decline buttons below pending contact's name
2013-04-17 22:43:17 +02:00
JC Brand
7903c03651
Add a hide method and call that instead
...
Inside this method we can then check if animations are turned on.
2013-04-17 00:08:01 +02:00
JC Brand
a3b92ac321
Call destroy on rejected contact
...
Rather than calling remove and triggering a custom event
2013-04-15 09:57:01 +02:00
JC Brand
c13bd1e719
Make animations conditional
...
We don't want them during testing
2013-04-14 03:06:05 +02:00
JC Brand
d66cf7c2a9
Differentiate between initialize and onConnected
2013-04-14 01:17:51 +02:00
JC Brand
a6fd9450a9
Rename init to initialize
...
Also make sure to hash all localStorage keys
2013-04-14 01:08:24 +02:00
JC Brand
f2ae33d47c
Bugfix in show and moved setup code to init method
2013-04-14 00:47:18 +02:00
JC Brand
d2d10f0661
Bugfix.
...
Controlbox always appears when page loads
2013-04-12 21:56:24 +02:00
JC Brand
ebfd092e49
Bugfix.
...
Controlbox didn't auto-appear when a new user made a subscription request.
2013-04-12 21:01:04 +02:00
JC Brand
52bbe024cb
Bugfix.
...
Differentiate more clearly between presence type and the show element
2013-04-12 20:29:37 +02:00
JC Brand
c02dba7682
message time bugfix
2013-04-01 23:42:51 +02:00
JC Brand
09c614816c
Make the user search form similar to the status dropdown
2013-04-01 20:50:25 +02:00
JC Brand
54554e94ed
Fix closing of controlbox without a connection being present
2013-04-01 19:53:39 +02:00
JC Brand
aa09ea58cd
Give more detailed feedback when connecting
2013-04-01 19:48:37 +02:00
JC Brand
2b78460e82
Bugfix, don't call create if we don't yet have a connection
2013-03-28 11:38:16 +02:00
JC Brand
9533f4635f
Bugfix. Set up the RosterView after the Controlbox
...
Also, don't save subscription requesting contacts to cache.
2013-03-28 08:48:00 +02:00
JC Brand
6f5ff13055
Don't check the cache in getVCard since we don't call it so often anymore
2013-03-28 07:35:38 +02:00
JC Brand
fe8ed1282c
Better handling of user avatar. Don't create canvas el if there's no avatar.
...
Also, don't fetch vCards in rosterHandler. This could be very expensive for
large rosters, instead we'll fetch them when a user comes online.
2013-03-28 07:17:05 +02:00
JC Brand
49b4633c3f
Send nick along with subscription request.
...
Additionally:
It's not feasible to get the current user's fullname from a vCard all the time,
so we still get it from the DOM for now.
2013-03-28 07:03:16 +02:00
JC Brand
cd5615f79f
initStatus is still usefull when we have undefined initial status.
...
Also set bare_jid, domain and muc_domain on the xmppchat obj and not the
connection obj.
2013-03-28 06:23:08 +02:00
JC Brand
e41fddee0f
Refactored XMPPStatus a bit to remove initStatus and to always show status_message
2013-03-27 20:41:19 +02:00
JC Brand
2500d98ebe
Use backbone.localStorage for XMPPStatus model.
...
This was the last thing still using burry.js, so we now have one less
dependency :)
2013-03-27 20:18:00 +02:00
JC Brand
f6e299cc82
Bugfix. getVCard called errback by mistake.
2013-03-27 19:50:35 +02:00
JC Brand
102218b019
Compatibility changes for backbone 1.0
2013-03-27 19:33:53 +02:00
JC Brand
07a65f5b6a
Also show different days on chatrooms.
...
- Use a template to show the day's date.
- Use time element for the date and datetime attr
2013-03-27 17:07:24 +02:00
JC Brand
acbcf3fd2a
Indicate on the chatbox when messages span different days.
2013-03-27 14:13:42 +02:00
JC Brand
43434043ab
Store time as iso8601 strings on messages
2013-03-27 13:55:18 +02:00
JC Brand
cdcbe41d59
Refactored rosterChanged method.
...
Roster changes are listened to on the rosterview and the applicable chatbox is
updated.
Custom status messages are now remembered upon page load.
2013-03-25 13:08:27 +02:00
JC Brand
7046656370
Bugfix. Controlbox showed automatically upon page load
2013-03-25 12:00:24 +02:00
JC Brand
1c3a5a94cc
Don't store chatroom messages, the XMPP server (ejabberd) does this already.
2013-03-25 10:44:13 +02:00
JC Brand
e964e97285
Properly clear message counter upon page reload
2013-03-24 21:45:55 +02:00
JC Brand
744c575a6a
Bugfix. Message counter was not replacing previous count
2013-03-24 21:31:56 +02:00
JC Brand
a4b69ded7d
Save to localStorage messages sent in chatroom.
...
Also removed the need for the appendMessage method.
2013-03-24 21:26:21 +02:00
JC Brand
b49f21558c
Remove closeChatRoom and reuse closeChat on ChatBoxView
2013-03-24 17:54:29 +02:00
JC Brand
2d08916ce7
Remove the keyPressed method from ChatRoomView and reuse the one on ChatBoxView
2013-03-24 17:49:42 +02:00
JC Brand
337a3c2bdb
Remove ChatRoom model and instead re-use normal ChatBox model.
2013-03-24 17:44:47 +02:00
JC Brand
eaf39165ae
Use scrollDown and make sure newly created chatboxes are scrolled down
2013-03-24 17:23:13 +02:00
JC Brand
d27c69d7b9
Set up the roster earlier
...
and do the fetching and sorting when the view is initialized
2013-03-24 17:09:49 +02:00
JC Brand
d985b7ae27
More bugfixes.
...
Specifically handle the case where a chatbox was destroyed, and then opened again.
We still have the view, so we reuse it.
2013-03-24 14:01:55 +02:00
JC Brand
efad677f16
JSLint
2013-03-24 12:53:29 +02:00
JC Brand
b495f83745
Now also remove openControlBox
2013-03-24 12:36:40 +02:00
JC Brand
d0b9761d20
More work to remove the need for collection-view anti-pattern.
...
Remove createChatBox from chatboxesview and move the message received listener to chatboxes
2013-03-24 12:34:41 +02:00
JC Brand
9d89779bee
Remove openChat and showChat from chatboxes view and use events instead
2013-03-24 12:05:13 +02:00
JC Brand
974aa02605
Remove unused method
2013-03-24 11:49:22 +02:00
JC Brand
75cb595d50
Move roster change listener to a seprate method.
...
Move render, show and message fetching from ChatBoxesViews to ChatBoxView
2013-03-24 11:48:12 +02:00
JC Brand
1e3427adcf
Try to make more use of events
...
and get rid of using chatboxesview to control chabox views
2013-03-24 11:18:26 +02:00
JC Brand
a1b7eed7ac
That must be !prebind
2013-03-22 17:43:51 +02:00
JC Brand
7a90876ad7
Fixed again for the non-prebinding usecase.
2013-03-22 17:43:00 +02:00
JC Brand
c8def35af8
Remove xmppchat.ClientStorage, it's not being used anymore
2013-03-22 15:12:11 +02:00
JC Brand
6fe5ac7224
Messages are now also saved and retrieved via backbone.localStorage
2013-03-22 15:02:33 +02:00
JC Brand
9dd2f98841
Bugfix.
...
Couldn't save messages because localStorage wasn't activated for xmppchat.Messages
2013-03-22 13:17:37 +02:00
JC Brand
0f1f438266
Fixes for the case where a user binds to an existing connection
...
- Previous changes broke for the use-case with Plone, where the user
doesn't log in manually.
- These changes probably broke the manual log-in use case again, but
the design is now a bit cleaner and it won't be too hard to fix.
- Chatboxes are now also stored in backbone.localStorage \0/
2013-03-22 10:37:21 +02:00
JC Brand
6f25bfefb8
Cleanup
2013-03-22 08:47:43 +02:00
JC Brand
26cc218ca4
Syntax fixes
2013-03-22 08:34:28 +02:00
JC Brand
fba9bcfde6
ChatBoxes are now saved and fetched from backbone.localStorage.
...
Also made some initial changes to save/fetch messages from
backbone.localStorage
2013-03-22 08:22:04 +02:00
JC Brand
48e4ed271e
Big refactoring.
...
Removed ControlBox model, and instead only create ChatBox models inside
ChatBoxes collection (the Controlbox is now also a ChatBox).
This enables us to use backbone.localStorage for saving open chatboxes (saving
and fetching currently not implemented).
createChatBox now doesn't return a ChatBoxView instance anymore. In the case
where a view was needed (to append a message), we create the message on the
ChatBox and let the view update via an event trigger. This is much more Backbonic ;)
Also created a Message model. This will most likely enable us to in the future also
store messages via backbone.localStorage.
2013-03-21 14:11:45 +02:00
JC Brand
2fe7164df6
Add errbacks for getVCard
2013-03-21 12:29:59 +02:00
JC Brand
ee3da4e40e
Show the controlbox toggle by default.
...
Also, make sure RosterItems localstorage is user specifici
2013-03-21 11:43:35 +02:00
JC Brand
df931af213
Re-implement the login dialog as part of the controlbox.
2013-03-21 10:54:41 +02:00
JC Brand
e9916ec912
Cache vCard retrieval.
...
We still need a cache invalidation mechanism. Currently PEP event notifications look most promising.
http://xmpp.org/extensions/xep-0163.html
http://xmpp.org/extensions/xep-0292.html#self-pubsub
2013-03-20 11:34:54 +02:00
JC Brand
219089d261
Specify Chatboxes collection's contained models
2013-03-19 10:45:18 +02:00
JC Brand
f28e20dc41
Call render on the roster if an item is removed, to clear headings.
2013-03-15 07:22:37 +02:00
JC Brand
4eae6ae2aa
Bugfix.
...
User wasn't being removed from the roster if their buddy unsubscribed.
2013-03-15 07:17:49 +02:00
JC Brand
a28b17bb14
Make sure the roster is shown when a user subscribes
2013-03-15 06:48:28 +02:00
JC Brand
a1f5c31967
Remove last vestiges of jquery-ui
2013-03-12 14:31:46 +02:00
JC Brand
b7e191f2b7
Handle removal of roster items from the cache.
...
- Also, use the browser's confirm dialog, to remove the dependency on jquery.ui
2013-03-12 10:56:50 +02:00
JC Brand
db158876b2
Add initial support for caching roster items to localstorage
...
- Uses Backbone.localStorage
- Unsubscribing/removing contacts from this cache is not yet tested/implemented
2013-03-12 09:42:33 +02:00
JC Brand
112c8c612e
More presencing and chat status fixes.
...
- Try to clear up the confusion between presence_type (i.e type attr) and
chat_status (i.e <show> element).
- Properly set chat status and custom status message.
2013-03-06 11:42:53 +02:00
JC Brand
49fd8a7ecd
Fix presence exchange.
...
- Added 'show' element
- 'busy' must be 'dnd'
2013-03-05 22:57:05 +02:00
JC Brand
dfc1b73d11
Refactor some code out of the presenceHandler.
...
Also, don't hide the controlbox in the beginning, no need to.
2013-03-05 19:18:40 +02:00
JC Brand
1966d5ab56
Fix RosterHandler through proper closure.
2013-03-05 18:35:06 +02:00
JC Brand
bd5269c232
Various fixes, see below:
...
- Don't do an ajax call when a user wants to subscribe. We wanted to get the
user's fullname, but this is now handled via vCards
- openChat is now only for roster items. Call showChat for controlbox and
createChatRoom for rooms.
2013-03-05 10:15:48 +02:00
JC Brand
8f697923f2
Replace another server call with VCard.
...
This time when a message is received for the first time.
2013-03-05 09:33:29 +02:00
JC Brand
121fab13a8
Add getVCard method (will be usefull for caching later)
2013-03-05 09:17:06 +02:00
JC Brand
2791143508
Set the avatar image on the rosteritem obj
2013-03-04 23:05:01 +02:00
JC Brand
4b670228ff
Fix canvas image ratio (don't stretch or squash)
2013-03-03 20:30:07 +02:00
JC Brand
daa31794d7
Render the vCard profile picture
2013-03-03 20:14:11 +02:00
JC Brand
d9f8b957d0
More refinements.
2013-03-03 18:04:45 +02:00
JC Brand
4c1f857741
Fetch vCard when restoring a previously opened chat
2013-03-03 17:27:14 +02:00
JC Brand
e3fa8325b8
Add initial vcard support
2013-03-03 17:27:14 +02:00
ichim-david
c4cafb8c4f
Changed the following:
...
- Chain calls on initialize method of RosterView
- Moved dom insertion out of loops on initialize method of
XMPPStatusView
2013-03-02 09:32:26 +02:00
ichim-david
d8e4f848b6
Wrap this with jQuery only once in subscribeToSuggestedItems; Same thing with presence in presenceHandler
2013-03-02 09:05:23 +02:00
ichim-david
58bbbe8b9d
Cached message from attribute of messageReceived method
2013-03-02 08:54:41 +02:00
ichim-david
e635fb4fc4
Chain jQuery methods for show and render of onChatRoomMessage
2013-03-02 08:41:51 +02:00
ichim-david
5ee9a678c9
Changed the following:
...
- removed extra jQuerify wrapping of message at onChatRoomMessage
- Construct an array of strings and add it to onChatRoomRoster only
after loop is done in order to have only 1 dom insertion
2013-03-02 08:36:47 +02:00
ichim-david
764a710158
Cached presence for onChatRoomPresence and removed length comparision to > 0
2013-03-02 08:28:50 +02:00
ichim-david
300b069a0e
Use ; Do only one dom insertion in case of /help
2013-03-01 21:53:48 +02:00
ichim-david
6afb091d12
Cached available-chatrooms calls to avoid dom calls on updateRoomList
2013-03-01 21:46:02 +02:00
ichim-david
18f877b59c
Changed the following:
...
- Chained call to render and show methods of ChatBoxView
- Cached target for subscribeToContact
- Removed check of length > 0
2013-03-01 21:38:47 +02:00
ichim-david
5c5b7b9dd7
Changed the following:
...
- Removed situation where extra data passed in keyPressed was overriden
with the same result because of the two assignments inside the if
statements
- Cached fullname and presence_type at initialize of ChatBoxView
2013-03-01 21:23:55 +02:00
ichim-david
87d66b0dec
Changed the following:
...
- Cached length of every iteration in order to avoid having to calculate
length on every iteration
- Changed insertClientStoredMessaged length check to use the simple length of
the array instead of using underscore size since
- Added description with need of underscore size method for roster on
onChatRoomRoster since the roster is an object not an array
2013-03-01 21:07:27 +02:00
ichim-david
fdddecbeb2
Fixed the following:
...
- Added missing var statements for variable declarations
- Added TODO entries for code that needs to be used or further tested
- Removed unused variables
- Removed check of length > 0 as it's enought to check just item.length
as a boolean
- Renamed scrolldown to scrollDown to keep a consitent style of method
naming
- Removed extra jQuery wrapping for many objects and instead define it
once and use it in the other places
- Use jQuery chaining for modifying connecting message in
jarn.disconnect
- Define wrapped message in messageReceived from line 342 instead of
expecting it to be received from the other messageReceived function
2013-03-01 20:43:41 +02:00
JC Brand
10be57aec4
Add strinclude function
2013-02-28 20:42:08 +02:00
JC Brand
d7cb92c7af
Merge pull request #3 from ichim-david/master
...
Optimize actions done in RosterView.
2013-02-28 00:31:46 -08:00
Alexandru Ghica
0f9c088c41
Added error_icon.png and spinner.gif images
...
Added error_icon.png and spinner.gif images to not make it dependent of
Plone resources.
2013-02-25 16:29:45 +02:00
ichim-david
fe0034f123
Check also if subscription === to in order to correctly move the accepted contact subscription from pending to current
2013-02-25 14:34:02 +02:00
ichim-david
63134858d7
Properly hide or show dt that no longer have dd adjacent
2013-02-24 11:31:47 +02:00
ichim-david
19caf7c448
Prevent default event for the removeContact link in order to avoid page reload when jQuery Dialog is openened from clicking on the delete link
2013-02-24 10:59:57 +02:00
ichim-david
00aba6a9cd
Move the event handlers on the view instead of registering them in render method of RosterItemView
2013-02-23 22:20:53 +02:00
ichim-david
7daa681ac3
Show dt elements on xmppchat-roster only if they have length and they are not already visible to avoid making them all the time visible when they might already be so
2013-02-23 16:49:01 +02:00
ichim-david
85e9c7cecc
Changed the following:
...
- Subscribe event with help of jQuery one instead of delegate, now that
the rosterView is no longer emptied on every render to avoid
registring several handlers of remove action, which meant you had to
click 4 times for the jQuery Dialog to go away
- Remove the element from the rosterView when the remove event is
triggered on the model which removes just that item instead of
emptying the list and appending the remaining models again
2013-02-23 16:17:00 +02:00
ichim-david
d8d3a34737
Fixed a bug where controlbox wasn't available on xmppchat.chatboxesview, instead pass the removal of the model to rosterview.model
2013-02-23 15:43:20 +02:00
ichim-david
083f76b7cc
Fixed merge conflicts for converse.js
2013-02-22 16:45:42 +02:00
Alexandru Ghica
8c45f23255
Better message on error
...
Changed message from "conecting" to "error" as in this case
communication was over and was an error.
2013-02-22 15:51:50 +02:00
Alexandru Ghica
b6af624b14
Code clean up
...
Cleaned up unnecessary spaces, replaced tabs with spaces and fixed line
terminators.
2013-02-22 15:42:35 +02:00
ichim-david
32ebfe5372
Changed the following:
...
- Show the xmppchat-roster only after all of the items have been added
from first run of rosterHandler
- Resort the items only when the presence has changed and not when the
resource attribute has changed
2013-02-22 14:29:49 +02:00
ichim-david
66d7b51535
Changed the following:
...
- Pass an option object to addRosterItem which can contains information about
the object catched in the rosterHandler.
In this case I am marking the last item available in the roster of the
person for which this handler is triggered
2013-02-21 22:36:41 +02:00
ichim-david
a256645d6d
Removed rendering of rosterview since I've added check to render only with passed item and the result is the same without the rendering
2013-02-21 22:24:09 +02:00
ichim-david
3cf671884c
Fixed the following:
...
- Fixed function has inconsistent return points by always specifying
returns instead of returning only on condition
- Set room-jid as data-room-jid attribute to validate html5
- Added missing semicolon
2013-02-21 21:28:40 +02:00
ichim-david
447c3a8d41
Set modifications of model attributes only if the item received from the rosterHandler has different options
2013-02-21 20:57:22 +02:00
JC Brand
ffbacad969
Merge branch 'master' of github.com:jcbrand/converse.js
...
Conflicts:
converse.js
2013-02-21 14:46:05 +02:00
JC Brand
75b9a35e8d
Bugfix. Time on old messages shown incorrectly.
...
Also other backports from production.
2013-02-21 14:42:30 +02:00
Alexandru Ghica
4bbf5b054d
Feature: added "Connecting to chat ..." info
...
- Feature: added spining image and "Connecting to chat ..." info under chat panel
when the user is not (yet) binded to the jabber server
[alecghica]
2013-02-20 18:21:07 +02:00
ichim-david
95fdf98ea6
Pass item to render method of RosterView instead of looping over each item on every render call, Inverted visibility logic for contact titles in order to avoid multiple show and hide
2013-02-20 15:36:55 +02:00
ichim-david
a875ba51a0
Moved assignment of template for RosterView out of the render method to avoid calling empty and readding items everytime the render method is called
2013-02-19 18:16:05 +02:00
JC Brand
dbf20052c3
console can be defined higher up
2012-12-11 13:45:25 +02:00
JC Brand
9ef94886db
IE8 fixes. Also avoid ajax call when opening chatroom
2012-12-11 12:02:46 +02:00
JC Brand
6a49090a21
Use switch statement instead of ifs
2012-12-10 18:11:02 +02:00
JC Brand
8bb1ee06b6
Refactored RosterView
...
So that it doesn't depend on it's element already being in the DOM
2012-12-09 21:47:12 +02:00
JC Brand
f699fbdbf5
Bugfix. Revert RosterView to previous module where it was executed in delayed fashion
2012-12-09 21:13:17 +02:00
JC Brand
39c0823f2a
Alphabetically sort roster contacts according to type and status
...
Also added a new jasmine spec for this as well as jquery.tinysort to do the
sorting.
2012-12-09 19:55:23 +02:00
JC Brand
85e419afc5
Add test.html for loading tests in browser and tests_main.js for calling them
...
Also add flush method to converse.js (used in ClientStorage tests)
2012-12-08 07:24:34 +02:00
JC Brand
1cdf82c01a
Add /help command for chat and groupchat and /clear command for chat
2012-12-06 15:33:43 +02:00
JC Brand
f1bfc51152
Separate messages from different days.
2012-12-06 12:49:03 +02:00
JC Brand
7ae4bed223
IE 8 Fix. Add toISOString method
2012-11-20 15:08:29 +02:00
JC Brand
fb03ea8a56
Handle case where console is undefined, like on IE
2012-11-20 13:53:04 +02:00
JC Brand
c17ffdb98a
Added functionality to connect to an XMPP server.
...
Can succesfully connect now, but still need to get rid of ajax calls to @@xmp-userinfo, and replace them with
VCards.
2012-11-20 13:23:03 +02:00
JC Brand
bc4a242898
Automatically convert URLs in chat messages to hyperlinks
2012-11-20 10:57:24 +02:00
JC Brand
a723a3940b
Bugfix. Use findItem instead of get to check the roster
2012-11-20 09:32:12 +02:00
JC Brand
ba201a7608
Don't connect to groupchat via first name only
2012-11-19 22:22:25 +02:00
JC Brand
36491699ee
If another resource changes it's status, change this one as well.
...
This is necessary because each open tab in the browser is its own resource.
TODO: Ideally we should differentiate between resources in the browser (using
converse.js) and other resources (i.e from a desktop client).
2012-11-04 20:28:25 +02:00
JC Brand
e213d755ae
Two small bugfixes
2012-11-04 20:02:06 +02:00
JC Brand
d0dc83ed30
XEP-0297: Forward sent messages to connected resources.
...
- This allows multiple open tabs (which is each its own resource) to be aware
when one tab sent a message.
2012-11-04 10:54:01 +02:00
JC Brand
8c7806425d
Work around undefined jarnxmpp for now. Properly define underscore.string
2012-11-02 13:55:12 +02:00
JC Brand
3ebd223cc2
Fix broken events for chatrooms panel. CSS tweaks.
2012-10-26 11:41:39 +02:00
JC Brand
fd4192b7cc
Another sizable refactoring.
...
- Contacts and Chatrooms panels are now separate Backbone views
- Fixes broken events after previous refactoring.
2012-10-25 23:33:09 +02:00
JC Brand
a3f54321aa
Refactor: The controlbox is now rendered via JS template.
...
- Removes the need for JQueryUI
2012-10-25 12:36:37 +02:00
JC Brand
07ca5d3506
Add link to user profile URL from name in chatbox header
2012-10-22 14:47:16 +02:00
JC Brand
54b7565e3b
Set title attr on chatroom topic as well. Tweak CSS
2012-10-22 14:34:37 +02:00
JC Brand
c1eb35324d
Fixed alt attr or profile img and set status on title attr
2012-10-22 13:52:29 +02:00
JC Brand
484ea865cc
Show user portraits in the chatboxes.
2012-10-20 18:15:51 +02:00
JC Brand
47380d0893
Bugfix. Only unauthorise user once removed from the roster.
2012-10-19 18:04:32 +02:00
JC Brand
588825e01d
Two bugfixes.
...
Show status change only in applicable chatbox.
Don't show the "Remove connection changed" messages as status messages
2012-10-19 17:18:03 +02:00
JC Brand
37486118a2
Store open chats in localstorage, removing the need for jquery.cookie
2012-10-19 16:37:08 +02:00
JC Brand
bd2492e678
Encrypt messages stored in localstorage.
2012-10-19 15:34:58 +02:00
JC Brand
e235fa4438
Refactored local storage code and fixed data leakage.
2012-10-19 14:30:42 +02:00
JC Brand
72e9698de1
Refactored Status messaging.
...
Also ixed but where status wasn't set at initial page load.
2012-10-18 21:40:06 +02:00
JC Brand
09e34353c5
Make sure auto_subscribe has a boolean value.
2012-10-17 20:45:45 +02:00
JC Brand
069310c6e6
Add support for showing firstnames instead of usernames.
2012-10-17 15:42:18 +02:00
JC Brand
194e968849
Rename to avoid name clash with jarnxmpp js.
2012-10-17 15:20:12 +02:00
JC Brand
c9cf028c75
Improved the presence handling when auto-subscribe is on.
2012-10-17 11:51:04 +02:00
JC Brand
88e0cb5b2a
Add support for auto-subscribe
2012-10-16 23:10:42 +02:00
JC Brand
630454f893
Refactored the roster code to make it more sane
2012-10-16 22:39:21 +02:00
JC Brand
0fee92bf32
Uncomment stanza logging to the console
2012-10-16 11:40:28 +02:00
JC Brand
1aa8b02f82
Add a handler for the roster get
2012-09-28 19:17:16 +02:00
JC Brand
ae12760625
base_url is not being used.
2012-09-25 13:22:27 +02:00
JC Brand
88b1b55e4d
Declare vars
2012-09-24 15:48:44 +02:00
JC Brand
1442774856
Use Mustache style variable interpolation.
2012-09-21 16:42:03 +02:00
JC Brand
6d9ab59349
Enable require.js support. Use burry.js instead of store.js
2012-09-21 16:04:57 +02:00
JC Brand
bd4dfa9c36
Remove unused markup and css
2012-09-19 12:22:04 +02:00
JC Brand
85b27f07be
Rename div#online-users-container to div#controlbox
2012-09-19 05:55:24 +02:00
JC Brand
f8ebdb2303
Declare globals
2012-09-18 17:22:15 +02:00
JC Brand
003a10e26e
Use hex_sha1 from strophe.js and unescape the JID nodes in more places.
2012-09-17 15:17:57 +02:00
JC Brand
ccf019ea50
Get the time from delayed messages.
2012-09-13 17:42:11 +02:00
JC Brand
e87db946c2
More places where fullname must be used and not user_id
2012-09-13 15:58:31 +02:00
JC Brand
96fab21e0c
Add fullname support and also handle special chars*
...
* Necessary for email as username support
2012-09-13 14:19:19 +02:00
JC Brand
358985c96e
Bugfix. Allow spaces and weird chars in room names.
2012-09-12 15:38:04 +02:00
JC Brand
5a56fcc6a4
Roster/subscription bugfix.
2012-09-11 21:26:59 +02:00
JC Brand
aebd3b5beb
Pending contacts shouldn't be clickable.
2012-09-11 21:18:34 +02:00
JC Brand
51b85f9ae7
Make compatible with JQuery 1.4.4 by using .delegate instead of .on
2012-09-11 20:37:27 +02:00
JC Brand
db7c0ba7eb
Automatically open the online users box if a user requests subscription.
2012-09-11 19:45:30 +02:00
JC Brand
4c6d6b2f1a
Enable /me messages for chatrooms.
2012-07-30 15:51:50 +02:00
JC Brand
3428b355c7
Bugfix, show status updates on the correct chatbox.
2012-07-29 00:04:00 +02:00
JC Brand
ae9e8634e3
Construct and send stanza for setting a custom status
2012-07-28 23:56:42 +02:00
JC Brand
a912068e13
Add support for message actions (/me command).
2012-07-28 23:28:32 +02:00
JC Brand
d1efb1c7dc
Add preliminary support for setting a custom status message.
2012-07-28 22:46:14 +02:00
JC Brand
537c56ed45
Rename 'status' to 'presence_type' to avoid confusion.
2012-07-28 16:29:54 +02:00
JC Brand
cd67e80a28
Bugfix. Make sure that boxes are displayed inline and set #chatpanel width to auto.
2012-07-26 00:31:58 +02:00
JC Brand
f4a90cc9b0
Remove hardcoded muc domain.
2012-07-24 21:04:42 +02:00
JC Brand
c48b1f2aeb
Add support for setting a chat room's topic
2012-07-22 22:08:19 +02:00
JC Brand
df4c14826f
Use $.proxy to set correct context for event handlers.
2012-07-22 20:43:18 +02:00
JC Brand
2852ca088c
Rename chat.js to converse.js
2012-07-22 20:20:22 +02:00