Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch '0.6.x'

Browse Source
This commit is contained in:
JC Brand 2013-10-19 18:28:31 +02:00
commit 546204bed6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
converse.js
View File

@ -8,7 +8,7 @@
// AMD/global registrations // AMD/global registrations
(function (root, factory) { (function (root, factory) {
if (console===undefined || console.log===undefined) { if (typeof console === "undefined" || typeof console.log === "undefined") {
console = { log: function () {}, error: function () {} }; console = { log: function () {}, error: function () {} };
} }
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
@ -2612,6 +2612,10 @@
if (this.isSelf(item.jid)) { return; } if (this.isSelf(item.jid)) { return; }
var model = this.get(item.jid); var model = this.get(item.jid);
if (!model) { if (!model) {
if ((item.subscription === 'none') && (item.ask === null)) {
// We're not interested in zombies
return;
}
is_last = false; is_last = false;
if (index === (items.length-1)) { is_last = true; } if (index === (items.length-1)) { is_last = true; }
this.create({ this.create({

2
locale/hu/LC_MESSAGES/hu.js
View File

@ -195,7 +195,7 @@
if (!window.locales) { if (!window.locales) {
window.locales = {}; window.locales = {};
} }
window.locales.de = factory(new Jed(translations)); window.locales.hu = factory(new Jed(translations));
} }
}(this, function(hu) { }(this, function(hu) {
return hu; return hu;