Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
8ba8a4bc
Commit
8ba8a4bc
authored
Nov 04, 2018
by
Christoph Scholz
Committed by
JC Brand
Nov 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new value 'all' for 'show_desktop_notifications'
parent
1bdb1716
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGES.md
CHANGES.md
+1
-0
docs/source/configuration.rst
docs/source/configuration.rst
+4
-1
src/converse-notification.js
src/converse-notification.js
+1
-1
No files found.
CHANGES.md
View file @
8ba8a4bc
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
-
#1268 Switch from SASS variables to CSS custom properties
-
#1268 Switch from SASS variables to CSS custom properties
-
#1278 Replace the default avatar with a SVG version
-
#1278 Replace the default avatar with a SVG version
-
#1306 added option
`notification_delay`
-
#1306 added option
`notification_delay`
-
#1305 added value 'all' for 'show_desktop_notifications' to notifiy even if converse.js is open
## 4.0.4 (2018-10-29)
## 4.0.4 (2018-10-29)
...
...
docs/source/configuration.rst
View file @
8ba8a4bc
...
@@ -1247,12 +1247,15 @@ show_desktop_notifications
...
@@ -1247,12 +1247,15 @@ show_desktop_notifications
Should HTML5 desktop notifications be shown?
Should HTML5 desktop notifications be shown?
Notification
will be shown in the following cases:
If set to ``true``, notifications
will be shown in the following cases:
* the browser is not visible nor focused and a private message is received.
* the browser is not visible nor focused and a private message is received.
* the browser is not visible nor focused and a groupchat message is received which mentions you.
* the browser is not visible nor focused and a groupchat message is received which mentions you.
* `auto_subscribe` is set to `false` and a new contact request is received.
* `auto_subscribe` is set to `false` and a new contact request is received.
If set to ``all``, notifications will be shown even if the above conditions are
not fulfilled.
Requires the `src/converse-notification.js` plugin.
Requires the `src/converse-notification.js` plugin.
use_system_emojis
use_system_emojis
...
...
src/converse-notification.js
View file @
8ba8a4bc
...
@@ -100,7 +100,7 @@ converse.plugins.add('converse-notification', {
...
@@ -100,7 +100,7 @@ converse.plugins.add('converse-notification', {
message
.
getAttribute
(
'
from
'
))
===
_converse
.
bare_jid
;
message
.
getAttribute
(
'
from
'
))
===
_converse
.
bare_jid
;
return
!
_converse
.
isOnlyChatStateNotification
(
message
)
&&
return
!
_converse
.
isOnlyChatStateNotification
(
message
)
&&
!
is_me
&&
!
is_me
&&
_converse
.
isMessageToHiddenChat
(
message
);
(
_converse
.
show_desktop_notifications
===
'
all
'
||
_converse
.
isMessageToHiddenChat
(
message
)
);
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment