Bugfix. Chat room status messages weren't being shown in certain cases.

e8a70abc · JC Brand · a3e540fa · e8a70abc
Commit e8a70abc authored Sep 05, 2014 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 12 deletions

converse.js converse.js +8 -12

No files found.
--- a/converse.js
+++ b/converse.js
@@ -2363,18 +2363,14 @@
                    msgs, i;
                for (i=0; i<$stats.length; i++) {
                    var stat = $stats[i].getAttribute('code');
-                    if (is_self) {
+                    if (is_self && _.contains(_.keys(this.disconnectMessages), stat)) {
-                        if (_.contains(_.keys(this.disconnectMessages), stat)) {
+                        disconnect_msgs.push(this.disconnectMessages[stat]);
-                            disconnect_msgs.push(this.disconnectMessages[stat]);
+                    } else if (!is_self && _.contains(_.keys(this.actionInfoMessages), stat)) {
-                        }
+                        action_msgs.push(
-                    } else {
+                            __(this.actionInfoMessages[stat], Strophe.unescapeNode(Strophe.getResourceFromJid($el.attr('from'))))
-                        if (_.contains(_.keys(this.infoMessages), stat)) {
+                        );
-                            info_msgs.push(this.infoMessages[stat]);
+                    } else if (_.contains(_.keys(this.infoMessages), stat)) {
-                        } else if (_.contains(_.keys(this.actionInfoMessages), stat)) {
+                        info_msgs.push(this.infoMessages[stat]);
-                            action_msgs.push(
-                                __(this.actionInfoMessages[stat], Strophe.unescapeNode(Strophe.getResourceFromJid($el.attr('from'))))
-                            );
-                        }
                    }
                }
                if (disconnect_msgs.length > 0) {