Skip to content

Accept domains when filtering #2973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OphirBleicher wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

Accept domains when filtering #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<p class="no-results">{{ site.data.trans[page.lang].noresults }} <a href='https://github.com/jdm-contrib/jdm'>{{ site.data.trans[page.lang].noresultshelp }}</a>.</p>

{% for entry in site.data.sites %}
<section class="site-block {{ entry.difficulty }}"{% if entry.meta == 'popular' %} data-popular{% endif %}>
<section class="site-block {{ entry.difficulty }}"{% if entry.meta == 'popular' %} data-popular{% endif %}{% if entry.domains %} data-domains='{{ entry.domains | jsonify }}'{% endif %}>
{% capture lang_url %}url_{{ page.lang }}{% endcapture %}
<a class="site-header" href="{% if entry[lang_url] %}{{ entry[lang_url] }}{% else %}{{entry.url}}{% endif %}">
<span class="name">{{ entry.name }}</span>
Expand Down
20 changes: 18 additions & 2 deletions assets/js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,26 @@ $(function(){
var siteHeader = $(this).find(".site-header")[0];
var siteTitle = siteHeader.innerText.trim().toLowerCase();
var siteUrl = siteHeader.href.toLowerCase();
var siteDomains = $(this).data("domains") || [];
var lowerTerm = term.toLowerCase();
var normalizedDomains = siteDomains.map(function(domain) {
return domain.toLowerCase();
});

var startsWithDomain = normalizedDomains.some(function(domain) {
return domain.indexOf(lowerTerm) === 0;
});

if (startsWithDomain) {
return false;
}

var domainMatch = normalizedDomains.some(function(domain) {
return domain.indexOf(lowerTerm) !== -1;
});

// returns true if lowerTerm isn't found in site title or URL
return Math.max(siteTitle.indexOf(lowerTerm), siteUrl.indexOf(lowerTerm)) === -1;
// returns true if lowerTerm isn't found in site title or URL or domains
return siteTitle.indexOf(lowerTerm) === -1 && siteUrl.indexOf(lowerTerm) === -1 && !domainMatch;
});

// Insert the term into the search field
Expand Down
Loading