Consolidate message callbacks
Register the runtime callback at the top level view rather than having each conversation view register independently. Also refactors Layout into InboxView.
This commit is contained in:
parent
470346c9c4
commit
c0681beca7
6 changed files with 99 additions and 72 deletions
55
js/index.js
55
js/index.js
|
@ -15,63 +15,14 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
Whisper.Layout = new (Backbone.View.extend({
|
||||
initialize: function () {
|
||||
this.gutter = $('#gutter');
|
||||
this.contacts = $('#contacts');
|
||||
this.resize();
|
||||
'use strict';
|
||||
|
||||
window.addEventListener('resize', this.resize.bind(this));
|
||||
|
||||
new Whisper.ConversationListView({el: $('#contacts'), collection: Whisper.Conversations});
|
||||
Whisper.Conversations.fetch({reset: true}).then(function() {
|
||||
if (Whisper.Conversations.length) {
|
||||
Whisper.Conversations.at(0).trigger('render');
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
events: {
|
||||
'click #new-message': 'new_message',
|
||||
'click #new-group': 'new_group'
|
||||
},
|
||||
|
||||
new_message: function (e) {
|
||||
e.preventDefault();
|
||||
$('.conversation').hide().trigger('close'); // detach any existing conversation views
|
||||
this.view = new Whisper.NewConversationView();
|
||||
//todo: less new
|
||||
},
|
||||
|
||||
new_group: function (e) {
|
||||
e.preventDefault();
|
||||
$('.conversation').trigger('close'); // detach any existing conversation views
|
||||
new Whisper.NewGroupView();
|
||||
},
|
||||
resize: function (e) {
|
||||
var windowheight = window.innerHeight,
|
||||
form = $('.send-message-area').outerHeight(),
|
||||
gutter_offset = this.gutter.offset().top,
|
||||
contacts_offset = this.contacts.offset().top;
|
||||
if (window.innerWidth < 480) {
|
||||
this.gutter.css('height', windowheight - gutter_offset - form);
|
||||
this.contacts.css('height', windowheight - contacts_offset - form);
|
||||
} else {
|
||||
this.gutter.css('height', windowheight - gutter_offset);
|
||||
this.contacts.css('height', windowheight - contacts_offset);
|
||||
}
|
||||
$('.discussion').css('height', windowheight - gutter_offset - form);
|
||||
},
|
||||
setContent: function (content) {
|
||||
$(content).insertAfter(this.gutter);
|
||||
this.resize();
|
||||
}
|
||||
}))({el: document});
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
if (textsecure.storage.getUnencrypted("number_id") === undefined) {
|
||||
window.location = '/options.html';
|
||||
} else {
|
||||
Whisper.Layout = new Whisper.InboxView({el: document});
|
||||
textsecure.storage.putUnencrypted("unreadCount", 0);
|
||||
extension.navigator.setBadgeText("");
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue