Skip to content

Autocomplete search: Improvements #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 9, 2015
Merged

Autocomplete search: Improvements #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69ca8e5
Improve UI of the autocomplete search
ElPicador Dec 9, 2015
b656b50
Search: Enlarge the autocomplete menu
ElPicador Dec 9, 2015
7b026d2
Search: Nicer handle of snippets
ElPicador Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 47 additions & 9 deletions resources/javascript/searchbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,40 @@
categories[suggestion._tags[0]].push(suggestion)
});

categories = $.map(Object.keys(categories).sort(), function(categoryName) {
var items = categories[categoryName];
items[0].isCategoryHeader = true;
items[0].categoryName = capitalize(categoryName);
var categoriesWithSubCategories = {}
$.each(categories, function(categoryName, suggestions) {
var subCategories = {}
suggestions.forEach(function(suggestion) {
var highlight = suggestion._highlightResult || {};
var title = (highlight.title || {}).value
title = title || suggestion.title
title = title || categoryName
subCategories[title] = subCategories[title] || []
subCategories[title].push(suggestion)
});
categoriesWithSubCategories[categoryName] = subCategories;
});

var suggestionsSorted = []
Object.keys(categoriesWithSubCategories).sort().forEach(function(categoryName) {
var subCategories = categoriesWithSubCategories[categoryName];
var firstInCategory = true;
Object.keys(subCategories).sort().forEach(function(subCategoryName) {
var items = subCategories[subCategoryName];
items[0].isSubCategoryHeader = true;
items[0].subCategoryName = capitalize(subCategoryName);

if(firstInCategory) {
items[0].isCategoryHeader = true;
items[0].categoryName = capitalize(categoryName);
firstInCategory = false;
}

return items;
suggestionsSorted = suggestionsSorted.concat(items);
});
});
callback(categories);

callback(suggestionsSorted);
});
},
name: 'a',
Expand All @@ -54,21 +80,33 @@
if(suggestion.isCategoryHeader) {
html.push('<div class="suggestion-category">' + suggestion.categoryName + '</div>');
}
if(suggestion.isSubCategoryHeader) {
html.push('<div class="suggestion-subcategory">' + suggestion.subCategoryName + '</div>');
} else {
html.push('<div class="suggestion-empty-subcategory">&nbsp;</div>');
}

var highlight = suggestion._highlightResult || {};
var snippet = suggestion._snippetResult || {};
var title = highlight.title.value;
var text = '';
for(var i = 0 ; i < ATTRIBUTES.length ; i++) {
if(highlight[ATTRIBUTES[i]] !== undefined) {
text = highlight[ATTRIBUTES[i]].value;
text = (snippet[ATTRIBUTES[i]] || {}).value || text;
var snippet = (snippet[ATTRIBUTES[i]] || {}).value
if(snippet) {
if(snippet.charAt(0) === snippet.charAt(0).toLowerCase()) {
snippet = "…&nbsp;" + snippet;
}
if(['.', '!', '?'].indexOf(snippet.charAt(snippet.length - 1)) === -1) {
snippet = snippet + "&nbsp;…";
}
}
text = snippet || text;
break;
}
}

html.push(' <div class="suggestion-content">');
html.push(' <div class="suggestion-title">' + title + '</div>');
html.push(' <div class="suggestion-text">' + text + '</div>');
html.push(' </div>');
return html.join(' ');
Expand Down
31 changes: 24 additions & 7 deletions resources/stylesheets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ div#pop-up-arrow {
}

.algolia-autocomplete .aa-dropdown-menu {
width: 500px;
width: 550px;
background-color: #fff;
border: 1px solid #404040;
margin-top: 2px;
margin-left: -319px;
margin-left: -369px;
padding: 1px;
}

Expand All @@ -246,8 +246,9 @@ div#pop-up-arrow {
}

.algolia-autocomplete .aa-dropdown-menu .aa-suggestion.aa-cursor {
background-color: #B2D7FF;
background-color: #EEEEEE;
}

.algolia-autocomplete .aa-dropdown-menu .aa-suggestion em {
font-weight: bold;
font-style: normal;
Expand All @@ -263,14 +264,30 @@ div#pop-up-arrow {
cursor: default;
}

.aa-suggestion .suggestion-content div {
.aa-suggestion > div:not(.suggestion-category) {
display: table-cell;
padding: 5px 7px;
padding: 5px;
}

.aa-suggestion .suggestion-content div:first-child {
.aa-suggestion.aa-cursor .suggestion-empty-subcategory, .aa-suggestion.aa-cursor .suggestion-subcategory {
background-color: white;
}

.aa-suggestion .suggestion-empty-subcategory, .aa-suggestion .suggestion-subcategory {
border-right: 2px solid #DE3423;
width: 180px;
width: 150px;
font-weight: 500;
z-index: 1000;
text-align: right;
}

.aa-suggestion .suggestion-content {
width: 376px;
border-top: 1px #999 solid;
}

.aa-suggestion .suggestion-category ~ .suggestion-content {
border-top: none;
}

.aa-dropdown-menu .branding-footer {
Expand Down