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

Refactor message view

Browse source 
The message view has three flavors so far, a normal text+attachments
message, a group update, and an end session message. This changeset
extracts the normal message rendering into its own subview, and adds
some convenience functions to the message model in order to simplify
some of that flavoring logic.
This commit is contained in:
lilia 2015-02-17 11:54:15 -08:00
parent 85bec04010
commit 94c94eb7c9
2 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/models/messages.js
View file

@ -33,6 +33,13 @@
if (missing.length) {
console.log("Message missing attributes: " + missing);
}
},
isEndSession: function() {
var flag = textsecure.protobuf.PushMessageContent.Flags.END_SESSION;
return !!(this.get('flags') & flag);
},
isGroupUpdate: function() {
return !!(this.get('group_update'));
}
});

55
js/views/message_view.js
View file

@ -16,6 +16,8 @@
(function () {
'use strict';
window.Whisper = window.Whisper || {};
var ErrorView = Backbone.View.extend({
className: 'error',
events: {
@ -30,38 +32,14 @@
}
});
window.Whisper = window.Whisper || {};
Whisper.MessageView = Backbone.View.extend({
tagName: "li",
className: "entry",
var ContentMessageView = Backbone.View.extend({
tagName: 'div',
initialize: function() {
var groupUpdate = this.model.get('group_update');
this.$el.addClass(this.model.get('type'));
if (groupUpdate) {
this.group_update_view = new Whisper.GroupUpdateView({
model: groupUpdate
}).render();
} else if (this.model.get('flags') === textsecure.protobuf.PushMessageContent.Flags.END_SESSION) {
this.end_session_view = new Whisper.EndSessionView().render();
} else {
this.template = $('#message').html();
}
Mustache.parse(this.template);
this.listenTo(this.model, 'change', this.render); // auto update
this.listenTo(this.model, 'destroy', this.remove); // auto update
},
render: function() {
if (this.group_update_view) {
this.$el.append(this.group_update_view.$el);
} else if (this.end_session_view) {
this.$el.append(this.end_session_view.$el);
} else {
this.$el.html(
Mustache.render(this.template, {
message: this.model.get('body'),
@ -90,7 +68,32 @@
);
}
}
});
Whisper.MessageView = Backbone.View.extend({
tagName: "li",
className: function() {
return ["entry", this.model.get('type')].join(' ');
},
initialize: function() {
if (this.model.isEndSession()) {
this.view = new Whisper.EndSessionView();
} else if (this.model.isGroupUpdate()) {
this.view = new Whisper.GroupUpdateView({
model: this.model.get('group_update')
});
} else {
this.view = new ContentMessageView({model: this.model});
}
this.$el.append(this.view.el);
this.listenTo(this.model, 'change', this.render); // auto update
this.listenTo(this.model, 'destroy', this.remove); // auto update
},
render: function() {
this.view.render();
return this;
}