Przeglądaj źródła

controlbox: use ``sticky_controlbox`` setting to reduce inverse code

JC Brand 8 lat temu
rodzic
commit
3181956b61
2 zmienionych plików z 6 dodań i 14 usunięć
  1. 6 0
      src/converse-controlbox.js
  2. 0 14
      src/converse-inverse.js

+ 6 - 0
src/converse-controlbox.js

@@ -297,6 +297,9 @@
 
                 close: function (ev) {
                     if (ev && ev.preventDefault) { ev.preventDefault(); }
+                    if (_converse.sticky_controlbox) {
+                        return;
+                    }
                     if (_converse.connection.connected && !_converse.connection.disconnecting) {
                         this.model.save({'closed': true});
                     } else {
@@ -315,6 +318,9 @@
                 },
 
                 hide: function (callback) {
+                    if (_converse.sticky_controlbox) {
+                        return;
+                    }
                     this.$el.addClass('hidden');
                     utils.refreshWebkit();
                     _converse.emit('chatBoxClosed', this);

+ 0 - 14
src/converse-inverse.js

@@ -41,20 +41,6 @@
             },
 
             ControlBoxView: {
-                close: function (ev) {
-                    if (ev && ev.preventDefault) {
-                        ev.preventDefault();
-                    }
-                    // The controlbox cannot be closed.
-                },
-
-                hide: function (ev) {
-                    if (ev && ev.preventDefault) {
-                        ev.preventDefault();
-                    }
-                    // The controlbox cannot be hidden
-                },
-
                 renderContactsPanel: function () {
                     this.__super__.renderContactsPanel.apply(this, arguments);
                     this.el.classList.remove("fullscreen");