Bug fixes for group create flow

Fallout from layout change.

// FREEBIE
This commit is contained in:
lilia 2015-08-26 17:11:01 -07:00
parent 39d13d5e45
commit 992dfa5b20
5 changed files with 12 additions and 21 deletions

View File

@ -125,7 +125,8 @@
type: 'group',
name: name,
avatar: avatarFile,
members: members
members: members,
active_at: Date.now()
};
var group = new Whisper.Conversation(attributes);
group.save().then(function() {
@ -160,6 +161,7 @@
reset: function() {
this.delegateEvents();
this.avatarInput.delegateEvents();
this.$create.hide();
this.$('.new-group-update-form .name').val('');
this.$group_update.hide();

View File

@ -159,6 +159,9 @@
},
reset: function() {
this.delegateEvents();
this.typeahead_view.delegateEvents();
this.recipients_view.delegateEvents();
this.typeahead.add(
this.recipients.filter(function(model) {
return !model.get('newContact');

View File

@ -23,10 +23,6 @@
}
.key-verification {
.container {
height: 100%;
overflow: auto;
}
p {
padding: 1em;
}
@ -39,11 +35,6 @@
.message-detail {
background: $grey_l;
.container {
height: 100%;
overflow: auto;
}
.message-container {
background: white;
padding: 1em 0;
@ -93,7 +84,7 @@
}
.group-member-list,
.new-group-update-form {
.conversation + .new-group-update-form {
height: 100%;
.container {

View File

@ -6,7 +6,8 @@
.new-conversation, .inbox, .gutter {
height: 100%;
}
.scrollable {
.container, .scrollable {
height: 100%;
overflow: auto;
}

View File

@ -336,7 +336,7 @@ img.emoji {
.new-conversation, .inbox, .gutter {
height: 100%; }
.scrollable {
.container, .scrollable {
height: 100%;
overflow: auto; }
@ -469,9 +469,6 @@ input.search {
.conversation, .message-list, .message-detail, .key-verification {
height: 100%; }
.key-verification .container {
height: 100%;
overflow: auto; }
.key-verification p {
padding: 1em; }
.key-verification .key {
@ -480,9 +477,6 @@ input.search {
.message-detail {
background: #f3f3f3; }
.message-detail .container {
height: 100%;
overflow: auto; }
.message-detail .message-container {
background: white;
padding: 1em 0; }
@ -517,10 +511,10 @@ input.search {
font-size: smaller; }
.group-member-list,
.new-group-update-form {
.conversation + .new-group-update-form {
height: 100%; }
.group-member-list .container,
.new-group-update-form .container {
.conversation + .new-group-update-form .container {
height: calc(100% - 36px); }
.new-group-update-form .scrollable {