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
3011461f
Commit
3011461f
authored
Dec 02, 2015
by
andreabenini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update converse.js
parent
d715b3d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
converse.js
converse.js
+13
-8
No files found.
converse.js
View file @
3011461f
...
@@ -304,6 +304,7 @@
...
@@ -304,6 +304,7 @@
auto_login
:
false
,
// Currently only used in connection with anonymous login
auto_login
:
false
,
// Currently only used in connection with anonymous login
auto_reconnect
:
false
,
auto_reconnect
:
false
,
auto_subscribe
:
false
,
auto_subscribe
:
false
,
auto_join_on_invite
:
false
,
// Auto-join chatroom on invite
bosh_service_url
:
undefined
,
// The BOSH connection manager URL.
bosh_service_url
:
undefined
,
// The BOSH connection manager URL.
cache_otr_key
:
false
,
cache_otr_key
:
false
,
csi_waiting_time
:
0
,
// Support for XEP-0352. Seconds before client is considered idle and CSI is sent out.
csi_waiting_time
:
0
,
// Support for XEP-0352. Seconds before client is considered idle and CSI is sent out.
...
@@ -3633,15 +3634,19 @@
...
@@ -3633,15 +3634,19 @@
contact
=
converse
.
roster
.
get
(
from
),
contact
=
converse
.
roster
.
get
(
from
),
result
;
result
;
if
(
!
reason
)
{
if
(
converse
.
auto_join_on_invite
)
{
result
=
confirm
(
result
=
true
;
__
(
___
(
"
%1$s has invited you to join a chat room: %2$s
"
),
contact
.
get
(
'
fullname
'
),
room_jid
)
);
}
else
{
}
else
{
result
=
confirm
(
contact
=
contact
?
contact
.
get
(
'
fullname
'
):
Strophe
.
getNodeFromJid
(
from
);
// Invite request might come from someone not your roster list
__
(
___
(
'
%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"
'
),
if
(
!
reason
)
{
contact
.
get
(
'
fullname
'
),
room_jid
,
reason
)
result
=
confirm
(
);
__
(
___
(
"
%1$s has invited you to join a chat room: %2$s
"
),
contact
,
room_jid
)
);
}
else
{
result
=
confirm
(
__
(
___
(
'
%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"
'
),
contact
,
room_jid
,
reason
)
);
}
}
}
if
(
result
===
true
)
{
if
(
result
===
true
)
{
var
chatroom
=
converse
.
chatboxviews
.
showChat
({
var
chatroom
=
converse
.
chatboxviews
.
showChat
({
...
...
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