mirror of
https://github.com/linuxserver/Heimdall.git
synced 2026-02-21 20:20:34 +09:00
Merge pull request #1390 from linuxserver/feature/search_from_url
Search from URL fixed #1369
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App;
|
||||
use Cache;
|
||||
use Form;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Request as Input;
|
||||
use Yaml;
|
||||
|
||||
abstract class Search
|
||||
@@ -106,7 +107,7 @@ abstract class Search
|
||||
if ((bool) $homepage_search !== true) {
|
||||
return $output;
|
||||
}
|
||||
$user_search_provider = $user_search_provider ?? 'none';
|
||||
$user_search_provider = Input::get('p') ?? $user_search_provider ?? 'none';
|
||||
|
||||
if ((bool) $search_provider) {
|
||||
if ((bool) $user_search_provider) {
|
||||
@@ -124,7 +125,7 @@ abstract class Search
|
||||
$output .= '</select>';
|
||||
$output .= Form::text(
|
||||
'q',
|
||||
null,
|
||||
Input::get('q') ?? null,
|
||||
[
|
||||
'class' => 'homesearch',
|
||||
'autofocus' => 'autofocus',
|
||||
|
||||
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
2
public/mix-manifest.json
generated
2
public/mix-manifest.json
generated
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"/css/app.css": "/css/app.css?id=9ac09de3efefe57251cba47c5747c556",
|
||||
"/js/app.js": "/js/app.js?id=3b306fb20ef1a3c96c09963a4f6ff712"
|
||||
"/js/app.js": "/js/app.js?id=f636e6bbca8f537976c4f7eff234e818"
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ $.when($.ready).then(() => {
|
||||
}
|
||||
})
|
||||
.on("change", "select[name=provider]", function () {
|
||||
const items = $("#sortable").children(".item-container");
|
||||
const items = $("#sortable").find(".item-container");
|
||||
if ($(this).val() === "tiles") {
|
||||
$("#search-container button").hide();
|
||||
const search = $("#search-container input[name=q]").val();
|
||||
@@ -150,6 +150,8 @@ $.when($.ready).then(() => {
|
||||
}
|
||||
});
|
||||
|
||||
$("#search-container select[name=provider]").trigger("change");
|
||||
|
||||
$("#app")
|
||||
.on("click", "#config-button", (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user