1
0
Fork 0

fix(DOM): potential issue with simple layout if there is lvl0, lvl2 but no lvl1

This commit is contained in:
Maxime Locqueville 2016-06-21 23:54:05 +02:00
parent c806c46766
commit 57c0101459
2 changed files with 9 additions and 5 deletions

View file

@ -198,6 +198,7 @@ class DocSearch {
]).join('<span class="aa-suggestion-title-separator"> </span>');
let text = utils.getSnippetedValue(hit, 'content');
let isTextOrSubcatoryNonEmpty = (subcategory && subcategory != "") || (displayTitle && displayTitle != "");
let isLvl1EmptyOrDuplicate = ! subcategory || subcategory == '' || subcategory == category;
let isLvl2 = displayTitle && displayTitle != '' && displayTitle != subcategory;
let isLvl1 = !isLvl2 && (subcategory && subcategory != '' && subcategory != category);
let isLvl0 = !isLvl1 && !isLvl2;
@ -206,6 +207,7 @@ class DocSearch {
isLvl0: isLvl0,
isLvl1: isLvl1,
isLvl2: isLvl2,
isLvl1EmptyOrDuplicate: isLvl1EmptyOrDuplicate,
isCategoryHeader: hit.isCategoryHeader,
isSubCategoryHeader: hit.isSubCategoryHeader,
isTextOrSubcatoryNonEmpty: isTextOrSubcatoryNonEmpty,

View file

@ -36,12 +36,14 @@ let templates = {
<div class="${suggestionPrefix}--category-header">
{{^isLvl0}}
<span class="${suggestionPrefix}--category-header-lvl0 ${suggestionPrefix}--category-header-item">{{{category}}}</span>
{{^isLvl1}}
{{^isLvl1EmptyOrDuplicate}}
<span class="${suggestionPrefix}--category-header-lvl1 ${suggestionPrefix}--category-header-item">
{{{subcategory}}}
</span>
{{/isLvl1EmptyOrDuplicate}}
{{/isLvl1}}
{{/isLvl0}}
{{^isLvl1}}
<span class="${suggestionPrefix}--category-header-lvl1 ${suggestionPrefix}--category-header-item">
{{{subcategory}}}
</span>
{{/isLvl1}}
<div class="${suggestionPrefix}--title ${suggestionPrefix}--category-header-item">
{{#isLvl2}}