colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Setup loading gif on conversation list

Browse Source 
TODO: get actual gif asset in there.
This commit is contained in:
lilia
2015-01-25 10:48:47 -10:00
parent cc0acc56dd
commit 00e9e3b757
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/index.js
View File

@@ -22,7 +22,7 @@
if (textsecure.storage.getUnencrypted("number_id") === undefined) { if (textsecure.storage.getUnencrypted("number_id") === undefined) {
window.location = '/options.html'; window.location = '/options.html';
} else { } else {
new Whisper.InboxView({el: document}); new Whisper.InboxView({el: $('body')});
textsecure.storage.putUnencrypted("unreadCount", 0); textsecure.storage.putUnencrypted("unreadCount", 0);
extension.navigator.setBadgeText(""); extension.navigator.setBadgeText("");
} }

5
js/views/inbox_view.js
View File

@@ -32,7 +32,10 @@
collection : this.conversations collection : this.conversations
}); });
this.conversations.fetchActive({reset: true}); this.$el.addClass('loading');
this.conversations.fetchActive({reset: true}).then(function() {
this.$el.removeClass('loading');
}.bind(this));
extension.on('message', function(message) { extension.on('message', function(message) {
this.conversations.fetch({id: message.conversationId}).then(function() { this.conversations.fetch({id: message.conversationId}).then(function() {

4
stylesheets/index.scss
View File

@@ -2,6 +2,10 @@
margin-top: 36px; margin-top: 36px;
} }
.loading .gutter {
// TODO: spinner
}
.contact .checkbox { .contact .checkbox {
display: none; display: none;
} }