Refactor RecipientsInputView from NewConversationView
For reuse on group update screen.
This commit is contained in:
lilia
parent
617b7686f7
commit
d20e23402d
7 changed files with 233 additions and 185 deletions
|
|
@ -17,90 +17,27 @@
|
|||
'use strict';
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
var ContactsTypeahead = Backbone.TypeaheadCollection.extend({
|
||||
typeaheadAttributes: [
|
||||
'name',
|
||||
'e164_number',
|
||||
'national_number',
|
||||
'international_number'
|
||||
],
|
||||
database: Whisper.Database,
|
||||
storeName: 'conversations',
|
||||
model: Whisper.Conversation
|
||||
});
|
||||
|
||||
Whisper.ContactPillView = Whisper.View.extend({
|
||||
tagName: 'span',
|
||||
className: 'recipient',
|
||||
events: {
|
||||
'click .remove': 'removeModel'
|
||||
},
|
||||
template: $('#contact_pill').html(),
|
||||
initialize: function() {
|
||||
var error = this.model.validate(this.model.attributes);
|
||||
if (error) {
|
||||
this.$el.addClass('error');
|
||||
}
|
||||
},
|
||||
removeModel: function() {
|
||||
this.$el.trigger('remove', {modelId: this.model.id});
|
||||
this.remove();
|
||||
},
|
||||
render_attributes: function() {
|
||||
return { name: this.model.getTitle() };
|
||||
}
|
||||
});
|
||||
|
||||
Whisper.RecipientListView = Whisper.ListView.extend({
|
||||
itemView: Whisper.ContactPillView
|
||||
});
|
||||
|
||||
Whisper.NewConversationView = Whisper.View.extend({
|
||||
className: 'new-conversation',
|
||||
template: $('#new-conversation').html(),
|
||||
initialize: function() {
|
||||
this.render();
|
||||
this.$group_update = this.$el.find('.new-group-update-form');
|
||||
this.$buttons = this.$el.find('.buttons');
|
||||
this.$input = this.$el.find('input.new-message');
|
||||
this.$new_contact = this.$el.find('.new-contact');
|
||||
|
||||
// Collection of contacts to match user input against
|
||||
this.typeahead = new ContactsTypeahead();
|
||||
this.typeahead.fetch({ conditions: { type: 'private' } });
|
||||
|
||||
// View to display the matched contacts from typeahead
|
||||
this.typeahead_view = new Whisper.ConversationListView({
|
||||
collection : new Whisper.ConversationCollection([], {
|
||||
comparator: function(m) { return m.getTitle(); }
|
||||
})
|
||||
});
|
||||
this.$el.find('.contacts').append(this.typeahead_view.el);
|
||||
|
||||
this.initNewContact();
|
||||
this.$create = this.$el.find('.create');
|
||||
this.$input = this.$el.find('input.search');
|
||||
|
||||
// Group avatar file input
|
||||
this.avatarInput = new Whisper.FileInputView({
|
||||
el: this.$el.find('.group-avatar')
|
||||
});
|
||||
|
||||
// Collection of recipients selected for the new message
|
||||
this.recipients = new Whisper.ConversationCollection([], {
|
||||
comparator: false
|
||||
});
|
||||
// View to display the selected recipients
|
||||
this.recipients_view = new Whisper.RecipientListView({
|
||||
collection: this.recipients,
|
||||
el: this.$el.find('.recipients')
|
||||
});
|
||||
this.recipients_view = new Whisper.RecipientsInputView();
|
||||
this.$el.find('.scrollable').append(this.recipients_view.el);
|
||||
this.listenTo(this.getRecipients(), 'add', this.updateControls);
|
||||
this.listenTo(this.getRecipients(), 'remove', this.updateControls);
|
||||
},
|
||||
|
||||
events: {
|
||||
'change input.new-message': 'filterContacts',
|
||||
'keyup input.new-message': 'filterContacts',
|
||||
'select .new-contact': 'addNewRecipient',
|
||||
'select .contacts': 'addRecipient',
|
||||
'remove .recipient': 'removeRecipient',
|
||||
'click .create': 'create',
|
||||
'click .back': 'goBack',
|
||||
'keyup': 'keyup'
|
||||
|
|
@ -116,51 +53,17 @@
|
|||
this.trigger('back');
|
||||
},
|
||||
|
||||
initNewContact: function() {
|
||||
if (this.new_contact) {
|
||||
this.new_contact.undelegateEvents();
|
||||
this.new_contact.$el.hide();
|
||||
}
|
||||
// Creates a view to display a new contact
|
||||
this.new_contact = new Whisper.ConversationListItemView({
|
||||
el: this.$new_contact,
|
||||
model: new Whisper.Conversation({
|
||||
active_at: null,
|
||||
type: 'private',
|
||||
newContact: true
|
||||
})
|
||||
}).render();
|
||||
},
|
||||
|
||||
addNewRecipient: function(e, data) {
|
||||
this.recipients.add(this.new_contact.model);
|
||||
this.initNewContact();
|
||||
this.resetTypeahead();
|
||||
this.updateControls();
|
||||
},
|
||||
|
||||
addRecipient: function(e, data) {
|
||||
this.recipients.add(this.typeahead.remove(data.modelId));
|
||||
this.filterContacts();
|
||||
this.updateControls();
|
||||
},
|
||||
|
||||
removeRecipient: function(e, data) {
|
||||
var model = this.recipients.remove(data.modelId);
|
||||
if (!model.get('newContact')) {
|
||||
this.typeahead.add(model);
|
||||
}
|
||||
this.filterContacts();
|
||||
this.updateControls();
|
||||
getRecipients: function() {
|
||||
return this.recipients_view.recipients;
|
||||
},
|
||||
|
||||
updateControls: function() {
|
||||
if (this.recipients.length > 0) {
|
||||
this.$buttons.slideDown();
|
||||
if (this.getRecipients().length > 0) {
|
||||
this.$create.show();
|
||||
} else {
|
||||
this.$buttons.slideUp();
|
||||
this.$create.hide();
|
||||
}
|
||||
if (this.recipients.length > 1) {
|
||||
if (this.getRecipients().length > 1) {
|
||||
this.$group_update.slideDown();
|
||||
} else {
|
||||
this.$group_update.slideUp();
|
||||
|
|
@ -178,7 +81,7 @@
|
|||
|
||||
return;
|
||||
}
|
||||
if (this.recipients.length > 1) {
|
||||
if (this.getRecipients().length > 1) {
|
||||
this.createGroup();
|
||||
} else {
|
||||
this.createConversation();
|
||||
|
|
@ -188,7 +91,7 @@
|
|||
createConversation: function() {
|
||||
var conversation = new Whisper.Conversation({
|
||||
active_at: null,
|
||||
id: this.recipients.at(0).id,
|
||||
id: this.getRecipients().at(0).id,
|
||||
type: 'private'
|
||||
});
|
||||
conversation.fetch().then(function() {
|
||||
|
|
@ -214,7 +117,7 @@
|
|||
type: 'group',
|
||||
name: name,
|
||||
avatar: avatarFiles[0],
|
||||
members: this.recipients.pluck('id')
|
||||
members: this.getRecipients().pluck('id')
|
||||
};
|
||||
return textsecure.messaging.createGroup(
|
||||
attributes.members, attributes.name, attributes.avatar
|
||||
|
|
@ -228,44 +131,11 @@
|
|||
}.bind(this));
|
||||
},
|
||||
|
||||
resetTypeahead: function() {
|
||||
this.new_contact.$el.hide();
|
||||
this.$input.val('').focus();
|
||||
this.typeahead_view.collection.reset(this.typeahead.models);
|
||||
},
|
||||
|
||||
reset: function() {
|
||||
this.$buttons.hide();
|
||||
this.$create.hide();
|
||||
this.$group_update.hide();
|
||||
this.typeahead.add(
|
||||
this.recipients.filter(function(model) {
|
||||
return !model.get('newContact');
|
||||
})
|
||||
);
|
||||
this.recipients.reset([]);
|
||||
this.resetTypeahead();
|
||||
this.recipients_view.reset();
|
||||
},
|
||||
|
||||
filterContacts: function() {
|
||||
var query = this.$input.val();
|
||||
if (query.length) {
|
||||
if (this.maybeNumber(query)) {
|
||||
this.new_contact.model.set('id', query);
|
||||
this.new_contact.render().$el.show();
|
||||
} else {
|
||||
this.new_contact.$el.hide();
|
||||
}
|
||||
this.typeahead_view.collection.reset(
|
||||
this.typeahead.typeahead(query)
|
||||
);
|
||||
} else {
|
||||
this.resetTypeahead();
|
||||
}
|
||||
},
|
||||
|
||||
maybeNumber: function(number) {
|
||||
return number.match(/^\+?[0-9]*$/);
|
||||
}
|
||||
});
|
||||
|
||||
})();
|
||||
|
|
|
|||
174
js/views/recipients_input_view.js
Normal file
174
js/views/recipients_input_view.js
Normal file
|
|
@ -0,0 +1,174 @@
|
|||
/* 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';
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
var ContactsTypeahead = Backbone.TypeaheadCollection.extend({
|
||||
typeaheadAttributes: [
|
||||
'name',
|
||||
'e164_number',
|
||||
'national_number',
|
||||
'international_number'
|
||||
],
|
||||
database: Whisper.Database,
|
||||
storeName: 'conversations',
|
||||
model: Whisper.Conversation
|
||||
});
|
||||
|
||||
Whisper.ContactPillView = Whisper.View.extend({
|
||||
tagName: 'span',
|
||||
className: 'recipient',
|
||||
events: {
|
||||
'click .remove': 'removeModel'
|
||||
},
|
||||
template: $('#contact_pill').html(),
|
||||
initialize: function() {
|
||||
var error = this.model.validate(this.model.attributes);
|
||||
if (error) {
|
||||
this.$el.addClass('error');
|
||||
}
|
||||
},
|
||||
removeModel: function() {
|
||||
this.$el.trigger('remove', {modelId: this.model.id});
|
||||
this.remove();
|
||||
},
|
||||
render_attributes: function() {
|
||||
return { name: this.model.getTitle() };
|
||||
}
|
||||
});
|
||||
|
||||
Whisper.RecipientListView = Whisper.ListView.extend({
|
||||
itemView: Whisper.ContactPillView
|
||||
});
|
||||
|
||||
Whisper.RecipientsInputView = Whisper.View.extend({
|
||||
className: 'recipients-input',
|
||||
template: $('#recipients-input').html(),
|
||||
initialize: function() {
|
||||
this.render();
|
||||
this.$input = this.$el.find('input.search');
|
||||
this.$new_contact = this.$el.find('.new-contact');
|
||||
|
||||
// Collection of recipients selected for the new message
|
||||
this.recipients = new Whisper.ConversationCollection([], {
|
||||
comparator: false
|
||||
});
|
||||
|
||||
// View to display the selected recipients
|
||||
this.recipients_view = new Whisper.RecipientListView({
|
||||
collection: this.recipients,
|
||||
el: this.$el.find('.recipients')
|
||||
});
|
||||
|
||||
// Collection of contacts to match user input against
|
||||
this.typeahead = new ContactsTypeahead();
|
||||
this.typeahead.fetch({ conditions: { type: 'private' } });
|
||||
|
||||
// View to display the matched contacts from typeahead
|
||||
this.typeahead_view = new Whisper.ConversationListView({
|
||||
collection : new Whisper.ConversationCollection([], {
|
||||
comparator: function(m) { return m.getTitle(); }
|
||||
})
|
||||
});
|
||||
this.$el.find('.contacts').append(this.typeahead_view.el);
|
||||
|
||||
this.initNewContact();
|
||||
},
|
||||
|
||||
events: {
|
||||
'change input.search': 'filterContacts',
|
||||
'keyup input.search': 'filterContacts',
|
||||
'select .new-contact': 'addNewRecipient',
|
||||
'select .contacts': 'addRecipient',
|
||||
'remove .recipient': 'removeRecipient',
|
||||
},
|
||||
|
||||
filterContacts: function(e) {
|
||||
var query = this.$input.val();
|
||||
if (query.length) {
|
||||
if (this.maybeNumber(query)) {
|
||||
this.new_contact.model.set('id', query);
|
||||
this.new_contact.render().$el.show();
|
||||
} else {
|
||||
this.new_contact.$el.hide();
|
||||
}
|
||||
this.typeahead_view.collection.reset(
|
||||
this.typeahead.typeahead(query)
|
||||
);
|
||||
} else {
|
||||
this.resetTypeahead();
|
||||
}
|
||||
},
|
||||
|
||||
initNewContact: function() {
|
||||
if (this.new_contact) {
|
||||
this.new_contact.undelegateEvents();
|
||||
this.new_contact.$el.hide();
|
||||
}
|
||||
// Creates a view to display a new contact
|
||||
this.new_contact = new Whisper.ConversationListItemView({
|
||||
el: this.$new_contact,
|
||||
model: new Whisper.Conversation({
|
||||
active_at: null,
|
||||
type: 'private',
|
||||
newContact: true
|
||||
})
|
||||
}).render();
|
||||
},
|
||||
|
||||
addNewRecipient: function(e, data) {
|
||||
this.recipients.add(this.new_contact.model);
|
||||
this.initNewContact();
|
||||
this.resetTypeahead();
|
||||
},
|
||||
|
||||
addRecipient: function(e, data) {
|
||||
this.recipients.add(this.typeahead.remove(data.modelId));
|
||||
this.filterContacts();
|
||||
},
|
||||
|
||||
removeRecipient: function(e, data) {
|
||||
var model = this.recipients.remove(data.modelId);
|
||||
if (!model.get('newContact')) {
|
||||
this.typeahead.add(model);
|
||||
}
|
||||
this.filterContacts();
|
||||
},
|
||||
|
||||
reset: function() {
|
||||
this.typeahead.add(
|
||||
this.recipients.filter(function(model) {
|
||||
return !model.get('newContact');
|
||||
})
|
||||
);
|
||||
this.recipients.reset([]);
|
||||
this.resetTypeahead();
|
||||
},
|
||||
|
||||
resetTypeahead: function() {
|
||||
this.new_contact.$el.hide();
|
||||
this.$input.val('').focus();
|
||||
this.typeahead_view.collection.reset(this.typeahead.models);
|
||||
},
|
||||
|
||||
|
||||
maybeNumber: function(number) {
|
||||
return number.match(/^\+?[0-9]*$/);
|
||||
}
|
||||
});
|
||||
|
||||
})();
|
||||
Loading…
Add table
Add a link
Reference in a new issue