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
7861ed7b
Commit
7861ed7b
authored
Aug 03, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1403: Rename `show_chatstate_notifications`
to `show_chat_state_notifications`
parent
8a9a0a4b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
CHANGES.md
CHANGES.md
+2
-1
docs/source/configuration.rst
docs/source/configuration.rst
+2
-2
spec/notification.js
spec/notification.js
+2
-2
src/converse-notification.js
src/converse-notification.js
+2
-2
No files found.
CHANGES.md
View file @
7861ed7b
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
-
Groupchat default configuration now supports
`list-multi`
fields
-
Groupchat default configuration now supports
`list-multi`
fields
-
Bugfix: Don't set
`muc_domain`
for roomspanel if
`locked_muc_domain`
is
`true`
.
-
Bugfix: Don't set
`muc_domain`
for roomspanel if
`locked_muc_domain`
is
`true`
.
-
Bugfix: Modal auto-closes when you open it for a second time.
-
Bugfix: Modal auto-closes when you open it for a second time.
-
Bugfix:
`Cannot read property 'parentElement' of null`
in shadow DOM
-
Take roster nickname into consideration when rendering messages and chat headings.
-
Take roster nickname into consideration when rendering messages and chat headings.
-
Hide the textarea when a user is muted in a groupchat.
-
Hide the textarea when a user is muted in a groupchat.
-
Don't restore a BOSH session without knowing the JID
-
Don't restore a BOSH session without knowing the JID
...
@@ -58,7 +59,6 @@
...
@@ -58,7 +59,6 @@
-
#1579: Trim spaces at the beginning and end of a JID (when adding contact)
-
#1579: Trim spaces at the beginning and end of a JID (when adding contact)
-
#1585: Upload files by pasting from clipboard
-
#1585: Upload files by pasting from clipboard
-
#1586: Not possible to kick someone with a space in their nickname
-
#1586: Not possible to kick someone with a space in their nickname
-
Bugfix: "Cannot read property 'parentElement' of null" in shadow dom
### Breaking changes
### Breaking changes
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
- Removed events `
statusChanged
` and `
statusMessageChanged
`. Instead, you can
- Removed events `
statusChanged
` and `
statusMessageChanged
`. Instead, you can
listen on the `
change:status
` or `
change:status
\_
message
` events on
listen on the `
change:status
` or `
change:status
\_
message
` events on
`
_converse.xmppstatus
`.
`
_converse.xmppstatus
`.
- #1403: Rename show_chatstate_notifications to show_chat_state_notifications
### API changes
### API changes
...
...
docs/source/configuration.rst
View file @
7861ed7b
...
@@ -1334,8 +1334,8 @@ If set to ``true``, Converse will show any roster groups you might have configur
...
@@ -1334,8 +1334,8 @@ If set to ``true``, Converse will show any roster groups you might have configur
Converse can only show users and groups that were previously configured
Converse can only show users and groups that were previously configured
elsewhere.
elsewhere.
show_chatstate_notifications
show_chat
_
state_notifications
----------------------------
----------------------------
-
* Default: ``false``
* Default: ``false``
...
...
spec/notification.js
View file @
7861ed7b
...
@@ -139,9 +139,9 @@
...
@@ -139,9 +139,9 @@
done
();
done
();
}));
}));
it
(
"
is shown when a user changes their chat state (if show_chatstate_notifications is true)
"
,
mock
.
initConverse
((
done
,
_converse
)
=>
{
it
(
"
is shown when a user changes their chat state (if show_chat
_
state_notifications is true)
"
,
mock
.
initConverse
((
done
,
_converse
)
=>
{
// TODO: not yet testing show_desktop_notifications setting
// TODO: not yet testing show_desktop_notifications setting
_converse
.
show_chatstate_notifications
=
true
;
_converse
.
show_chat
_
state_notifications
=
true
;
test_utils
.
createContacts
(
_converse
,
'
current
'
);
test_utils
.
createContacts
(
_converse
,
'
current
'
);
spyOn
(
_converse
,
'
areDesktopNotificationsEnabled
'
).
and
.
returnValue
(
true
);
spyOn
(
_converse
,
'
areDesktopNotificationsEnabled
'
).
and
.
returnValue
(
true
);
...
...
src/converse-notification.js
View file @
7861ed7b
...
@@ -29,7 +29,7 @@ converse.plugins.add('converse-notification', {
...
@@ -29,7 +29,7 @@ converse.plugins.add('converse-notification', {
_converse
.
api
.
settings
.
update
({
_converse
.
api
.
settings
.
update
({
notify_all_room_messages
:
false
,
notify_all_room_messages
:
false
,
show_desktop_notifications
:
true
,
show_desktop_notifications
:
true
,
show_chatstate_notifications
:
false
,
show_chat
_
state_notifications
:
false
,
chatstate_notification_blacklist
:
[],
chatstate_notification_blacklist
:
[],
// ^ a list of JIDs to ignore concerning chat state notifications
// ^ a list of JIDs to ignore concerning chat state notifications
play_sounds
:
true
,
play_sounds
:
true
,
...
@@ -248,7 +248,7 @@ converse.plugins.add('converse-notification', {
...
@@ -248,7 +248,7 @@ converse.plugins.add('converse-notification', {
* Will show an HTML5 notification to indicate that the chat
* Will show an HTML5 notification to indicate that the chat
* status has changed.
* status has changed.
*/
*/
if
(
_converse
.
areDesktopNotificationsEnabled
()
&&
_converse
.
show_chatstate_notifications
)
{
if
(
_converse
.
areDesktopNotificationsEnabled
()
&&
_converse
.
show_chat
_
state_notifications
)
{
_converse
.
showChatStateNotification
(
contact
);
_converse
.
showChatStateNotification
(
contact
);
}
}
};
};
...
...
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