thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Load all inbox convos before rendering

Browse source 
This is a better alternative to the fix in 0434c4b, which causes
problems when creating a new conversation from entering a phone number.

// FREEBIE
This commit is contained in:
lilia 2016-03-17 20:58:56 -07:00
parent 57ac7c4fd7
commit 7fb4d3d8aa
4 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/background.js
View file

@ -35,9 +35,6 @@
// start a background worker for ecc
textsecure.protocol_wrapper.startWorker();
// load the initial set of conversations into memory
ConversationController.updateInbox();
extension.onLaunched(function() {
console.log('extension launched');
storage.onready(function() {

2
js/conversation_controller.js
View file

@ -74,7 +74,7 @@
});
},
updateInbox: function() {
conversations.fetchActive();
return conversations.fetchActive();
}
};
})();

31
js/index.js
View file

@ -20,21 +20,22 @@
function render() {
extension.windows.getBackground(function(bg) {
extension.windows.getCurrent(function(appWindow) {
try {
if (view) { view.remove(); }
var $body = bg.$('body',document).empty();
view = new bg.Whisper.InboxView({appWindow: appWindow});
view.$el.prependTo($body);
window.openConversation = function(conversation) {
if (conversation) {
view.openConversation(null, conversation);
}
};
openConversation(bg.getOpenConversation());
} catch (e) {
logError(e);
}
bg.ConversationController.updateInbox().then(function() {
try {
if (view) { view.remove(); }
var $body = bg.$('body',document).empty();
view = new bg.Whisper.InboxView({appWindow: appWindow});
view.$el.prependTo($body);
window.openConversation = function(conversation) {
if (conversation) {
view.openConversation(null, conversation);
}
};
openConversation(bg.getOpenConversation());
} catch (e) {
logError(e);
}
});
});
});
}

2
js/views/inbox_view.js
View file

@ -74,7 +74,7 @@
}).render();
this.inboxListView.listenTo(inboxCollection,
'change:active_at',
'add change:active_at',
this.inboxListView.onChangeActiveAt);
this.searchView = new Whisper.ConversationSearchView({