From eaf84e201fad74cf0225ad46ce6ad6865615fea3 Mon Sep 17 00:00:00 2001 From: kaso17 Date: Fri, 9 Dec 2016 17:45:37 +0100 Subject: [PATCH] Attempt to fix #820 --- src/Jackett/Content/custom.js | 251 ++++++++++++++++----------------- src/Jackett/Content/index.html | 1 + 2 files changed, 121 insertions(+), 131 deletions(-) diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js index e3158c4a9..66fbbff5c 100644 --- a/src/Jackett/Content/custom.js +++ b/src/Jackett/Content/custom.js @@ -1,5 +1,9 @@ var basePath = ''; +var indexers = []; +var configuredIndexers = []; +var unconfiguredIndexers = []; + $(document).ready(function () { $.ajaxSetup({ cache: false }); window.jackettIsLocal = window.location.hostname === 'localhost' || @@ -48,8 +52,9 @@ function loadJackettSettings() { function reloadIndexers() { $('#indexers').hide(); var jqxhr = $.get("get_indexers", function (data) { - var configuredIndexers = []; - var unconfiguredIndexers = []; + indexers = data; + configuredIndexers = []; + unconfiguredIndexers = []; for (var i = 0; i < data.items.length; i++) { var item = data.items[i]; item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id); @@ -513,152 +518,136 @@ function updateReleasesRow(row) function showSearch(selectedIndexer) { $('#select-indexer-modal').remove(); - var jqxhr = $.get("get_indexers", function (data) { - var scope = { - items: data.items - }; + var releaseTemplate = Handlebars.compile($("#jackett-search").html()); + var releaseDialog = $(releaseTemplate({ + indexers: configuredIndexers + })); - var indexers = []; - indexers.push({ - id: '', name: '-- All --' - }); - for (var i = 0; i < data.items.length; i++) { - if (data.items[i].configured === true) { - indexers.push(data.items[i]); - } - } + $("#modals").append(releaseDialog); - var releaseTemplate = Handlebars.compile($("#jackett-search").html()); - var releaseDialog = $(releaseTemplate({ - indexers: indexers - })); - if (selectedIndexer) - releaseDialog.find("#searchTracker").val(selectedIndexer); - $("#modals").append(releaseDialog); - releaseDialog.modal("show"); + releaseDialog.on('shown.bs.modal', function () { + releaseDialog.find('#searchquery').focus(); + }); - releaseDialog.on('shown.bs.modal', function () { - releaseDialog.find('#searchquery').focus(); - }); - - var setCategories = function (tracker, items) { - var cats = {}; - for (var i = 0; i < items.length; i++) { - if (items[i].configured === true && (items[i].id === tracker || tracker === '')) { - indexers["'" + items[i].id + "'"] = items[i].name; - for (var prop in items[i].caps) { - cats[prop] = items[i].caps[prop]; - } + var setCategories = function (tracker, items) { + var cats = {}; + for (var i = 0; i < items.length; i++) { + if (items[i].configured === true && (items[i].id === tracker || tracker === '')) { + indexers["'" + items[i].id + "'"] = items[i].name; + for (var prop in items[i].caps) { + cats[prop] = items[i].caps[prop]; } } - var select = $('#searchCategory'); - select.html(""); - $.each(cats, function (value, key) { - select.append($("") - .attr("value", value).text(key + ' (' + value + ')')); - }); - }; - - setCategories('', data.items); - $('#searchTracker').change(jQuery.proxy(function () { - var trackerId = $('#searchTracker').val(); - setCategories(trackerId, this.items); - }, scope)); - - document.getElementById("searchquery") - .addEventListener("keyup", function (event) { - event.preventDefault(); - if (event.keyCode == 13) { - document.getElementById("jackett-search-perform").click(); - } + } + var select = $('#searchCategory'); + select.html(""); + $.each(cats, function (value, key) { + select.append($("") + .attr("value", value).text(key + ' (' + value + ')')); }); + }; - $('#jackett-search-perform').click(function () { - if ($('#jackett-search-perform').text().trim() !== 'Search trackers') { - // We are searchin already - return; - } - var queryObj = { - Query: releaseDialog.find('#searchquery').val(), - Category: releaseDialog.find('#searchCategory').val(), - Tracker: releaseDialog.find('#searchTracker').val().replace("'", "").replace("'", ""), - }; - $('#searchResults').empty(); + $('#searchTracker').change(jQuery.proxy(function () { + var trackerId = $('#searchTracker').val(); + setCategories(trackerId, this.items); + }, { items: configuredIndexers })); - $('#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); }); + document.getElementById("searchquery") + .addEventListener("keyup", function (event) { + event.preventDefault(); + if (event.keyCode == 13) { + document.getElementById("jackett-search-perform").click(); + } + }); - results.find('table').DataTable( - { - "pageLength": 20, - "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]], - "order": [[0, "desc"]], - "columnDefs": [ + $('#jackett-search-perform').click(function () { + if ($('#jackett-search-perform').text().trim() !== 'Search trackers') { + // We are searchin already + return; + } + var queryObj = { + Query: releaseDialog.find('#searchquery').val(), + 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); }); + + results.find('table').DataTable( + { + "pageLength": 20, + "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]], + "order": [[0, "desc"]], + "columnDefs": [ + { + "targets": 0, + "visible": false, + "searchable": false, + "type": 'date' + }, + { + "targets": 1, + "visible": true, + "searchable": false, + "iDataSort": 0 + }, + { + "targets": 4, + "visible": false, + "searchable": false, + "type": 'num' + }, { - "targets": 0, - "visible": false, - "searchable": false, - "type": 'date' - }, - { - "targets": 1, + "targets": 5, "visible": true, "searchable": false, - "iDataSort": 0 - }, - { - "targets": 4, - "visible": false, - "searchable": false, - "type": 'num' - }, - { - "targets": 5, - "visible": true, - "searchable": false, - "iDataSort": 4 - } - ], - initComplete: function () { - var count = 0; - this.api().columns().every(function () { - count++; - if (count === 3 || count === 8) { - var column = this; - var select = $('') - .appendTo($(column.footer()).empty()) - .on('change', function () { - var val = $.fn.dataTable.util.escapeRegex( - $(this).val() - ); + "iDataSort": 4 + } + ], + initComplete: function () { + var count = 0; + this.api().columns().every(function () { + count++; + if (count === 3 || count === 8) { + var column = this; + var select = $('') + .appendTo($(column.footer()).empty()) + .on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); - column - .search(val ? '^' + val + '$' : '', true, false) - .draw(); - }); - - column.data().unique().sort().each(function (d, j) { - select.append('') + column + .search(val ? '^' + val + '$' : '', true, false) + .draw(); }); - } - }); - } - }); - }).fail(function () { - $('#jackett-search-perform').html('Search trackers'); - doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert"); - }); + column.data().unique().sort().each(function (d, j) { + select.append('') + }); + } + }); + } + }); + + }).fail(function () { + $('#jackett-search-perform').html('Search trackers'); + doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert"); }); - - }).fail(function () { - doNotify("Error loading indexers, 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"); } function bindUIButtons() { diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html index 55d4fed6e..a19cf79f1 100644 --- a/src/Jackett/Content/index.html +++ b/src/Jackett/Content/index.html @@ -358,6 +358,7 @@