Merge branch '0.6.x'
This commit is contained in:
commit
546204bed6
@ -8,7 +8,7 @@
|
||||
|
||||
// AMD/global registrations
|
||||
(function (root, factory) {
|
||||
if (console===undefined || console.log===undefined) {
|
||||
if (typeof console === "undefined" || typeof console.log === "undefined") {
|
||||
console = { log: function () {}, error: function () {} };
|
||||
}
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
@ -2612,6 +2612,10 @@
|
||||
if (this.isSelf(item.jid)) { return; }
|
||||
var model = this.get(item.jid);
|
||||
if (!model) {
|
||||
if ((item.subscription === 'none') && (item.ask === null)) {
|
||||
// We're not interested in zombies
|
||||
return;
|
||||
}
|
||||
is_last = false;
|
||||
if (index === (items.length-1)) { is_last = true; }
|
||||
this.create({
|
||||
|
@ -195,7 +195,7 @@
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.de = factory(new Jed(translations));
|
||||
window.locales.hu = factory(new Jed(translations));
|
||||
}
|
||||
}(this, function(hu) {
|
||||
return hu;
|
||||
|
Loading…
Reference in New Issue
Block a user