diff options
| -rw-r--r-- | classes/Pref_Filters.php | 10 | ||||
| -rw-r--r-- | js/CommonFilters.js | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php index 0c0a0ea03..cfad881a4 100644 --- a/classes/Pref_Filters.php +++ b/classes/Pref_Filters.php @@ -151,10 +151,12 @@ class Pref_Filters extends Handler_Protected { }, $entry, $excerpt_length); - $rv['items'][] = "<li><span class='title'>" . $entry["title"] . "</span><br/>" . - "<span class='feed'>" . $entry['feed_title'] . "</span>, <span class='date'>" . mb_substr($entry["date_entered"], 0, 16) . "</span>" . - "<div class='preview text-muted'>" . $entry["content_preview"] . "</div>" . - "</li>"; + $rv['items'][] = [ + 'title' => $entry['title'], + 'feed_title' => $entry['feed_title'], + 'date' => mb_substr($entry['date_entered'], 0, 16), + 'content_preview' => $entry['content_preview'], + ]; } } diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 7b7d64958..b7bb69a15 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -43,16 +43,13 @@ const Filters = { .replace("%f", test_dialog.results) .replace("%d", offset); - for (let i = 0; i < result.items.length; i++) { - const tmp = dojo.create("div", { innerHTML: result.items[i]}); - - results_list.innerHTML += tmp.innerHTML; - } + results_list.innerHTML += result.items.reduce((current, item) => current + `<li><span class='title'>${item.title}</span><br> + <span class='feed'>${item.feed_title}</span>, <span class='date'>${item.date}</span> + <div class='preview text-muted'>${item.content_preview}</div></li>`, ''); // get the next batch if there may be more available and testing limits haven't been reached if (result.pre_filtering_count === test_dialog.limit && - test_dialog.results < 30 && - offset < test_dialog.max_offset) { + test_dialog.results < 30 && offset < test_dialog.max_offset) { window.setTimeout(function () { test_dialog.getTestResults(params, offset + test_dialog.limit); }, 0); |