Commit Graph

1052 Commits

Author SHA1 Message Date
JC Brand
3ebe41384d emoji: Remember scroll position when rerendering the emoji picker 2017-07-16 12:29:09 +02:00
JC Brand
9a5f2fce61 emoji: Add a skin-tone picker to the emoji toolbar 2017-07-16 12:29:09 +02:00
JC Brand
22113a8ccb Expand test for rendering of images (and fix accordingly) 2017-07-16 12:29:08 +02:00
JC Brand
12510a9689 emoji: Fix rendering of emojione images 2017-07-16 12:29:05 +02:00
JC Brand
972c31be1d emoji: Allow the option of using emojione (now that we sanitize) 2017-07-16 12:29:02 +02:00
JC Brand
284e884766 Add js-xss and use it to sanitize message HTML 2017-07-15 19:15:48 +02:00
JC Brand
b85b29bb20 vcard: Bugfix. 'FN' may not be defined. 2017-07-15 17:26:59 +02:00
JC Brand
e6492e286d Don't specify method 2017-07-15 16:00:36 +02:00
JC Brand
0958915021 Refactor slightly to improve readability 2017-07-15 16:00:18 +02:00
JC Brand
f69e39dc8b Reuse code for submitting a message 2017-07-15 15:58:11 +02:00
JC Brand
cf1e8f2921 Fix failing test for emoji picker 2017-07-15 15:16:38 +02:00
JC Brand
4ea50de927 Use emoji instead of emoticon 2017-07-15 15:14:47 +02:00
JC Brand
a65b319d57 Improve styling for emoji-picker in the converse theme 2017-07-15 11:51:15 +02:00
JC Brand
b2a118ca9e Refactor slide methods in utils and use them for toolbar menus 2017-07-15 11:03:22 +02:00
JC Brand
ce2548c838 Remove the visible_toolbar_buttons.emoticons config option
in favor of `visible_toolbar_buttons.emoji`.
2017-07-15 08:17:41 +02:00
JC Brand
3fabe88970 Updated package-lock. Fix tests. 2017-07-15 07:58:57 +02:00
JC Brand
67578c9747 Merge branch 'master' into emoji 2017-07-15 07:16:37 +02:00
JC Brand
bd38f0d634 Update the website to not use jquery.easing
It will now also no longer be included in the full bundle.
2017-07-14 23:01:09 +02:00
JC Brand
914f739dbc Add slideUp and slideDown methods
And use them in the roomslist plugin instead of the jQuery methods.
ALso removed the jQuery dependency in roomslist.
2017-07-14 10:08:42 +02:00
JC Brand
76cc9642e0 roomslist: replace jQuery methods with native 2017-07-13 23:55:40 +02:00
JC Brand
2fe77b8a5c Don't escape room name.
It's being rendered as a string literal.
2017-07-13 23:55:16 +02:00
JC Brand
dc7249f07d roomslist: Room name wasn't being shown in confirm dialog 2017-07-13 23:54:06 +02:00
JC Brand
27760a7d51 vcard: remove jQuery as dependency 2017-07-13 23:27:24 +02:00
JC Brand
1487e63988 Add build scripts for esnext version 2017-07-13 12:25:03 +02:00
JC Brand
019008c5af Merge branch '3.1.x' 2017-07-12 23:33:35 +02:00
JC Brand
7721275962 New release v3.1.1 2017-07-12 22:51:56 +02:00
JC Brand
647395a504 Use a patched version of awesomplete...
which doesn't render suggestions as HTML.

See https://github.com/LeaVerou/awesomplete/pull/17082
2017-07-12 22:46:24 +02:00
JC Brand
397927b189 Fix broken tests and update changelog 2017-07-12 09:58:14 +02:00
JC Brand
6af029048d Replace $.Deferred with ES2015 promises 2017-07-11 17:21:13 +02:00
JC Brand
e75b6ad694 Recreate promises whenever initialize is called. 2017-07-11 17:05:01 +02:00
JC Brand
6ef0536e31 Some work on using es6 promises 2017-07-10 21:14:48 +02:00
JC Brand
9a9eae3fcf Use esnext to auto-generate es2015 syntax 2017-07-10 17:46:22 +02:00
JC Brand
9333415640 Builds are now created from babel transpiled code
Except for the esnext builds, which use the original code.

Fixes #866
2017-07-10 16:25:21 +02:00
JC Brand
40e7ee1ae6 Initial stab at using ES2015
Mostly replaced ``var`` with ``let`` and ``const``.
Also added a few arrow functions.
2017-07-10 12:49:20 +02:00
JC Brand
e1b745b71f Initial steps to adding babel. 2017-07-10 12:44:29 +02:00
JC Brand
2d89589b54 bookmarks: clear the fetched_flag upon logout 2017-07-10 10:43:37 +02:00
JC Brand
8c1c665e2e core: Some more logging improvements. 2017-07-10 10:43:13 +02:00
JC Brand
c422237668 New release: 3.1.0 2017-07-05 10:07:28 +00:00
JC Brand
6e67bdfdb5 roomslist: Less confusing code by using promises 2017-07-05 11:40:54 +02:00
JC Brand
5ab1693136 logging: Add deprecation warning for updateSettings
and also use the Strophe.LogLevel levels for logging in general.
2017-07-05 11:33:55 +02:00
JC Brand
f81a94baf1 Move updateSettings to the private API.
Also add an API method for exposing new promises.

Update the plugin and API documentation, specifically concerning the above
changes.
2017-07-05 11:03:13 +02:00
JC Brand
857c5ccdb3 Reset bookmarks when logging out 2017-07-03 09:57:11 +02:00
JC Brand
ea4c490283 bookmarks: bugfix, deferred might be null 2017-06-27 13:02:40 +02:00
JC Brand
c11a1b40e8 muc: bugfix, presence referring to current user doesn't have a jid attr 2017-06-27 12:56:50 +02:00
JC Brand
ea04b11724 Try to fix what appears to be a timing bug 2017-06-27 09:29:46 +02:00
JC Brand
5d99076f62 Filter out some emojis which don't have native support yet 2017-06-24 12:36:02 +02:00
JC Brand
b4ff38dba7 Pad the emoji categories 2017-06-24 12:27:59 +02:00
JC Brand
4e467044d3 Some usability fixes around the toolbar and emojis 2017-06-24 11:34:01 +02:00
JC Brand
70f56b31f4 Merge branch 'master' into emoji 2017-06-24 11:04:19 +02:00
JC Brand
095e7add86 mam: Upgrade MAM support to version 2 2017-06-23 22:58:47 +02:00
JC Brand
66fd9a9f28 muc: Fix: after reconnecting, already open room didn't receive new messages 2017-06-23 20:19:38 +02:00
JC Brand
36e078c9f6 utils: Rename saveWithFallback to safeSave 2017-06-23 20:17:58 +02:00
JC Brand
86c20ce2a7 muc: When exiting, don't wait for confirmation before cleaning up
During logout we don't have enough time.
2017-06-23 18:22:19 +02:00
JC Brand
53643ab541 core: Close chats when logging out, before disconnecting
Otherwise rooms cannot be exited properly.

Also, no need to call `_tearDown` in `logOut` when `connection.disconnect` gets
called since it will get called afterwards in the handler.
2017-06-23 18:21:00 +02:00
JC Brand
3e8e770517 chatview: use utils.isPersistableModel 2017-06-23 18:19:20 +02:00
JC Brand
3310df88c0 Regenerate build files. Some small fixes to inverse 2017-06-21 22:26:00 +02:00
JC Brand
9af2dc20e0 Remove xmpp.net provider info. Service has been discontinued 2017-06-19 15:42:41 +02:00
JC Brand
02e5921415 Fix problem of stuck/hanging tests on TravisCI 2017-06-19 15:05:22 +02:00
JC Brand
52e394a63e Add inverse byline. 2017-06-18 00:23:34 +02:00
JC Brand
f988cb03c0 Various inverse-related CSS improvements.
Most notably, make toolbar same color as chat head and make private chats green
instead of orange.
2017-06-18 00:07:41 +02:00
JC Brand
10ae9a5ea4 Remove the ability to use emojione for rendering emoji
Creates an XSS opening.
2017-06-17 01:01:52 +02:00
JC Brand
ca53a8d8ef Add support for Emojis 2017-06-17 01:01:52 +02:00
JC Brand
fb69106352 Fixes #887 Enclose embedded images in URLs 2017-06-16 15:11:19 +02:00
JC Brand
796edb03fe Updates #890. Make sure to clear session data
Otherwise carbons aren't re-enabled after reconnection.
2017-06-16 14:55:40 +02:00
JC Brand
f09d01c930 roster: Move roster push and rosterX handlers to core.
There's nothing about them that's view specific.
2017-06-16 11:42:46 +02:00
JC Brand
be28e04c57 roster: render unread messages in tab upon reload
Also including css fixes around the unread messages indicator.
2017-06-15 18:38:38 +02:00
JC Brand
336dc7408f Remove the pulse entirely.
Couldn't get it to look/work satisfactorily
2017-06-15 18:29:08 +02:00
JC Brand
f07cb97db8 Show pulse around unread messages indicator 2017-06-15 18:27:48 +02:00
JC Brand
cf68ea70ac css: fix unread messages indicator for private chats 2017-06-15 18:05:51 +02:00
JC Brand
e48015df66 Fixes #575 2017-06-15 17:51:56 +02:00
JC Brand
d527f693c2 Updates #890 Destroy and recreate session upon reconnection
This ensures that carbons will be activated again.
2017-06-15 17:30:26 +02:00
JC Brand
9ee5550cde inverse: bugfix, when reloading, hidden auto-joined room was displayed 2017-06-15 16:22:49 +02:00
JC Brand
7e62546d6f inverse: move brand heading into template 2017-06-15 15:16:17 +02:00
JC Brand
3181956b61 controlbox: use `sticky_controlbox` setting to reduce inverse code 2017-06-15 15:01:34 +02:00
JC Brand
e29c2f8197 muc: render tab upon chatroom add
So that it shows unread messages upon page reload.
2017-06-15 12:32:33 +02:00
JC Brand
cc0f613118 rosterview: Include fullname (or JID) in tooltip for better UX 2017-06-15 11:27:05 +02:00
JC Brand
1f82b7dfe4 Create utils method isSameBareJID. Refs: #894 2017-06-14 22:31:44 +02:00
Antonio Zoccoli
ad06c2b9cc Converse ryzen 894 (#895)
* added change #894

* #894 - fix jid comparison in setAffiliationAndRole
2017-06-14 22:20:46 +02:00
JC Brand
6c262f7213 Various small changes to reduce (non-critical) errors during testing 2017-06-14 20:14:45 +02:00
JC Brand
b0c20d5473 We're now able to make inverse.js builds 2017-06-14 19:47:06 +02:00
JC Brand
076af0970f Make spinner into a template 2017-06-14 19:43:02 +02:00
JC Brand
e1dace59ae Bugfix. Don't scroll down on archived messages
when already scrolled up.
2017-06-14 19:43:02 +02:00
JC Brand
0d22f5c33c Bugfix. Make sure to only append after a single message. 2017-06-14 19:43:02 +02:00
JC Brand
c9ecd3cd4d Only initiate OTR for new messages. 2017-06-14 19:43:02 +02:00
JC Brand
eef002f2b7 Build fix 2017-06-14 17:40:11 +02:00
JC Brand
ebc6d1cc62 Use lodashLoader's root setting 2017-06-14 17:40:10 +02:00
JC Brand
7c831e1166 Various theming tweaks and improvements 2017-06-14 15:41:47 +02:00
JC Brand
41bb8b5da7 Make `converse-roomslist` a core (i.e. by default whitelisted) plugin 2017-06-14 10:49:21 +02:00
JC Brand
651a5de315 inverse: Set more defaults in the plugin itself 2017-06-13 21:40:06 +02:00
JC Brand
b66ff721cd Merge inVerse into this repo 2017-06-13 21:10:32 +02:00
JC Brand
78c5139486 singleton: Add soft dependency on rosterview 2017-06-13 19:17:45 +02:00
JC Brand
422aaef863 register: create renderRegistrationPanel method 2017-06-13 19:11:32 +02:00
JC Brand
43408a6128 dragresize: render handles in the plugin
instead of having them already in the templates.
2017-06-13 18:53:41 +02:00
JC Brand
19d51f559d Make the avatar's dimensions settable 2017-06-13 18:53:20 +02:00
JC Brand
2d4159802e Bugfix. Don't override defaults for ChatBox 2017-06-13 18:22:19 +02:00
JC Brand
8191d5e83a muc: Rename `createChatRoom to openChatRoom`
It doesn't always create a new room.
2017-06-13 18:22:19 +02:00
JC Brand
1a95472ebe singleton: Ensure obscured chats gets actively hidden.
So that when a room is closed, a previously obscured chat doesn't become
visible again. Allowing this would force us to know which chat is visible, so
that we can falsify it's `hidden` attribute.
2017-06-10 20:39:09 +02:00
JC Brand
d1bafdb38a Re-render only the tab when num_unread changes. 2017-06-09 23:45:54 +02:00
JC Brand
f9fb13a71d muc: Make defaults a function
otherwise also the prototype's defaults gets overwritten.
2017-06-07 17:47:50 +02:00
JC Brand
b5ecc1fc6a Expose the fp version of lodash via the API 2017-06-07 09:15:22 +02:00
JC Brand
a128a70d41 Discriminate between which unread messages to indicate per tab 2017-06-07 00:55:57 +02:00
JC Brand
bbecee11d5 Add the functional programming version of lodash. 2017-06-07 00:43:09 +02:00
JC Brand
fcbeff4c72 Better check to know whether we can save the model 2017-06-06 22:12:54 +02:00
JC Brand
f897fbb7c0 Show number of unread mesages on the "Contacts" tab 2017-06-05 21:42:25 +02:00
JC Brand
5949ca9e36 Show number of unread messages on the "Rooms" tab 2017-06-05 14:52:24 +02:00
JC Brand
86dc3800aa Render nickname form when entering a room via invitation 2017-05-24 17:18:54 +02:00
JC Brand
c83026e5a8 muc: Differentiate between generally unread messages and unread mentions 2017-05-24 08:40:09 +02:00
JC Brand
8fa06e7d52 Markup and CSS for showing unread messages for a room 2017-05-23 21:50:48 +02:00
JC Brand
a4284e48f7 Use proper message handler. Fix typo 2017-05-23 18:49:04 +02:00
JC Brand
7df2d36e42 We now have a separate Backbone.Model for chat rooms
Also... `num_unread` is now updated for groupchat messages in which the user is
mentioned.
2017-05-23 18:40:55 +02:00
JC Brand
5e783e70e4 Lay the groundwork for being able to have separate ChatRoom models 2017-05-23 18:16:47 +02:00
JC Brand
bab80a3234 No need to set num_unread, it has a default value. 2017-05-23 18:15:28 +02:00
JC Brand
6b2ca629cc roomslist: expand tests 2017-05-22 13:40:07 +02:00
JC Brand
501c9f5e97 muc: Extract code into separate method renderRoomsPanel 2017-05-16 11:55:59 +02:00
JC Brand
7c9475e9fc controlbox: Only render the contacts panel when connected
Otherwise it gets rendered multiple times (at least during testing).
2017-05-16 11:54:20 +02:00
JC Brand
8fe7fd2ec2 minimize: Use Backbone.Model's default attribute 2017-05-16 11:19:15 +02:00
JC Brand
4f94a1f193 Refactor code that increments unread messages counter
Removed the "fetching_messages" hack.
2017-05-16 11:18:58 +02:00
JC Brand
023a68458c Initial work on showing unread messages indicator for chat rooms 2017-05-15 19:08:08 +02:00
JC Brand
443b67012d Right-float info icon 2017-05-15 18:43:12 +02:00
JC Brand
c5383ac22f chatview: trigger 'add' event when fetching messages
Otherwise they don't appear when reloading the page.

I'm not completely happy with the resulting workaround to avoid that messages
restored from sessionStorage increment the unread messages counter, but it'll
have to do for now.
2017-05-15 18:37:54 +02:00
JC Brand
26cd567cca bookmarks: only emit once the view has been created. 2017-05-15 18:04:28 +02:00
JC Brand
e49fbc457d bookmarks: Don't duplicate bookmarks in list. 2017-05-15 18:04:28 +02:00
JC Brand
3343cb6991 Some small css fixes. Show correct icon for clearing messages 2017-05-15 17:38:37 +02:00
JC Brand
4994615824 core: Only throw error when trying keepalive without JID for prebind 2017-05-15 16:47:10 +02:00
JC Brand
ea207ad6be Don't override credentials_url password with connection password
Causes login failure when one-time tokens are used.
2017-05-11 14:46:24 +02:00
JC Brand
7eecd6b1dd Move method closer to other relevant ones 2017-05-11 10:42:10 +02:00
JC Brand
0c61a5d791 core: Refactor common code into restoreBOSHSession 2017-05-11 10:42:10 +02:00
JC Brand
d50992b130 bookmarks: Fix remaining broken tests. 2017-05-09 09:45:12 +02:00
JC Brand
1ef99b3ecc bookmarks: Handle chat box being passed into renderBookmarkListElement 2017-05-08 21:28:56 +02:00
JC Brand
3835ab7af6 bookmarks: Don't autojoin rooms prematurely
by first waiting until chatboxes have been fetched as well.
2017-05-08 21:28:56 +02:00
JC Brand
d81d62f98d muc: check for browserStorage attr instead of whether connected 2017-05-08 21:28:56 +02:00
JC Brand
70e4f28548 Initial work on showing open rooms in the "Rooms" panel 2017-05-08 21:28:56 +02:00
JC Brand
d8963a8a8c bookmarks: New setting hide_open_bookmarks 2017-05-08 21:28:56 +02:00
JC Brand
0bd0798e34 Use the Backbone defaults functionality 2017-05-08 21:28:56 +02:00
JC Brand
09bf04bf03 converse-bookmarks: Bugfix + make bookmark.html more generic
- Bugfix: Entire list was removed when last bookmark was removed.
- Make the template more generic so that it can be used for showing open chat
  rooms
2017-05-08 21:28:56 +02:00
JC Brand
47ca3e64b2 Emit new event roomsPanelRendered 2017-05-08 21:28:56 +02:00
JC Brand
b32a8c5391 Update and simplify HTML/CSS for choosing status
Should also fix some of the issues mentioned in #847
2017-05-08 21:25:22 +02:00
JC Brand
3ec90096b9 Updates #864: Bugfix. Both select elements were being shown 2017-05-07 11:24:46 +02:00
JC Brand
738d227297 Solve the intermittent issue of _ not being defined in templates 2017-05-05 11:48:10 +02:00
Novokreshchenov Konstantin
7c057910a8 Inconsistent unread messages count updating #873 (#874)
* Consistent unread messages count updating on ChatBoxView, Minimized ChatBoxView, RosterView and page's title

* Add tests for checking unread messages count updates in different GUI parts

* Update docs/CHANGES.md

* document windowStateChanged event in events.rst
2017-05-03 09:06:28 +02:00
Novokreshchenov Konstantin
4b46ec3f8c #591 Unread message counter is reset when the chatbox is closed (#867)
* chatview: disable handling onMessageAdded when fetching messages during initialization

* update CHANGES.md
2017-05-01 13:05:58 +02:00
Mathias Ertl
913eeec351 Csp compat 2 (#864)
* remove inline style in roster template

* remove inline style from contacts panel

* remove inline-css from roster_filters

* remove inline style in trimmed chats

* remove last inline style from minimized chats

* update converse.css

* update changelog
2017-04-30 10:22:54 +02:00
JC Brand
227eb9b81c Fix _ is undefined error 2017-04-28 19:57:36 +02:00
JC Brand
30febd17d4 Throw error if more than one chatroom is given 2017-04-28 19:52:42 +02:00
JC Brand
4c23925684 Fixes #861: Properly insert chatroom into DOM 2017-04-28 19:52:13 +02:00
Novokreshchenov Konstantin
dfd86d6c35 #567 Unreaded message count reset on page load (#856)
* save unread message count (num_unread) to server

* update CHANGES.md
2017-04-24 22:34:08 +02:00
JC Brand
b07e6291ea Ensure that chats are opened when contacts are clicked. 2017-04-24 15:57:23 +02:00
JC Brand
15f962ad6d Add converse-singleton to the mobile build.
This will make the unread messages feature work.
Update so that new chats are opened in the background.
2017-04-24 15:57:23 +02:00
JC Brand
c81599931c Fix failing tests based on recent unread message changes 2017-04-24 15:57:22 +02:00
JC Brand
d825a15baa Clear when maximizing a chat box 2017-04-24 15:57:22 +02:00