JC Brand
01c2c5d93c
Save groups on RosterItem. updates #83
2014-07-14 21:44:18 +02:00
JC Brand
6bded11304
Add connection feedback on the controlbox.
...
Now that the toggle is hidden when the controlbox is visible.
2014-07-14 20:41:26 +02:00
JC Brand
fe3e9f5294
Bugfix, xhr_user_search_url is not a global. Fixes #192
2014-07-11 16:12:56 +02:00
JC Brand
012cbfb61a
Rename events.
...
Remove the "on" prefix. Events are listened to via "on" method, so it's
redundant.
2014-07-06 18:31:17 +02:00
JC Brand
4f5534ed66
Finally fixed the non-AMD case to work with external templates.
2014-07-06 17:32:06 +02:00
JC Brand
166b3bd003
Increase the clickable area for restoring a minimized chat
2014-07-06 12:40:50 +02:00
JC Brand
5034ae33f2
Work on getting proper separation between tests.
2014-06-30 20:26:45 +02:00
JC Brand
75a94fb2b7
Merge branch 'master' of https://github.com/derek-wangpch/converse.js into derek-wangpch-master
2014-06-30 18:59:49 +02:00
JC Brand
8aedc3fcf7
Integrate backbone.browserStorage. Fixes #176
...
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
2014-06-30 18:53:58 +02:00
JC Brand
180d175e54
Fix tests. Make sure the min chats toggle gets updated
2014-06-29 18:30:01 +02:00
JC Brand
27cce2c229
Refactor to store number of unread messages
2014-06-29 15:59:39 +02:00
JC Brand
4b8196cd7e
Add more tests around minimized chats.
2014-06-21 23:01:56 +02:00
JC Brand
c9d7e17a10
Fix test failures due to previous commit
2014-06-14 22:03:04 +02:00
JC Brand
4273e19716
rid and sid are on the _proto obj. Fixes #180
2014-06-14 20:41:20 +02:00
JC Brand
0d3977d3d4
Remember the state of the minimized chats toggle
2014-06-14 20:32:45 +02:00
JC Brand
30a6e6cb58
Remove redundant function wrapping
2014-06-14 19:47:19 +02:00
JC Brand
7ff99a5025
Only need a reference to the toggle view
2014-06-14 19:44:00 +02:00
JC Brand
d45ba9e57e
Try to fix some corner cases resulting from narrow window widths.
2014-06-14 18:21:52 +02:00
JC Brand
190142a0b0
Call trimChats when the window is resized.
...
Also fixed 2 bugs.
1. Instead of checking whether minimized chats toggle is visible, check whether
there ae aleady minimized chats (visuals might be delayed).
2. Don't call restore from removeChat. Chat gets restored earlier.
2014-06-14 16:22:52 +02:00
JC Brand
9c2b19c71d
2 bugfixes.
...
When a chat is minimized in trimChats, trimChats needs to be called again (in
case the minimized chats toggle is newly shown).
Debounce the "restore" method to avoid breakage due to double click.
2014-06-11 22:53:14 +02:00
JC Brand
7d6595435e
Add the logic for toggling minimized chats
2014-06-11 22:01:18 +02:00
JC Brand
f416a455d1
Add a toggle to show/hide the minimized chat boxes.
...
Still rough around the edges
2014-06-05 00:12:53 +02:00
JC Brand
e2d494f0ad
Unread chat messages now appear on the minimized chat view.
2014-06-04 09:32:40 +02:00
JC Brand
0d3c101cbf
Start fixing message count bugs
2014-06-02 21:51:30 +02:00
JC Brand
c6a32b847e
Fix chatroom tests
2014-06-02 05:13:53 +02:00
JC Brand
ef9fd9617d
Fix rendering of minimized chatrooms
2014-06-02 04:47:23 +02:00
JC Brand
afcb49b6b6
Show the consolidation in the mockup.
2014-06-01 20:56:58 +02:00
JC Brand
6e5bf44ada
This branch marks the start of a significant conceptual change.
...
Instead of differentiating between trimmed chats and minimized chats, the two
are now combined into the same thing.
This commit contains some initial work, but functionality is still impaired.
2014-06-01 20:09:09 +02:00
JC Brand
c594e5a1e9
Add new test for trimmed chats
2014-06-01 17:57:03 +02:00
JC Brand
81f3814e32
Refactor code out into backbone.overview
2014-06-01 15:28:52 +02:00
JC Brand
76545632fc
More work on properly restoring trimmed chats.
...
* Make sure that a restored (grown) chat is inserted to the right
* Make sure restoring via the contacts roster works
2014-06-01 02:09:05 +02:00
JC Brand
b84fb41341
Trimmed chats can now be restored.
2014-05-27 22:51:11 +02:00
JC Brand
38e0668372
Fix tests.
2014-05-27 19:18:02 +02:00
JC Brand
ad51e1c0f7
More working on trimming chats. (still very buggy)
...
More flesh on the view and superview for trimmed chats.
Add event handlers.
Renamed some methods to make them shorter, more consistent.
2014-05-27 18:34:22 +02:00
JC Brand
2d237f9e6d
More work on trimming chat boxes.
...
Added a view for trimmed chat boxes and a super-view for keeping track of them.
2014-05-27 09:57:06 +02:00
Derek Wang
f0bb123e7f
Fix a bug that emoticon of '<3' and '>:)' cannot be displayed correctly in the message
2014-05-19 22:06:11 +08:00
Derek Wang
40bc3ec55d
Revert "Fix a bug that emoticon of <3 and >:) cannot display correctly in the message."
...
This reverts commit f7e7d1a658
.
2014-05-19 22:03:26 +08:00
Derek Wang
f7e7d1a658
Fix a bug that emoticon of <3 and >:) cannot display correctly in the message.
2014-05-19 18:27:22 +08:00
JC Brand
1a92db8946
Override save on ChatBox to not persist the 'trimmed' attribute
2014-05-13 11:50:33 +02:00
JC Brand
0c0a3f86b6
Remove the need for having an HTML snippet in the body.
2014-05-13 09:26:57 +02:00
JC Brand
0b10ad00fd
Some initial work on adding trimmed chat functionality
2014-05-11 20:45:28 +02:00
JC Brand
d1aead81d7
Fix to remove artifact when switching control box tabs.
2014-05-11 20:08:36 +02:00
JC Brand
ad466b62a0
Rewrite and improve trimOpenChats. updates #61
2014-05-05 23:37:52 +02:00
JC Brand
aa52ba5b94
Add method trimOpenChats. Updates #61
2014-04-26 06:55:52 +02:00
JC Brand
c7b900859d
Bugfix. use !isBefore instead of isAfter
...
moment.js is accurate to the second, instead of milliseconds. This causes
timing errors while testing.
2014-04-25 23:59:05 +02:00
JC Brand
b307d5170b
Date handling is now done with moment.js
2014-04-25 23:44:10 +02:00
JC Brand
22c7243043
Initial work on managing the number of open chat boxes
2014-04-25 21:48:56 +02:00
JC Brand
dec674fae2
Bugfix. Opened chatboxes weren't focused...
...
...when clicking on a contact in the roster
2014-04-24 20:55:07 +02:00
JC Brand
4937fafea4
Add tests for new "clear" button.
2014-04-24 19:21:38 +02:00
JC Brand
9b3601314e
Add a new toolbar button to clear chat messages
...
Configuration options have changed a bit.
show_emoticons and show_call_button are now removed. Instead the toolbar is
configured via a new config option: "visible_toolbar_buttons".
2014-04-24 18:10:04 +02:00
JC Brand
d69a165b05
Use strict mode. Emit an event when the connection drops.
2014-04-24 09:51:21 +02:00
JC Brand
1c26e9016c
Fixed chatbox positioning and better disabling of effects
...
* The animate config option now disables jQuery effects
* Make sure the controlbox is always to the right of all other chatboxes
* Make sure new chatboxes are always created immediately left of the controlbox
2014-04-24 07:58:35 +02:00
JC Brand
eca42fbb2f
Add support for XEP-0280 Message Carbons. updates #132
2014-04-19 06:58:26 +02:00
JC Brand
968f8bb223
Add new configuration setting "forward_messages".
...
What was before default behavior is now optional and disabled by default.
2014-04-19 06:18:17 +02:00
JC Brand
14d90bc99c
Upgrade dependencies to their latest versions
2014-04-19 05:12:24 +02:00
JC Brand
7d472eb26d
Add new dependency moment.js
...
Use it to better compare dates when trying to determine whether a message falls
on a different day.
Also upgraded some dependencies' versions.
2014-04-19 01:30:48 +02:00
JC Brand
b88113c246
Fixed some failing tests.
...
Some of the tests were failing because they didn't expect the controlbox to be
returned from localStorage.
It's too long ago that I've looked at this branch for me to say whether this is
a legitimate bug or not.
Will have to investigate further.
2014-04-18 17:42:35 +02:00
JC Brand
3cfcb2ae34
2 controlbox bugfixes and spec typo.
...
* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox
2014-03-15 05:52:00 +02:00
JC Brand
fae9b84577
Bugfix: undefined template and a typo
2014-03-15 05:49:11 +02:00
JC Brand
bb0f49cf4d
Add a counter to show unread msgs when chat is minimized
2014-03-09 13:31:01 +02:00
JC Brand
9849daacf9
Merge branch 'master' into 0.8
...
Conflicts:
bower.json
converse.js
docs/CHANGES.rst
spec/chatbox.js
tests/utils.js
tests_main.js
2014-03-09 08:18:00 +02:00
JC Brand
9b3af57d13
Release version 0.7.4
2014-03-05 08:44:01 +02:00
JC Brand
74779afd66
Ensure that URLs in messages are properly escaped
2014-03-05 08:03:52 +02:00
JC Brand
25cc229019
Refactor message handling
...
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
Conflicts:
converse.js
tests/utils.js
2014-03-05 01:46:19 +02:00
JC Brand
317ab95cd8
Refactor message handling
...
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
2014-03-05 01:23:45 +02:00
JC Brand
ec39e6e802
Emit new event onChatBoxToggled
2014-03-04 20:16:03 +02:00
JC Brand
b14538b441
Rename ChatBoxesView to ChatBoxViews
2014-03-04 15:54:36 +02:00
JC Brand
1567b212c3
Add closure get/set methods for rosteritem views
2014-03-04 15:49:02 +02:00
JC Brand
d20ca10638
Add closured get/set methods for views from chatboxesview
2014-03-04 15:09:16 +02:00
JC Brand
ac0042fdf9
Extend the "close chat" test with a normal chatbox usecase
2014-03-04 13:22:49 +02:00
JC Brand
c030494ef0
Fix tests and simplify code for showing controlbox
2014-03-01 08:21:36 +02:00
JC Brand
4f2125c20e
Simplified by setting height via template, not JS
...
Also dropped the minimum height restriction
2014-03-01 01:57:20 +02:00
JC Brand
7d58d856b8
Save chat box's toggle state between page loads.
2014-03-01 01:57:20 +02:00
JC Brand
8294162f9d
Store and maintain a chatbox's custom size.
2014-03-01 01:57:20 +02:00
JC Brand
11b59b31d3
Fix tests after all the refactoring...
2014-03-01 01:57:20 +02:00
JC Brand
8feeb73320
Fix webkit bug that prevents boxes from reordering when one is closed
2014-02-23 05:49:30 +02:00
JC Brand
0414fa02c2
Add some resistance around chatbox's original height when resizing
2014-02-23 03:38:26 +02:00
JC Brand
1ce7620b88
Merge remote-tracking branch 'origin' into 0.8
...
Conflicts:
converse.js
docs/CHANGES.rst
index.html
2014-02-23 02:54:35 +02:00
JC Brand
319a955f65
Add code that allows resize by click+drag.
...
Removed dragresize.js and instead wrote new much smaller and simpler code
in converse.js.
2014-02-22 23:20:36 +02:00
JC Brand
94c135a6d8
Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default
...
Conflicts:
converse.js
Fixes #102
2014-02-12 12:52:57 +02:00
JC Brand
18d6a91881
Add API method to retrieve the SID. Fixes #93
2014-02-12 12:37:39 +02:00
JC Brand
30f3114c7c
Add method to get the latest RID. Updates #93
2014-02-12 12:19:12 +02:00
JC Brand
1a4044dd2a
Slight refactor of generatePrivateKey...
...
to avoid having to give pass it a callback method
2014-02-12 11:30:05 +02:00
JC Brand
62d59ff3e4
Refactor some OTR code into a Backbone model and adapt tests.
2014-02-12 07:12:00 +02:00
JC Brand
398142c7de
Add a test for the passphrase storage. Updates #111
2014-02-12 02:02:45 +02:00
JC Brand
ca9c215cac
Use a random passphrase to encrypt the private key. Updates #111
2014-02-12 00:45:25 +02:00
JC Brand
2026305791
Remove code for re-attaching a prebinded session.
...
I couldn't get it to work. Suspect that a new session needs to be
created/authenticated instead of attaching to the existing connection.
2014-02-11 23:48:38 +02:00
JC Brand
dc858cc38b
Register connection addHandlers when reconnecting
2014-02-11 15:52:12 +02:00
JC Brand
c3b98fd2fd
Refactor and improve the reconnecting code and make it configurable
...
There is still the apparent problem that after reconnecting, event listeners
hvae to bre reregistered (which doesn't happen currently).
So messages can be sent but not received...
2014-02-11 13:14:36 +02:00
JC Brand
d0f023dbb1
Allow the OTR private key to be cached. Updates #111
2014-01-31 18:07:44 +02:00
JC Brand
5406df1bc7
Add an animated spinner when generating a private key.
2014-01-31 13:40:33 +02:00
JC Brand
8232cdaff2
Bugfix. Updates #111
...
When using OTR with prebind, the user password isn't defined.
=============================================================
When not using prebind, the user password is used to encrypt the private key
for the OTR session before it's saved in session storage.
When using prebind, we ideally want to use the same OTR private key across page
loads, so that we don't have to spend the time generating a new one together
with AKE on every page load. To do this, we need to store it somewhere, like
the browser's session storage.
However, I have yet to find a secure way to store the OTR private key that does
not expose it to maliciously injected javascript.
For now, I've updated the code to generate a new private key and do the AKE
with every page reload.
I'm considering adding code to store the private key in Session Storage and
letting the user explicitly enable this (while making them aware of the risks
involved).
2014-01-31 05:50:38 +02:00
JC Brand
9bce25109c
Allow non-amd usage of converse.js without requiring OTR modules.
2014-01-30 09:35:35 +02:00
JC Brand
d7c31d5b73
Minor correction of OTR/SMP explanation. Fixes #113
2014-01-28 03:50:51 +02:00
JC Brand
12fc286ca6
Various changes, see below:
...
- disable drag resizing when chatboxes are minimized.
- refactored chat box and chat room markup so that they are more similar.
- don't make the chat box title clickable if no vcard URL is available
- make only the title text clickable, not the whitespace
- fixed toggling of resized chats
2014-01-27 02:26:55 +02:00
JC Brand
62f6997a25
Chat boxes and rooms can now be resized vertically
...
The new size is not stored/persisted.
2014-01-23 00:55:52 +02:00
JC Brand
680548612c
Make controlbox appear in a smoother fashion in webkit
...
when clicking the controlbox toggle
2014-01-23 00:33:55 +02:00
JC Brand
d0af974206
Chat boxes can now be minimized. Updates #71
2014-01-22 23:51:15 +02:00
JC Brand
d2358a6a93
Controlbox and its toggle are now mutually exclusive.
...
When the one is visible, the other is hidden and vice versa.
2014-01-22 23:19:45 +02:00
JC Brand
823f93f006
Merge branch 'templates' into 0.8
...
Conflicts:
converse.js
2014-01-22 19:29:47 +02:00