forked from OpenNeo/impress
also strip autofilter from query on page reload
This commit is contained in:
parent
44ff466a64
commit
a8a02cca01
1 changed files with 24 additions and 18 deletions
|
@ -1194,24 +1194,7 @@ View.Search = function (wardrobe) {
|
||||||
help_el.hide();
|
help_el.hide();
|
||||||
no_results_el.hide();
|
no_results_el.hide();
|
||||||
current_query = request.query || '';
|
current_query = request.query || '';
|
||||||
var human_query = typeof current_query === 'string' ? current_query : '';
|
updateQuery();
|
||||||
var autofilterClause = buildAutofilterClause();
|
|
||||||
var autofilterPresent = false;
|
|
||||||
human_query = human_query.split(/\s+/).filter(function(clause) {
|
|
||||||
if (clause.toLowerCase() === autofilterClause) {
|
|
||||||
autofilterPresent = true;
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}).join(' ');
|
|
||||||
if (autofilterPresent) {
|
|
||||||
$('#preview-search-autofilter').attr('checked', 'checked');
|
|
||||||
} else {
|
|
||||||
$('#preview-search-autofilter').removeAttr('checked');
|
|
||||||
}
|
|
||||||
input_el.val(human_query);
|
|
||||||
no_results_span.text(human_query);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
wardrobe.search.bind('updatePagination', function (current_page, total_pages) {
|
wardrobe.search.bind('updatePagination', function (current_page, total_pages) {
|
||||||
|
@ -1328,6 +1311,27 @@ View.Search = function (wardrobe) {
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateQuery() {
|
||||||
|
var human_query = typeof current_query === 'string' ? current_query : '';
|
||||||
|
var autofilterClause = buildAutofilterClause();
|
||||||
|
var autofilterPresent = false;
|
||||||
|
human_query = human_query.split(/\s+/).filter(function(clause) {
|
||||||
|
if (clause.toLowerCase() === autofilterClause) {
|
||||||
|
autofilterPresent = true;
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}).join(' ');
|
||||||
|
if (autofilterPresent) {
|
||||||
|
$('#preview-search-autofilter').attr('checked', 'checked');
|
||||||
|
} else {
|
||||||
|
$('#preview-search-autofilter').removeAttr('checked');
|
||||||
|
}
|
||||||
|
input_el.val(human_query);
|
||||||
|
no_results_span.text(human_query);
|
||||||
|
}
|
||||||
|
|
||||||
var autofilterLabels = $('label[for=preview-search-autofilter],' +
|
var autofilterLabels = $('label[for=preview-search-autofilter],' +
|
||||||
'label[for=advanced-search-autofilter]');
|
'label[for=advanced-search-autofilter]');
|
||||||
var autofilterSpeciesFields = autofilterLabels.find('.species');
|
var autofilterSpeciesFields = autofilterLabels.find('.species');
|
||||||
|
@ -1341,6 +1345,8 @@ View.Search = function (wardrobe) {
|
||||||
|
|
||||||
var colorName = attrs.color[petType.color_id].name;
|
var colorName = attrs.color[petType.color_id].name;
|
||||||
autofilterColorFields.text(colorName);
|
autofilterColorFields.text(colorName);
|
||||||
|
|
||||||
|
updateQuery();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue