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

Make compatible with JQuery 1.4.4 by using .delegate instead of .on

Browse Source
This commit is contained in:
JC Brand 2012-09-11 20:37:27 +02:00
parent db7c0ba7eb
commit 51b85f9ae7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
converse.js
View File

@ -976,11 +976,11 @@ xmppchat.RosterItemView = Backbone.View.extend({
} else if (ask === 'request') { } else if (ask === 'request') {
this.$el.addClass('requesting-xmpp-contact'); this.$el.addClass('requesting-xmpp-contact');
$(this.el).html(this.request_template(item.toJSON())); $(this.el).html(this.request_template(item.toJSON()));
this.$el.find('button.accept-xmpp-request').on('click', function (ev) { this.$el.delegate('button.accept-xmpp-request', 'click', function (ev) {
ev.preventDefault(); ev.preventDefault();
that.acceptRequest(); that.acceptRequest();
}); });
this.$el.find('button.decline-xmpp-request').on('click', function (ev) { this.$el.delegate('button.decline-xmpp-request', 'click', function (ev) {
ev.preventDefault(); ev.preventDefault();
that.declineRequest(); that.declineRequest();
}); });
@ -988,14 +988,14 @@ xmppchat.RosterItemView = Backbone.View.extend({
} else if (subscription === 'both') { } else if (subscription === 'both') {
this.$el.addClass('current-xmpp-contact'); this.$el.addClass('current-xmpp-contact');
this.$el.html(this.template(item.toJSON())); this.$el.html(this.template(item.toJSON()));
this.$el.find('a.open-chat').on('click', function (ev) { this.$el.delegate('a.open-chat', 'click', function (ev) {
ev.preventDefault(); ev.preventDefault();
that.openChat(); that.openChat();
}); });
} }
// Event handlers // Event handlers
this.$el.find('a.remove-xmpp-contact').on('click', function (ev) { this.$el.delegate('a.remove-xmpp-contact','click', function (ev) {
ev.preventDefault(); ev.preventDefault();
that.removeContact(); that.removeContact();
}); });
@ -1153,8 +1153,7 @@ xmppchat.Roster = (function (_, $, console) {
// Ignore MUC or self-addressed stanzas // Ignore MUC or self-addressed stanzas
return true; return true;
} }
if ((status_message.length > 0)&&(status_message.text())) {
if (status_message.length > 0) {
model = ob.getItem(bare_jid); model = ob.getItem(bare_jid);
model.set({'status': status_message.text()}); model.set({'status': status_message.text()});
} }