always show search results table and clear results filter on search

This commit is contained in:
kaso17 2017-02-02 19:23:18 +01:00
parent ba14fab0a1
commit 132fa71e35
1 changed files with 70 additions and 65 deletions

View File

@ -645,6 +645,7 @@ function showSearch(selectedIndexer) {
$("#modals").append(releaseDialog);
releaseDialog.on('shown.bs.modal', function () {
updateSearchResultTable($('#searchResults'), []);
releaseDialog.find('#searchquery').focusWithoutScrolling();
});
@ -693,17 +694,33 @@ function showSearch(selectedIndexer) {
Category: releaseDialog.find('#searchCategory').val(),
Tracker: releaseDialog.find('#searchTracker').val().replace("'", "").replace("'", ""),
};
$('#searchResults').empty();
$('#jackett-search-perform').html($('#spinner').html());
var jqxhr = $.post("search", queryObj, function (data) {
$('#jackett-search-perform').html('Search trackers');
var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
var results = $('#searchResults');
results.html($(resultsTemplate(data)));
results.find('tr.jackett-search-results-row').each(function () { updateReleasesRow(this); });
var searchResults = $('#searchResults');
searchResults.empty();
var datatable = updateSearchResultTable(searchResults, data).search('').columns().search('').draw();
searchResults.find('div.dataTables_filter input').focusWithoutScrolling();
}).fail(function () {
$('#jackett-search-perform').html('Search trackers');
doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
});
});
results.find('table').DataTable(
var searchTracker = releaseDialog.find("#searchTracker");
if (selectedIndexer)
searchTracker.val(selectedIndexer);
searchTracker.trigger("change");
releaseDialog.modal("show");
}
function updateSearchResultTable(element, results) {
var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
element.html($(resultsTemplate(results)));
element.find('tr.jackett-search-results-row').each(function () { updateReleasesRow(this); });
var datatable = element.find('table').DataTable(
{
"stateSave": true,
"pageLength": 20,
@ -760,19 +777,7 @@ function showSearch(selectedIndexer) {
});
}
});
results.find('div.dataTables_filter input').focusWithoutScrolling();
}).fail(function () {
$('#jackett-search-perform').html('Search trackers');
doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
});
});
var searchTracker = releaseDialog.find("#searchTracker");
if (selectedIndexer)
searchTracker.val(selectedIndexer);
searchTracker.trigger("change");
releaseDialog.modal("show");
return datatable;
}
function bindUIButtons() {