Make controlbox appear in a smoother fashion in webkit

when clicking the controlbox toggle

Make controlbox appear in a smoother fashion in webkit
when clicking the controlbox toggle
68054861 · JC Brand · d0af9742 · 68054861
Commit 68054861 authored Jan 23, 2014 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 18 deletions

converse.js converse.js +15 -18

No files found.
--- a/converse.js
+++ b/converse.js
@@ -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();
+                converse.controlboxtoggle.hide($.proxy(function () {
-                if (this.$el.is(':visible') && this.$el.css('opacity') == "1") {
+                    if (converse.animate) {
-                    return;
+                        this.$el.css({'opacity': 0, 'display': 'inline'}).animate({opacity: '1'}, 200, null, function () {
-                }
+                            converse.refresh();
-                if (converse.animate) {
+                        });
-                    this.$el.css({'opacity': 0, 'display': 'inline'}).animate({opacity: '1'}, 200, null, function () {
+                    } else {
-                        converse.refresh();
+                        this.$el.css({'opacity': 1, 'display': 'inline'}); converse.refresh();
-                    });
+                    }
-                } else {
+                    if (converse.connection) {
-                    this.$el.css({'opacity': 1, 'display': 'inline'}); converse.refresh();
+                        // Without a connection, we haven't yet initialized
-                }
+                        // localstorage
-                if (converse.connection) {
+                        this.model.save();
-                    // Without a connection, we haven't yet initialized
+                    }
-                    // localstorage
+                    converse.emit('onControlBoxOpened', this);
-                    this.model.save();
+                }, this));
-                }
-                converse.emit('onControlBoxOpened', this);
                return this;
            },