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
e28aba5a
Commit
e28aba5a
authored
Jul 28, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #645. When accepting a contact request...
the contact didn't appear under the pending contacts list.
parent
a1e24c95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
docs/CHANGES.md
docs/CHANGES.md
+2
-0
src/converse-rosterview.js
src/converse-rosterview.js
+9
-1
No files found.
docs/CHANGES.md
View file @
e28aba5a
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
use it. [jcbrand]
use it. [jcbrand]
-
Mention someone in your chat room message by clicking on their name in the occupants
-
Mention someone in your chat room message by clicking on their name in the occupants
list. [jcbrand]
list. [jcbrand]
-
#645 When accepting a contact request, the contact didn't appear in the
pending contacts group. [jcbrand]
## 1.0.4 (2016-07-26)
## 1.0.4 (2016-07-26)
...
...
src/converse-rosterview.js
View file @
e28aba5a
...
@@ -883,7 +883,15 @@
...
@@ -883,7 +883,15 @@
onContactRequestChange
:
function
(
contact
)
{
onContactRequestChange
:
function
(
contact
)
{
if
((
this
.
model
.
get
(
'
name
'
)
===
HEADER_REQUESTING_CONTACTS
)
&&
!
contact
.
get
(
'
requesting
'
))
{
if
((
this
.
model
.
get
(
'
name
'
)
===
HEADER_REQUESTING_CONTACTS
)
&&
!
contact
.
get
(
'
requesting
'
))
{
this
.
model
.
contacts
.
remove
(
contact
.
get
(
'
id
'
));
/* We suppress events, otherwise the remove event will
* also cause the contact's view to be removed from the
* "Pending Contacts" group.
*/
this
.
model
.
contacts
.
remove
(
contact
.
get
(
'
id
'
),
{
'
silent
'
:
true
});
// Since we suppress events, we make sure the view and
// contact are removed from this group.
this
.
get
(
contact
.
get
(
'
id
'
)).
remove
();
this
.
onRemove
(
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