Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Make controlbox appear in a smoother fashion in webkit

Browse Source 
when clicking the controlbox toggle
This commit is contained in:
JC Brand 2014-01-23 00:33:55 +02:00
parent d0af974206
commit 680548612c
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
converse.js
View File

@ -1631,7 +1631,6 @@
hide: function (callback) {
this.$el.hide('fast', function () {
converse.controlboxtoggle.show(function () {
converse.refresh();
if (typeof callback === "function") {
callback();
}
@ -1640,23 +1639,21 @@
},
show: function () {
converse.controlboxtoggle.hide();
if (this.$el.is(':visible') && this.$el.css('opacity') == "1") {
return;
}
if (converse.animate) {
this.$el.css({'opacity': 0, 'display': 'inline'}).animate({opacity: '1'}, 200, null, function () {
converse.refresh();
});
} else {
this.$el.css({'opacity': 1, 'display': 'inline'}); converse.refresh();
}
if (converse.connection) {
// Without a connection, we haven't yet initialized
// localstorage
this.model.save();
}
converse.emit('onControlBoxOpened', this);
converse.controlboxtoggle.hide($.proxy(function () {
if (converse.animate) {
this.$el.css({'opacity': 0, 'display': 'inline'}).animate({opacity: '1'}, 200, null, function () {
converse.refresh();
});
} else {
this.$el.css({'opacity': 1, 'display': 'inline'}); converse.refresh();
}
if (converse.connection) {
// Without a connection, we haven't yet initialized
// localstorage
this.model.save();
}
converse.emit('onControlBoxOpened', this);
}, this));
return this;
},