Commit 75c11a20 authored by JC Brand's avatar JC Brand

emoji-views: Specify dependency on muc-views

Otherwise plugins might be loaded out of order and then event handlers
in this module don't get registered.

Also, bump to dev version number
parent 472a2e96
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"no-underscore-dangle": "off", "no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error", "no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "off", "no-unneeded-ternary": "off",
"no-unused-vars": "off", "no-unused-vars": "error",
"no-unused-expressions": "off", "no-unused-expressions": "off",
"no-use-before-define": "off", "no-use-before-define": "off",
"no-useless-call": "error", "no-useless-call": "error",
......
...@@ -15,7 +15,7 @@ import bootstrap from "bootstrap.native"; ...@@ -15,7 +15,7 @@ import bootstrap from "bootstrap.native";
import tpl_emoji_button from "templates/emoji_button.html"; import tpl_emoji_button from "templates/emoji_button.html";
import tpl_emojis from "templates/emojis.html"; import tpl_emojis from "templates/emojis.html";
const { Backbone, sizzle, _ } = converse.env; const { Backbone, sizzle } = converse.env;
const u = converse.env.utils; const u = converse.env.utils;
...@@ -30,7 +30,7 @@ converse.plugins.add('converse-emoji-views', { ...@@ -30,7 +30,7 @@ converse.plugins.add('converse-emoji-views', {
* *
* NB: These plugins need to have already been loaded via require.js. * NB: These plugins need to have already been loaded via require.js.
*/ */
dependencies: ["converse-emoji", "converse-chatview"], dependencies: ["converse-emoji", "converse-chatview", "converse-muc-views"],
overrides: { overrides: {
...@@ -110,7 +110,7 @@ converse.plugins.add('converse-emoji-views', { ...@@ -110,7 +110,7 @@ converse.plugins.add('converse-emoji-views', {
this.emoji_picker_view.chatview = this; this.emoji_picker_view.chatview = this;
}, },
createEmojiDropdown (ev) { createEmojiDropdown () {
const dropdown_el = this.el.querySelector('.toggle-smiley.dropup'); const dropdown_el = this.el.querySelector('.toggle-smiley.dropup');
this.emoji_dropdown = new bootstrap.Dropdown(dropdown_el, true); this.emoji_dropdown = new bootstrap.Dropdown(dropdown_el, true);
this.emoji_dropdown.el = dropdown_el; this.emoji_dropdown.el = dropdown_el;
......
...@@ -103,7 +103,7 @@ const _converse = { ...@@ -103,7 +103,7 @@ const _converse = {
'promises': {} 'promises': {}
} }
_converse.VERSION_NAME = "v5.0.4"; _converse.VERSION_NAME = "v5.0.5dev";
Object.assign(_converse, Backbone.Events); Object.assign(_converse, Backbone.Events);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment