Show an error if a conversation window fails to init

I saw this happen once. Seems to be a race condition.
This commit is contained in:
lilia 2015-03-11 13:31:05 -07:00
parent 0cbad730ce
commit 5becd80fe9

View file

@ -22,9 +22,13 @@
extension.windows.getCurrent(function (windowInfo) { extension.windows.getCurrent(function (windowInfo) {
var bg = extension.windows.getBackground(); var bg = extension.windows.getBackground();
var conversation = bg.getConversationForWindow(windowInfo.id); var conversation = bg.getConversationForWindow(windowInfo.id);
window.document.title = conversation.getTitle(); if (conversation) {
new Whisper.ConversationView({ window.document.title = conversation.getTitle();
model: conversation new Whisper.ConversationView({
}).$el.prependTo($('body')); model: conversation
}).$el.prependTo($('body'));
} else {
$('<div>').text('Error').prependTo($('body'));
}
}); });
}()); }());