Commit ebfd092e authored by JC Brand's avatar JC Brand

Bugfix.

Controlbox didn't auto-appear when a new user made a subscription request.
parent 52bbe024
...@@ -1214,7 +1214,7 @@ ...@@ -1214,7 +1214,7 @@
} 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()));
xmppchat.chatboxes.get('controlbox').trigger('show'); xmppchat.showControlBox();
} else if (subscription === 'both' || subscription === 'to') { } else if (subscription === 'both' || subscription === 'to') {
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()));
...@@ -1520,6 +1520,9 @@ ...@@ -1520,6 +1520,9 @@
}, this); }, this);
this.model.on('change', function (item, changed) { this.model.on('change', function (item, changed) {
if ((_.size(item.changed) === 1) && _.contains(_.keys(item.changed), 'sorted')) {
return;
}
this.updateChatBox(item, changed); this.updateChatBox(item, changed);
this.render(item); this.render(item);
}, this); }, this);
...@@ -1880,42 +1883,47 @@ ...@@ -1880,42 +1883,47 @@
} }
}); });
// Event handlers xmppchat.showControlBox = function () {
// --------------
$(document).ready($.proxy(function () {
var chatdata = $('div#collective-xmpp-chat-data'),
$toggle = $('a#toggle-online-users');
this.$feedback = $('.conn-feedback');
this.fullname = chatdata.attr('fullname');
this.prebind = chatdata.attr('prebind');
this.auto_subscribe = chatdata.attr('auto_subscribe') === "True" || false;
this.chatboxes = new this.ChatBoxes();
this.chatboxesview = new this.ChatBoxesView({model: this.chatboxes});
$toggle.bind('click', $.proxy(function (e) {
e.preventDefault();
var controlbox = this.chatboxes.get('controlbox'); var controlbox = this.chatboxes.get('controlbox');
if ($("div#controlbox").is(':visible')) {
if (this.connection) {
controlbox.destroy();
} else {
controlbox.trigger('hide');
}
} else {
if (!controlbox) { if (!controlbox) {
controlbox = this.chatboxes.add({ this.chatboxes.add({
id: 'controlbox', id: 'controlbox',
box_id: 'controlbox', box_id: 'controlbox',
visible: true visible: true
}); });
if (this.connection) { if (this.connection) {
controlbox.save(); this.chatboxes.get('controlbox').save();
} }
} else { } else {
controlbox.trigger('show'); controlbox.trigger('show');
} }
} }
}, this));
xmppchat.toggleControlBox = function () {
if ($("div#controlbox").is(':visible')) {
var controlbox = this.chatboxes.get('controlbox');
if (this.connection) {
controlbox.destroy();
} else {
controlbox.trigger('hide');
}
} else {
this.showControlBox();
}
};
// Event handlers
// --------------
$(document).ready($.proxy(function () {
var chatdata = $('div#collective-xmpp-chat-data'),
$toggle = $('a#toggle-online-users');
this.$feedback = $('.conn-feedback');
this.fullname = chatdata.attr('fullname');
this.prebind = chatdata.attr('prebind');
this.auto_subscribe = chatdata.attr('auto_subscribe') === "True" || false;
this.chatboxes = new this.ChatBoxes();
this.chatboxesview = new this.ChatBoxesView({model: this.chatboxes});
$toggle.bind('click', $.proxy(function (e) { e.preventDefault(); this.toggleControlBox(); }, this));
$(document).bind('jarnxmpp.connecting', $.proxy(function (ev, conn) { $(document).bind('jarnxmpp.connecting', $.proxy(function (ev, conn) {
this.$feedback.text('Connecting to chat...'); this.$feedback.text('Connecting to chat...');
......
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