forked from OpenNeo/impress
advanced search queries now appear in hash
This commit is contained in:
parent
9cae578ef7
commit
bce7f6b383
2 changed files with 14 additions and 15 deletions
|
@ -408,11 +408,13 @@ View.Hash = function (wardrobe) {
|
||||||
|
|
||||||
wardrobe.search.bind('updateRequest', function (request) {
|
wardrobe.search.bind('updateRequest', function (request) {
|
||||||
if(request.offset != data.search_offset || request.query != data.search) {
|
if(request.offset != data.search_offset || request.query != data.search) {
|
||||||
|
if (typeof request.query === "string") {
|
||||||
changeQuery({
|
changeQuery({
|
||||||
search_offset: request.offset,
|
search_offset: request.offset,
|
||||||
search: request.query
|
search: request.query
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1179,21 +1181,15 @@ View.Search = function (wardrobe) {
|
||||||
fit();
|
fit();
|
||||||
});
|
});
|
||||||
|
|
||||||
function updateQuery(query) {
|
|
||||||
current_query = query || '';
|
|
||||||
var human_query = typeof query === 'string' ? query : '';
|
|
||||||
input_el.val(human_query);
|
|
||||||
no_results_span.text(human_query);
|
|
||||||
}
|
|
||||||
|
|
||||||
wardrobe.search.bind('updateQuery', updateQuery);
|
|
||||||
|
|
||||||
wardrobe.search.bind('updateRequest', function (request) {
|
wardrobe.search.bind('updateRequest', function (request) {
|
||||||
last_request = request;
|
last_request = request;
|
||||||
error_el.hide('fast');
|
error_el.hide('fast');
|
||||||
help_el.hide();
|
help_el.hide();
|
||||||
no_results_el.hide();
|
no_results_el.hide();
|
||||||
updateQuery(request.query);
|
current_query = request.query || '';
|
||||||
|
var human_query = typeof current_query === 'string' ? current_query : '';
|
||||||
|
input_el.val(human_query);
|
||||||
|
no_results_span.text(human_query);
|
||||||
clear_el.toggle(!!request.query);
|
clear_el.toggle(!!request.query);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1330,8 +1330,11 @@ function Wardrobe() {
|
||||||
this.request = {};
|
this.request = {};
|
||||||
|
|
||||||
function itemsOnLoad(items, total_pages, page, query) {
|
function itemsOnLoad(items, total_pages, page, query) {
|
||||||
|
if(query !== search.request.query) {
|
||||||
|
search.request.query = query;
|
||||||
|
search.events.trigger('updateRequest', search.request);
|
||||||
|
}
|
||||||
search.events.trigger('updateItems', items);
|
search.events.trigger('updateItems', items);
|
||||||
search.events.trigger('updateQuery', query);
|
|
||||||
search.events.trigger('updatePagination', page, total_pages);
|
search.events.trigger('updatePagination', page, total_pages);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue