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 
Conflicts:
	converse.js
	index.html
This commit is contained in:
JC Brand 2013-10-07 09:16:02 +02:00
commit 4f44be9e29
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
converse.js
View File

@ -222,14 +222,19 @@
}; };
this.onConnect = function (status) { this.onConnect = function (status) {
var $button, $form;
if (status === Strophe.Status.CONNECTED) { if (status === Strophe.Status.CONNECTED) {
converse.log('Connected'); converse.log('Connected');
converse.onConnected(); converse.onConnected();
} else if (status === Strophe.Status.DISCONNECTED) { } else if (status === Strophe.Status.DISCONNECTED) {
//if ($button) { $button.show().siblings('span').remove(); } $form = $('#converse-login');
$button = $form.find('input[type=submit]');
if ($button) { $button.show().siblings('span').remove(); }
converse.giveFeedback(__('Disconnected'), 'error'); converse.giveFeedback(__('Disconnected'), 'error');
//converse.connection.connect(connection.jid, connection.pass, converse.onConnect); converse.connection.connect(connection.jid, connection.pass, converse.onConnect);
} else if (status === Strophe.Status.Error) { } else if (status === Strophe.Status.Error) {
$form = $('#converse-login');
$button = $form.find('input[type=submit]');
if ($button) { $button.show().siblings('span').remove(); } if ($button) { $button.show().siblings('span').remove(); }
converse.giveFeedback(__('Error'), 'error'); converse.giveFeedback(__('Error'), 'error');
} else if (status === Strophe.Status.CONNECTING) { } else if (status === Strophe.Status.CONNECTING) {
@ -385,7 +390,9 @@
this.connection.xmlInput = function (body) { console.log(body); }; this.connection.xmlInput = function (body) { console.log(body); };
this.connection.xmlOutput = function (body) { console.log(body); }; this.connection.xmlOutput = function (body) { console.log(body); };
Strophe.log = function (level, msg) { console.log(level+' '+msg); }; Strophe.log = function (level, msg) { console.log(level+' '+msg); };
Strophe.error = function (msg) { console.log('ERROR: '+msg); }; Strophe.error = function (msg) {
console.log('ERROR: '+msg);
};
} }
this.bare_jid = Strophe.getBareJidFromJid(this.connection.jid); this.bare_jid = Strophe.getBareJidFromJid(this.connection.jid);
this.domain = Strophe.getDomainFromJid(this.connection.jid); this.domain = Strophe.getDomainFromJid(this.connection.jid);
@ -2694,15 +2701,6 @@
id: 'converse-roster', id: 'converse-roster',
rosteritemviews: {}, rosteritemviews: {},
removeRosterItem: function (item) {
var view = this.rosteritemviews[item.id];
if (view) {
view.$el.remove();
delete this.rosteritemviews[item.id];
this.render();
}
},
requesting_contacts_template: _.template( requesting_contacts_template: _.template(
'<dt id="xmpp-contact-requests">'+__('Contact requests')+'</dt>'), '<dt id="xmpp-contact-requests">'+__('Contact requests')+'</dt>'),
@ -2714,9 +2712,7 @@
initialize: function () { initialize: function () {
this.model.on("add", function (item) { this.model.on("add", function (item) {
var view = new converse.RosterItemView({model: item}); this.addRosterItemView(item).render(item);
this.rosteritemviews[item.id] = view;
this.render(item);
if (!item.get('vcard_updated')) { if (!item.get('vcard_updated')) {
// This will update the vcard, which triggers a change // This will update the vcard, which triggers a change
// request which will rerender the roster item. // request which will rerender the roster item.
@ -2724,16 +2720,15 @@
} }
}, this); }, this);
this.model.on('change', function (item, changed) { this.model.on('change', function (item) {
if ((_.size(item.changed) === 1) && _.contains(_.keys(item.changed), 'sorted')) { if ((_.size(item.changed) === 1) && _.contains(_.keys(item.changed), 'sorted')) {
return; return;
} }
this.updateChatBox(item, changed); this.updateChatBox(item).render(item);
this.render(item);
}, this); }, this);
this.model.on("remove", function (item) { this.removeRosterItem(item); }, this); this.model.on("remove", function (item) { this.removeRosterItemView(item); }, this);
this.model.on("destroy", function (item) { this.removeRosterItem(item); }, this); this.model.on("destroy", function (item) { this.removeRosterItemView(item); }, this);
var roster_markup = this.contacts_template(); var roster_markup = this.contacts_template();
if (converse.allow_contact_requests) { if (converse.allow_contact_requests) {
@ -2760,7 +2755,9 @@
updateChatBox: function (item, changed) { updateChatBox: function (item, changed) {
var chatbox = converse.chatboxes.get(item.get('jid')), var chatbox = converse.chatboxes.get(item.get('jid')),
changes = {}; changes = {};
if (!chatbox) { return; } if (!chatbox) {
return this;
}
if (_.has(item.changed, 'chat_status')) { if (_.has(item.changed, 'chat_status')) {
changes.chat_status = item.get('chat_status'); changes.chat_status = item.get('chat_status');
} }
@ -2768,14 +2765,30 @@
changes.status = item.get('status'); changes.status = item.get('status');
} }
chatbox.save(changes); chatbox.save(changes);
return this;
},
addRosterItemView: function (item) {
var view = new converse.RosterItemView({model: item});
this.rosteritemviews[item.id] = view;
return this;
},
removeRosterItemView: function (item) {
var view = this.rosteritemviews[item.id];
if (view) {
view.$el.remove();
delete this.rosteritemviews[item.id];
this.render();
}
return this;
}, },
renderRosterItem: function (item, view) { renderRosterItem: function (item, view) {
if (converse.show_only_online_users) { if ((converse.show_only_online_users) && (item.get('chat_status') !== 'online')) {
if (item.get('chat_status') !== 'online') { view.$el.remove();
view.$el.remove(); view.delegateEvents();
return; return this;
}
} }
if ($.contains(document.documentElement, view.el)) { if ($.contains(document.documentElement, view.el)) {
view.render(); view.render();
@ -2806,7 +2819,7 @@
} else if (subscription === 'both' || subscription === 'to') { } else if (subscription === 'both' || subscription === 'to') {
this.renderRosterItem(item, view); this.renderRosterItem(item, view);
} }
changed_presence = view.model.changed.chat_status; changed_presence = item.changed.chat_status;
if (changed_presence) { if (changed_presence) {
this.sortRoster(changed_presence); this.sortRoster(changed_presence);
sorted = true; sorted = true;

4
spec/MainSpec.js
View File

@ -395,13 +395,13 @@
var jid = req_names.sort()[1].replace(/ /g,'.').toLowerCase() + '@localhost'; var jid = req_names.sort()[1].replace(/ /g,'.').toLowerCase() + '@localhost';
var view = this.rosterview.rosteritemviews[jid]; var view = this.rosterview.rosteritemviews[jid];
spyOn(this.connection.roster, 'unauthorize'); spyOn(this.connection.roster, 'unauthorize');
spyOn(this.rosterview, 'removeRosterItem').andCallThrough(); spyOn(this.rosterview, 'removeRosterItemView').andCallThrough();
spyOn(view, 'declineRequest').andCallThrough(); spyOn(view, 'declineRequest').andCallThrough();
view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
var accept_button = view.$el.find('.decline-xmpp-request'); var accept_button = view.$el.find('.decline-xmpp-request');
accept_button.click(); accept_button.click();
expect(view.declineRequest).toHaveBeenCalled(); expect(view.declineRequest).toHaveBeenCalled();
expect(this.rosterview.removeRosterItem).toHaveBeenCalled(); expect(this.rosterview.removeRosterItemView).toHaveBeenCalled();
expect(this.connection.roster.unauthorize).toHaveBeenCalled(); expect(this.connection.roster.unauthorize).toHaveBeenCalled();
// There should now be one less contact // There should now be one less contact
expect(this.roster.length).toEqual(num_contacts-1); expect(this.roster.length).toEqual(num_contacts-1);