-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rebane2001:master' into master
- Loading branch information
Showing
5 changed files
with
95 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,83 @@ | ||
| /** Sorts videos based on dropdown selection. */ | ||
| function channelSort() { | ||
| const sortOption = document.querySelector(".sort").value; | ||
| const [sortBy, direction] = sortOption.split("-"); | ||
| const isInt = sortBy !== "search"; | ||
| const container = document.querySelector(".channels.flex-grid"); | ||
| [...container.children] | ||
| .sort((a,b)=>{ | ||
| const dir = direction ? 1 : -1; | ||
| let valA = a.dataset[sortBy]; | ||
| let valB = b.dataset[sortBy]; | ||
| if (isInt) { | ||
| valA = parseInt(valA); | ||
| valB = parseInt(valB); | ||
| } | ||
| return (valA>valB?1:-1)*dir; | ||
| }) | ||
| .forEach(node=>container.appendChild(node)); | ||
| const sortOption = document.querySelector(".sort").value; | ||
| const [sortBy, direction] = sortOption.split("-"); | ||
| const isInt = sortBy !== "search"; | ||
| const container = document.querySelector(".channels.flex-grid"); | ||
| [...container.children] | ||
| .sort((a,b)=>{ | ||
| const dir = direction ? 1 : -1; | ||
| let valA = a.dataset[sortBy]; | ||
| let valB = b.dataset[sortBy]; | ||
| if (isInt) { | ||
| valA = parseInt(valA); | ||
| valB = parseInt(valB); | ||
| } | ||
| return (valA>valB?1:-1)*dir; | ||
| }) | ||
| .forEach(node=>container.appendChild(node)); | ||
| } | ||
|
|
||
| /** Returns a RegExp if searchTerm matches the /expression/flags format. */ | ||
| function getSearchRegex(searchTerm) { | ||
| const regexParts = searchTerm.match(/^\/(.*)\/([dgimsuvy]*)$/); | ||
| try { | ||
| return regexParts && new RegExp(regexParts[1], regexParts[2]); | ||
| } catch(err) { console.error(err); } | ||
| } | ||
|
|
||
| /** | ||
| * Filters visible videos to only those that match the search query. | ||
| * Non-public videos can be filtered by adding unlisted/removed (to show) | ||
| * or !unlisted/!removed (to hide) to the search query. | ||
| * RegExp can be used by writing the query in the /exp/flags format. | ||
| * Search is case-insensitive except for RegExp which requires the i flag. | ||
| */ | ||
| function channelSearch() { | ||
| let searchTerm = document.querySelector(".search").value.toLowerCase(); | ||
| const allowedClasses = []; | ||
| const filteredClasses = []; | ||
| const availableClasses = ["unlisted", "removed"]; | ||
| for (const availableClass of availableClasses) { | ||
| if (searchTerm.includes("!" + availableClass)) { | ||
| filteredClasses.push(availableClass); | ||
| searchTerm = searchTerm.replace("!" + availableClass, ""); | ||
| } else if (searchTerm.includes(availableClass)) { | ||
| allowedClasses.push(availableClass); | ||
| searchTerm = searchTerm.replace(availableClass, ""); | ||
| } | ||
| } | ||
|
|
||
| document.querySelectorAll('.searchable').forEach((e) => { | ||
| let filtered = false; | ||
| for (const c of allowedClasses) { | ||
| if (!e.querySelector(`.${c}`)) filtered = true; | ||
| } | ||
| for (const c of filteredClasses) { | ||
| if (e.querySelector(`.${c}`)) filtered = true; | ||
| } | ||
|
|
||
| if (!filtered && (searchTerm === "" || e.dataset.search.toLowerCase().includes(searchTerm))) { | ||
| e.classList.remove("hide"); | ||
| } else { | ||
| e.classList.add("hide"); | ||
| } | ||
| }); | ||
| const searchBox = document.querySelector(".search"); | ||
| if (!searchBox) return; | ||
|
|
||
| let searchTerm = searchBox.value; | ||
|
|
||
| const allowedClasses = []; | ||
| const filteredClasses = []; | ||
| const availableClasses = ["unlisted", "removed"]; | ||
| for (const availableClass of availableClasses) { | ||
| if (searchTerm.includes("!" + availableClass)) { | ||
| filteredClasses.push(availableClass); | ||
| searchTerm = searchTerm.replace("!" + availableClass, ""); | ||
| } else if (searchTerm.includes(availableClass)) { | ||
| allowedClasses.push(availableClass); | ||
| searchTerm = searchTerm.replace(availableClass, ""); | ||
| } | ||
| } | ||
|
|
||
| const searchRegex = getSearchRegex(searchTerm); | ||
| searchTerm = searchTerm.toLowerCase(); | ||
|
|
||
| document.querySelectorAll('.searchable').forEach((e) => { | ||
| let filtered = false; | ||
| for (const c of allowedClasses) { | ||
| if (!e.querySelector(`.${c}`)) filtered = true; | ||
| } | ||
| for (const c of filteredClasses) { | ||
| if (e.querySelector(`.${c}`)) filtered = true; | ||
| } | ||
|
|
||
| if (!filtered && (searchTerm === "" || | ||
| (!searchRegex && e.dataset.search.toLowerCase().includes(searchTerm)) || | ||
| (searchRegex && searchRegex.test(e.dataset.search)) | ||
| )) { | ||
| e.classList.remove("hide"); | ||
| } else { | ||
| e.classList.add("hide"); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| window.addEventListener("load", () => { | ||
| channelSearch(); | ||
| // Always perform the search on page load, because: | ||
| // 1) Navigating to a previous page will retain the textbox contents | ||
| // 2) The search may have been performed while the DOM wasn't fully loaded | ||
| channelSearch(); | ||
| }); |