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