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
0002c0bd
Commit
0002c0bd
authored
May 31, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`converse._tearDown` shouldn't be called from converse-controlbox.js
parent
7398d414
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
src/converse-controlbox.js
src/converse-controlbox.js
+0
-1
src/converse-core.js
src/converse-core.js
+1
-0
No files found.
src/converse-controlbox.js
View file @
0002c0bd
...
@@ -51,7 +51,6 @@
...
@@ -51,7 +51,6 @@
onDisconnected
:
function
()
{
onDisconnected
:
function
()
{
var
result
=
this
.
_super
.
onDisconnected
.
apply
(
this
,
arguments
);
var
result
=
this
.
_super
.
onDisconnected
.
apply
(
this
,
arguments
);
if
(
result
===
'
disconnected
'
)
{
if
(
result
===
'
disconnected
'
)
{
converse
.
_tearDown
();
var
view
=
converse
.
chatboxviews
.
get
(
'
controlbox
'
);
var
view
=
converse
.
chatboxviews
.
get
(
'
controlbox
'
);
view
.
model
.
set
({
connected
:
false
});
view
.
model
.
set
({
connected
:
false
});
view
.
$
(
'
#controlbox-tabs
'
).
empty
();
view
.
$
(
'
#controlbox-tabs
'
).
empty
();
...
...
src/converse-core.js
View file @
0002c0bd
...
@@ -449,6 +449,7 @@
...
@@ -449,6 +449,7 @@
converse
.
reconnect
(
condition
);
converse
.
reconnect
(
condition
);
return
'
reconnecting
'
;
return
'
reconnecting
'
;
}
else
{
}
else
{
converse
.
_tearDown
();
converse
.
emit
(
'
disconnected
'
);
converse
.
emit
(
'
disconnected
'
);
return
'
disconnected
'
;
return
'
disconnected
'
;
}
}
...
...
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