Group avatars
This commit is contained in:
parent
d52db8fe6f
commit
3d6c251fd1
11 changed files with 87 additions and 36 deletions
|
@ -131,15 +131,16 @@
|
|||
return -m.get('timestamp');
|
||||
},
|
||||
|
||||
createGroup: function(recipients, name) {
|
||||
createGroup: function(recipients, name, avatar) {
|
||||
var attributes = {};
|
||||
attributes = {
|
||||
name : name,
|
||||
members : recipients,
|
||||
type : 'group',
|
||||
avatar : avatar
|
||||
};
|
||||
var conversation = this.add(attributes, {merge: true});
|
||||
return textsecure.messaging.createGroup(recipients, name).then(function(groupId) {
|
||||
return textsecure.messaging.createGroup(recipients, name, avatar).then(function(groupId) {
|
||||
conversation.save({
|
||||
id : getString(groupId),
|
||||
groupId : getString(groupId)
|
||||
|
|
41
js/views/attachment_view.js
Normal file
41
js/views/attachment_view.js
Normal file
|
@ -0,0 +1,41 @@
|
|||
/* vim: ts=4:sw=4:expandtab
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
Whisper.AttachmentView = Backbone.View.extend({
|
||||
tagName: "img",
|
||||
encode: function () {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var blob = new Blob([this.model.data], { type: this.model.contentType });
|
||||
var FR = new FileReader();
|
||||
FR.onload = function(e) {
|
||||
resolve(e.target.result);
|
||||
};
|
||||
FR.onerror = reject;
|
||||
FR.readAsDataURL(blob);
|
||||
}.bind(this));
|
||||
},
|
||||
render: function() {
|
||||
this.encode().then(function(base64) {
|
||||
this.$el.attr('src', base64);
|
||||
this.$el.trigger('update');
|
||||
}.bind(this));
|
||||
return this;
|
||||
}
|
||||
});
|
||||
|
||||
})();
|
|
@ -32,11 +32,15 @@ var Whisper = Whisper || {};
|
|||
this.$el.html(
|
||||
Mustache.render(this.template, {
|
||||
contact_name: this.model.get('name') || this.model.get('members') || this.model.id,
|
||||
contact_avatar: this.model.get('image'),
|
||||
last_message: this.model.get('lastMessage'),
|
||||
last_message_timestamp: moment(this.model.get('timestamp')).format('MMM D')
|
||||
})
|
||||
);
|
||||
if (this.model.get('avatar')) {
|
||||
this.$el.find('.avatar').append(
|
||||
new Whisper.AttachmentView({model: this.model.get('avatar')}).render().el
|
||||
);
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -14,7 +14,9 @@ var Whisper = Whisper || {};
|
|||
},
|
||||
|
||||
addThumb: function(e) {
|
||||
this.$el.append($('<img>').attr( "src", e.target.result ));
|
||||
this.$el.append(
|
||||
$('<img>').attr( "src", e.target.result ).addClass('preview')
|
||||
);
|
||||
},
|
||||
|
||||
previewImages: function() {
|
||||
|
|
|
@ -16,28 +16,6 @@
|
|||
(function () {
|
||||
'use strict';
|
||||
|
||||
var AttachmentView = Backbone.View.extend({
|
||||
tagName: "img",
|
||||
encode: function () {
|
||||
return new Promise(function(resolve, reject) {
|
||||
var blob = new Blob([this.model.data], { type: this.model.contentType });
|
||||
var FR = new FileReader();
|
||||
FR.onload = function(e) {
|
||||
resolve(e.target.result);
|
||||
};
|
||||
FR.onerror = reject;
|
||||
FR.readAsDataURL(blob);
|
||||
}.bind(this));
|
||||
},
|
||||
render: function() {
|
||||
this.encode().then(function(base64) {
|
||||
this.$el.attr('src', base64);
|
||||
this.$el.trigger('update');
|
||||
}.bind(this));
|
||||
return this;
|
||||
}
|
||||
});
|
||||
|
||||
var ErrorView = Backbone.View.extend({
|
||||
className: 'error',
|
||||
events: {
|
||||
|
@ -90,7 +68,7 @@
|
|||
|
||||
this.$el.find('.attachments').append(
|
||||
this.model.get('attachments').map(function(attachment) {
|
||||
return new AttachmentView({model: attachment}).render().el;
|
||||
return new Whisper.AttachmentView({model: attachment}).render().el;
|
||||
})
|
||||
);
|
||||
|
||||
|
|
|
@ -26,7 +26,10 @@ var Whisper = Whisper || {};
|
|||
this.$el.html($(Mustache.render(this.template)));
|
||||
this.input = this.$el.find('input.number');
|
||||
new Whisper.GroupRecipientsInputView({el: this.$el.find('input.numbers')}).$el.appendTo(this.$el);
|
||||
this.fileInput = new Whisper.FileInputView({el: this.$el.find('.attachments')});
|
||||
this.avatarInput = new Whisper.FileInputView({el: this.$el.find('.group-avatar')});
|
||||
},
|
||||
|
||||
events: {
|
||||
'submit .send': 'send',
|
||||
'close': 'remove'
|
||||
|
@ -36,12 +39,20 @@ var Whisper = Whisper || {};
|
|||
e.preventDefault();
|
||||
var numbers = this.$el.find('input.numbers').val().split(',');
|
||||
var name = this.$el.find('input.name').val();
|
||||
var message_input = this.$el.find('input.send-message');
|
||||
var message = message_input.val();
|
||||
var view = this;
|
||||
this.collection.createGroup(numbers, name).then(function(convo){
|
||||
convo.sendMessage(view.$el.find('input.send-message').val());
|
||||
view.remove();
|
||||
convo.trigger('render');
|
||||
});
|
||||
if (message.length > 0 || this.fileInput.hasFiles()) {
|
||||
this.avatarInput.getFiles().then(function(avatar_files) {
|
||||
view.collection.createGroup(numbers, name, avatar_files[0]).then(function(convo){
|
||||
view.fileInput.getFiles().then(function(attachments) {
|
||||
convo.sendMessage(view.$el.find('input.send-message').val());
|
||||
});
|
||||
convo.trigger('render');
|
||||
});
|
||||
});
|
||||
}
|
||||
this.remove();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue