mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Provide user feedback when number is invalid

Browse source 
While typing a number, the new contact element is faded out. When the
number becomes valid it is opaque. If the element is clicked while
invalid, it displays 'Invalid number' and waits for the input to change
again. A new conversation is only opened if the number is valid.

// FREEBIE
This commit is contained in:
lilia 2015-12-05 19:21:15 -08:00
parent 01593363eb
commit 61a57a753b
4 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
js/views/conversation_search_view.js
View file

@ -5,6 +5,31 @@
'use strict';
window.Whisper = window.Whisper || {};
Whisper.NewContactView = Whisper.View.extend({
templateName: 'new-contact',
className: 'conversation-list-item contact',
events: {
'click': 'validate'
},
initialize: function() {
this.listenTo(this.model, 'change', this.render); // auto update
},
render_attributes: function() {
return {
number: 'Click to create new contact',
title: this.model.getNumber(),
avatar: this.model.getAvatar(),
};
},
validate: function() {
if (this.model.isValid()) {
this.$el.addClass('valid');
} else {
this.$el.removeClass('valid');
}
},
});
Whisper.ConversationSearchView = Whisper.View.extend({
className: 'conversation-search',
initialize: function(options) {
@ -25,7 +50,7 @@
},
events: {
'select .new-contact': 'createConversation',
'click .new-contact': 'createConversation',
},
filterContacts: function(e) {
@ -34,7 +59,9 @@
if (this.maybeNumber(query)) {
this.new_contact_view.model.set('id', query);
this.new_contact_view.render().$el.show();
this.new_contact_view.validate();
this.hideHints();
} else {
this.new_contact_view.$el.hide();
}
@ -55,7 +82,7 @@
this.new_contact_view.$el.hide();
}
// Creates a view to display a new contact
this.new_contact_view = new Whisper.ConversationListItemView({
this.new_contact_view = new Whisper.NewContactView({
el: this.$new_contact,
model: ConversationController.create({
type: 'private',
@ -66,8 +93,7 @@
createConversation: function() {
var conversation = this.new_contact_view.model;
var error = conversation.validate(conversation.attributes);
if (!error) {
if (this.new_contact_view.model.isValid()) {
ConversationController.findOrCreatePrivateById(
this.new_contact_view.model.id
).then(function(conversation) {
@ -75,6 +101,9 @@
this.initNewContact();
this.resetTypeahead();
}.bind(this));
} else {
this.new_contact_view.$('.number').text("Invalid number");
this.$input.focus();
}
},