Commit Graph

604 Commits

Author SHA1 Message Date
JC Brand
4322e9032b Bugfix.
Can't know whether existing roster item is already shown under the existing group.
2014-07-23 19:21:14 +02:00
JC Brand
1705aa8f48 Bugfix. Handle case where user accepts request.
But other user is not online to quickly subscribe back.
2014-07-23 19:11:29 +02:00
JC Brand
2886479b9b Merge branch 'master' into groups
Conflicts:
	converse.js
2014-07-23 13:23:30 +02:00
g8g3
05a54ba054 Assignment to writable property style.height instead of readonly offsetHeight.
Fixes #196.
2014-07-21 10:57:12 +02:00
JC Brand
ce617f1f31 Some refactoring of RosterView and skeleton for groups test 2014-07-20 22:44:50 +02:00
JC Brand
e1a19678ad Allow group headings to be toggleable. updates #83 2014-07-20 19:11:34 +02:00
JC Brand
29c822a6b5 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-20 00:16:22 +02:00
JC Brand
0aca9ef3c2 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-19 23:54:52 +02:00
JC Brand
04d2b3aefd Some initial refactoring to support roster groups. updates #83
Made sure that the non-group usecase is still covered.
2014-07-19 23:45:21 +02:00
JC Brand
7c9a86293d Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:43:56 +02:00
JC Brand
df374d3d3e Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:41:53 +02:00
JC Brand
a338ede0d1 Replace accept/decline buttons with font icons 2014-07-19 14:50:25 +02:00
JC Brand
37ac91dc1e Bugfix. Two undefined vars (now an issue because of strict mode) 2014-07-19 12:31:02 +02:00
JC Brand
53f38dcc71 Two changes, see below:
* Call refreshWebkit hack when opening a chat room
* New event emitted when a chat room is opened.
2014-07-17 19:18:48 +02:00
JC Brand
3423f7bc74 Bugfix. fixes #180 2014-07-17 17:44:44 +02:00
JC Brand
66e45f91e9 Bugfix. First render before fetching msgs. Fixes #191 2014-07-17 17:29:05 +02:00
JC Brand
9846f89a2c If no resource exists, add one which mentions converse.js
updates #123
2014-07-15 07:57:28 +02:00
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