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
7cd27a71
Commit
7cd27a71
authored
Mar 21, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable automatic reconnecting when ``prebind`` and ``prebind_url`` are
specified. fixes #330 updates #333
parent
8d818fd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
converse.js
converse.js
+10
-3
docs/CHANGES.rst
docs/CHANGES.rst
+2
-0
No files found.
converse.js
View file @
7cd27a71
...
...
@@ -431,7 +431,6 @@
this
.
reconnect
=
function
()
{
converse
.
giveFeedback
(
__
(
'
Reconnecting
'
),
'
error
'
);
converse
.
emit
(
'
reconnect
'
);
if
(
!
converse
.
prebind
)
{
this
.
connection
.
connect
(
this
.
connection
.
jid
,
...
...
@@ -443,6 +442,10 @@
this
.
connection
.
hold
,
this
.
connection
.
route
);
}
else
if
(
converse
.
prebind_url
)
{
this
.
clearSession
();
this
.
_tearDown
();
this
.
startNewBOSHSession
();
}
};
...
...
@@ -479,6 +482,7 @@
converse
.
giveFeedback
(
__
(
'
Authentication Failed
'
),
'
error
'
);
converse
.
connection
.
disconnect
(
__
(
'
Authentication Failed
'
));
}
else
if
(
status
===
Strophe
.
Status
.
DISCONNECTING
)
{
// FIXME: what about prebind?
if
(
!
converse
.
connection
.
connected
)
{
converse
.
renderLoginPanel
();
}
...
...
@@ -554,8 +558,8 @@
this
.
clearSession
=
function
()
{
this
.
roster
.
browserStorage
.
_clear
();
this
.
session
.
browserStorage
.
_clear
();
// XXX: this should perhaps go into the beforeunload handler
con
verse
.
chatboxes
.
get
(
'
controlbox
'
)
.
save
({
'
connected
'
:
false
});
var
controlbox
=
converse
.
chatboxes
.
get
(
'
controlbox
'
);
con
trolbox
.
save
({
'
connected
'
:
false
});
};
this
.
setSession
=
function
()
{
...
...
@@ -5439,6 +5443,9 @@
'
initialize
'
:
function
(
settings
,
callback
)
{
converse
.
initialize
(
settings
,
callback
);
},
'
disconnect
'
:
function
()
{
converse
.
connection
.
disconnect
();
},
'
account
'
:
{
'
logout
'
:
function
()
{
converse
.
logOut
();
...
...
docs/CHANGES.rst
View file @
7cd27a71
...
...
@@ -8,6 +8,8 @@ Changelog
* New configuration setting ``allow_contact_removal``. [jcbrand]
* Document that event handlers receive 'event' obj as first arg. [jcbrand]
* Add a test to check that notifications are played in chat rooms. [jcbrand]
* Enable automatic reconnection when ``prebind`` and ``prebind_url`` are
specified. [jcbrand]
* #339 Require the JID to be specified when using ``keepalive`` with
``prebind``. Also add a logout API method. [jcbrand]
...
...
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