Commit 102218b0 authored by JC Brand's avatar JC Brand

Compatibility changes for backbone 1.0

parent f9e4d16c
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
}, },
onChange: function (item, changed) { onChange: function (item, changed) {
if (_.has(changed.changes, 'chat_status')) { if (_.has(item.changed, 'chat_status')) {
var chat_status = item.get('chat_status'), var chat_status = item.get('chat_status'),
fullname = item.get('fullname'); fullname = item.get('fullname');
if (this.$el.is(':visible')) { if (this.$el.is(':visible')) {
...@@ -472,7 +472,7 @@ ...@@ -472,7 +472,7 @@
this.$el.find('div.chat-event').remove(); this.$el.find('div.chat-event').remove();
} }
} }
} if (_.has(changed.changes, 'status')) { } if (_.has(item.changed, 'status')) {
this.showStatusMessage(item.get('status')); this.showStatusMessage(item.get('status'));
} }
}, },
...@@ -1215,7 +1215,7 @@ ...@@ -1215,7 +1215,7 @@
initialize: function () { initialize: function () {
this.options.model.on('change', function (item, changed) { this.options.model.on('change', function (item, changed) {
if (_.has(changed.changes, 'chat_status')) { if (_.has(item.changed, 'chat_status')) {
this.$el.attr('class', item.changed.chat_status); this.$el.attr('class', item.changed.chat_status);
} }
}, this); }, this);
...@@ -1577,10 +1577,10 @@ ...@@ -1577,10 +1577,10 @@
var chatbox = xmppchat.chatboxes.get(item.get('jid')), var chatbox = xmppchat.chatboxes.get(item.get('jid')),
changes = {}; changes = {};
if (!chatbox) { return; } if (!chatbox) { return; }
if (_.has(changed.changes, 'chat_status')) { if (_.has(item.changed, 'chat_status')) {
changes.chat_status = item.get('chat_status'); changes.chat_status = item.get('chat_status');
} }
if (_.has(changed.changes, 'status')) { if (_.has(item.changed, 'status')) {
changes.status = item.get('status'); changes.status = item.get('status');
} }
chatbox.save(changes); chatbox.save(changes);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment