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

More work on properly restoring trimmed chats.

Browse Source 
* Make sure that a restored (grown) chat is inserted to the right
* Make sure restoring via the contacts roster works
This commit is contained in:
JC Brand 2014-05-31 21:26:18 +02:00
parent b84fb41341
commit 76545632fc
1 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
converse.js
View File

@ -914,6 +914,7 @@
this.model.on('showReceivedOTRMessage', function (text) { this.model.on('showReceivedOTRMessage', function (text) {
this.showMessage({'message': text, 'sender': 'them'}); this.showMessage({'message': text, 'sender': 'them'});
}, this); }, this);
this.updateVCard(); this.updateVCard();
this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el); this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el);
this.render().show().focus().model.messages.fetch({add: true}); this.render().show().focus().model.messages.fetch({add: true});
@ -1331,12 +1332,13 @@
}, },
trim: function () { trim: function () {
this.$el.hide('fast', converse.refreshWebkit); this.$el.hide('fast', converse.refreshwebkit);
}, },
grow: function () { grow: function () {
// the opposite of trim, i.e. restoring a trimmed chat box // the opposite of trim, i.e. restoring a trimmed chat box
this.$el.show(); this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el).show();
this.focus();
this.model.trigger('grow', this.model); this.model.trigger('grow', this.model);
}, },
@ -2515,32 +2517,13 @@
initialize: function () { initialize: function () {
var views = {}; var views = {};
this.get = function (id) { return views[id]; }; this.get = function (id) { return views[id]; };
this.set = function (id, view) { views[id] = view; }; this.add = function (id, view) { views[id] = view; };
this.getAll = function () { return views; }; this.getAll = function () { return views; };
this.trimmed_chatboxes_view = new converse.TrimmedChatBoxesView({model: this.model}); this.trimmed_chatboxes_view = new converse.TrimmedChatBoxesView({model: this.model});
this.render(); this.render();
this.model.on("add", function (item) { this.model.on("add", this.onChatAdded, this);
var view = this.get(item.get('id'));
if (!view) {
if (item.get('chatroom')) {
view = new converse.ChatRoomView({'model': item});
} else if (item.get('box_id') === 'controlbox') {
view = new converse.ControlBoxView({model: item});
view.render();
} else {
view = new converse.ChatBoxView({model: item});
}
this.set(item.get('id'), view);
} else {
delete view.model; // Remove ref to old model to help garbage collection
view.model = item;
view.initialize();
}
this.trimChats(view);
}, this);
this.model.on("grow", function (item) { this.model.on("grow", function (item) {
this.trimChats(this.get(item.get('id'))); this.trimChats(this.get(item.get('id')));
}, this); }, this);
@ -2566,6 +2549,26 @@
} }
}, },
onChatAdded: function (item) {
var view = this.get(item.get('id'));
if (!view) {
if (item.get('chatroom')) {
view = new converse.ChatRoomView({'model': item});
} else if (item.get('box_id') === 'controlbox') {
view = new converse.ControlBoxView({model: item});
view.render();
} else {
view = new converse.ChatBoxView({model: item});
}
this.add(item.get('id'), view);
} else {
delete view.model; // Remove ref to old model to help garbage collection
view.model = item;
view.initialize();
}
this.trimChats(view);
},
trimChats: function (view) { trimChats: function (view) {
/* This method is called before a new chat box will be opened. /* This method is called before a new chat box will be opened.
* *
@ -2642,6 +2645,9 @@
}, },
close: function (ev) { close: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
ev.preventDefault(); ev.preventDefault();
this.$el.remove(); this.$el.remove();
this.model.destroy(); this.model.destroy();
@ -2649,7 +2655,9 @@
}, },
restore: function (ev) { restore: function (ev) {
ev.preventDefault(); if (ev && ev.preventDefault) {
ev.preventDefault();
}
this.$el.remove(); this.$el.remove();
this.model.set({ this.model.set({
'time_opened': moment().format(), 'time_opened': moment().format(),
@ -2664,7 +2672,7 @@
initialize: function () { initialize: function () {
var views = {}; var views = {};
this.get = function (id) { return views[id]; }; this.get = function (id) { return views[id]; };
this.set = function (id, view) { views[id] = view; }; this.add = function (id, view) { views[id] = view; };
this.remove = function (id) { this.remove = function (id) {
var view = views[id]; var view = views[id];
if (view) { if (view) {
@ -2678,9 +2686,10 @@
if (item.get('trimmed')) { if (item.get('trimmed')) {
view = new converse.TrimmedChatBoxView({model: item}); view = new converse.TrimmedChatBoxView({model: item});
this.$('.box-flyout').append(view.render()); this.$('.box-flyout').append(view.render());
views[item.get('id')] = view; this.add(item.get('id'), view);
} else { } else {
this.remove(item.get('id')); view = this.get(item.get('id'));
view.restore();
} }
}, this); }, this);
}, },
@ -3122,10 +3131,8 @@
initialize: function () { initialize: function () {
var views = {}; var views = {};
this.get = function (id) { this.get = function (id) { return views[id]; };
return views[id]; this.add = function (id, view) { views[id] = view; };
};
this.set = function (id, view) { views[id] = view; };
this.model.on("add", function (item) { this.model.on("add", function (item) {
this.addRosterItemView(item).render(item); this.addRosterItemView(item).render(item);
@ -3182,7 +3189,7 @@
addRosterItemView: function (item) { addRosterItemView: function (item) {
var view = new converse.RosterItemView({model: item}); var view = new converse.RosterItemView({model: item});
this.set(item.id, view); this.add(item.id, view);
return this; return this;
}, },