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
8feeb733
Commit
8feeb733
authored
Feb 23, 2014
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix webkit bug that prevents boxes from reordering when one is closed
parent
0414fa02
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
converse.js
converse.js
+15
-15
No files found.
converse.js
View file @
8feeb733
...
...
@@ -103,12 +103,16 @@
}
};
converse
.
refresh
=
function
()
{
// TODO: only do this for webkit browsers
converse
.
refreshWebkit
=
function
()
{
/* This works around a webkit bug. Refresh the browser's viewport,
* otherwise chatboxes are not moved along when one is closed.
*/
if
(
$
.
browser
.
webkit
)
{
var
conversejs
=
document
.
getElementById
(
'
conversejs
'
);
conversejs
.
style
.
display
=
'
none
'
;
conversejs
.
offsetHeight
;
// no need to store this anywhere, the reference is enough
conversejs
.
style
.
display
=
'
block
'
;
}
};
converse
.
initialize
=
function
(
settings
,
callback
)
{
...
...
@@ -859,6 +863,7 @@
this
.
model
.
on
(
'
showReceivedOTRMessage
'
,
function
(
text
)
{
this
.
showOTRMessage
(
text
,
'
them
'
);
},
this
);
this
.
updateVCard
();
this
.
$el
.
appendTo
(
converse
.
chatboxesview
.
$el
);
this
.
render
().
show
().
model
.
messages
.
fetch
({
add
:
true
});
...
...
@@ -1390,12 +1395,9 @@
},
hide
:
function
()
{
var
speed
=
converse
.
animate
?
'
fast
'
:
null
;
if
(
this
.
$el
.
is
(
'
:visible
'
)
&&
this
.
$el
.
css
(
'
opacity
'
)
==
"
1
"
)
{
if
(
converse
.
animate
)
{
this
.
$el
.
hide
(
'
fast
'
);
}
else
{
this
.
$el
.
hide
();
}
this
.
$el
.
hide
(
speed
,
converse
.
refreshWebkit
);
converse
.
emit
(
'
onChatBoxClosed
'
,
this
);
}
},
...
...
@@ -1788,11 +1790,9 @@
show
:
function
()
{
converse
.
controlboxtoggle
.
hide
(
$
.
proxy
(
function
()
{
if
(
converse
.
animate
)
{
this
.
$el
.
css
({
'
opacity
'
:
0
,
'
display
'
:
'
inline
'
}).
animate
({
opacity
:
'
1
'
},
200
,
null
,
function
()
{
converse
.
refresh
();
});
this
.
$el
.
css
({
'
opacity
'
:
0
,
'
display
'
:
'
inline
'
}).
animate
({
opacity
:
'
1
'
},
200
,
null
,
converse
.
refreshWebkit
);
}
else
{
this
.
$el
.
css
({
'
opacity
'
:
1
,
'
display
'
:
'
inline
'
});
converse
.
refresh
();
this
.
$el
.
css
({
'
opacity
'
:
1
,
'
display
'
:
'
inline
'
});
converse
.
refresh
Webkit
();
}
if
(
converse
.
connection
)
{
// Without a connection, we haven't yet initialized
...
...
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