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

497 Commits

Author SHA1 Message Date
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