소스 검색

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
JC Brand 5 년 전
부모
커밋
75c11a2006
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      .eslintrc.json
  2. 3 3
      src/converse-emoji-views.js
  3. 1 1
      src/headless/converse-core.js

+ 1 - 1
.eslintrc.json

@@ -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",

+ 3 - 3
src/converse-emoji-views.js

@@ -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', {
      *
      *
      * 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', {
                 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;

+ 1 - 1
src/headless/converse-core.js

@@ -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);