Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix quirks with the add-contact dropdown

Browse Source
This commit is contained in:
JC Brand 2013-04-20 22:55:22 +02:00
parent 6de997681b
commit d937d32d3b
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
converse.css
View File

@ -240,7 +240,6 @@ a.subscribe-to-user {
dl.add-converse-contact { dl.add-converse-contact {
margin: 0 0 0 0.5em; margin: 0 0 0 0.5em;
padding-top: 3px;
z-index: 21; z-index: 21;
background: url('images/add_icon.png') no-repeat 3px; background: url('images/add_icon.png') no-repeat 3px;
} }
@ -249,6 +248,11 @@ dt#xmpp-contact-search {
padding-top: 3px; padding-top: 3px;
} }
.fancy-dropdown {
border:1px solid #ddd;
height: 22px;
}
.fancy-dropdown a.choose-xmpp-status, .fancy-dropdown a.choose-xmpp-status,
.fancy-dropdown a.toggle-xmpp-contact-form { .fancy-dropdown a.toggle-xmpp-contact-form {
text-shadow: 0 1px 0 rgba(250, 250, 250, 1); text-shadow: 0 1px 0 rgba(250, 250, 250, 1);
@ -631,12 +635,7 @@ form.add-xmpp-contact {
} }
form.add-xmpp-contact input { form.add-xmpp-contact input {
width: 130px; width: 125px;
}
.fancy-dropdown {
border:1px solid #ddd;
height: 22px;
} }
.dropdown dt a span { .dropdown dt a span {

13
converse.js
View File

@ -595,8 +595,7 @@
'<dt id="xmpp-contact-search" class="fancy-dropdown">' + '<dt id="xmpp-contact-search" class="fancy-dropdown">' +
'<a class="toggle-xmpp-contact-form" href="#" title="Click to add new chat contacts">Add a contact</a>' + '<a class="toggle-xmpp-contact-form" href="#" title="Click to add new chat contacts">Add a contact</a>' +
'</dt>' + '</dt>' +
'<dd class="search-xmpp" style="display:none"><ul>' + '<dd class="search-xmpp" style="display:none"><ul></ul></dd>' +
'</ul></dd>' +
'</dl>' '</dl>'
), ),
@ -622,13 +621,17 @@
} else { } else {
markup = this.add_contact_template(); markup = this.add_contact_template();
} }
this.$el.find('#xmpp-contact-search').siblings('.search-xmpp').append(markup); this.$el.find('.search-xmpp ul').append(markup);
return this; return this;
}, },
toggleContactForm: function (ev) { toggleContactForm: function (ev) {
ev.preventDefault(); ev.preventDefault();
this.$el.find('.search-xmpp').toggle().find('input.username').focus(); this.$el.find('.search-xmpp').toggle('fast', function () {
if ($(this).is(':visible')) {
$(this).find('input.username').focus();
}
});
}, },
searchContacts: function (ev) { searchContacts: function (ev) {
@ -637,7 +640,7 @@
var $results_el = $('#found-users'); var $results_el = $('#found-users');
$(data).each(function (idx, obj) { $(data).each(function (idx, obj) {
if ($results_el.children().length) { if ($results_el.children().length) {
$results_el.empty(); $results_el.empty();
} }
$results_el.append( $results_el.append(
$('<li></li>') $('<li></li>')