瀏覽代碼

Bugfix. Closured converse is not defined in utils.

JC Brand 10 年之前
父節點
當前提交
7437cf2b42
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 7 1
      converse.js
  2. 2 2
      src/utils.js

+ 7 - 1
converse.js

@@ -1297,7 +1297,12 @@
                     'message': '',
                     'extra_classes': extra_classes
                 });
-                $content.append($(message).children('.chat-message-content').first().text(text).addHyperlinks().addEmoticons().parent());
+                $content.append(
+                    $(message).children('.chat-message-content').first().text(text)
+                        .addHyperlinks()
+                        .addEmoticons(converse.visible_toolbar_buttons.emoticons)
+                    .parent()
+                );
                 this.scrollDown();
             },
 
@@ -6148,6 +6153,7 @@
                     }
                 }
                 converse.connection.sendIQ(stanza, function (iq) {
+                    debugger;
                     var rsm = new Strophe.RSM({xml: iq.getElementsByTagName('set')[0]});
                     return _.bind(callback, this, arguments)(rsm);
                 }, errback);

+ 2 - 2
src/utils.js

@@ -50,8 +50,8 @@
         return this;
     };
 
-    $.fn.addEmoticons = function () {
-        if (converse.visible_toolbar_buttons.emoticons) {
+    $.fn.addEmoticons = function (allowed) {
+        if (allowed) {
             if (this.length > 0) {
                 this.each(function (i, obj) {
                     var text = $(obj).html();