JC Brand 7 лет назад
Родитель
Сommit
34b592be09
2 измененных файлов с 5 добавлено и 2 удалено
  1. 1 0
      CHANGES.md
  2. 4 2
      src/converse-chatview.js

+ 1 - 0
CHANGES.md

@@ -7,6 +7,7 @@
 - Various fixes for IE11.
 - Could not register on Ejabberd 18. `"Missing attribute 'id' in tag qualified by namespace 'jabber:client'"`
 - #878 Ending slash in link not recognized
+- #921 FATAL error when `visible_toolbar_buttons.emoji = false`
 - #959 Add padding for the iPhone X (to the mobile CSS).
 - #993 `moment.format` is not a function error when sending a message.
 - #994 TypeError when using the `user.login` API.

+ 4 - 2
src/converse-chatview.js

@@ -956,8 +956,10 @@
 
                 renderEmojiPicker () {
                     var toggle = this.el.querySelector('.toggle-smiley');
-                    toggle.innerHTML = '';
-                    toggle.appendChild(this.emoji_picker_view.render().el);
+                    if (!_.isNull(toggle)) {
+                        toggle.innerHTML = '';
+                        toggle.appendChild(this.emoji_picker_view.render().el);
+                    }
                 },
 
                 focus () {