bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve linking to apps via hash

master
Gordon Williams 2020-07-21 11:56:07 +01:00
parent e0a0b4a54d
commit 8beb44510b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/index.js
View File

@ -204,9 +204,11 @@ function showTab(tabname) {
// Can't use chip.attributes.filterid.value here because Safari/Apple's WebView doesn't handle it // Can't use chip.attributes.filterid.value here because Safari/Apple's WebView doesn't handle it
let chips = Array.from(document.querySelectorAll('.filter-nav .chip')).map(chip => chip.getAttribute("filterid")); let chips = Array.from(document.querySelectorAll('.filter-nav .chip')).map(chip => chip.getAttribute("filterid"));
let hash = window.location.hash ? window.location.hash.slice(1) : ''; let hash = "";
if (window.location.hash)
hash = decodeURIComponent(window.location.hash.slice(1)).toLowerCase();
let activeFilter = ~chips.indexOf(hash) ? hash : ''; let activeFilter = (chips.indexOf(hash)>=0) ? hash : '';
let activeSort = ''; let activeSort = '';
let currentSearch = activeFilter ? '' : hash; let currentSearch = activeFilter ? '' : hash;
@ -236,7 +238,7 @@ function refreshLibrary() {
} }
if (currentSearch) { if (currentSearch) {
visibleApps = visibleApps.filter(app => app.name.toLowerCase().includes(currentSearch) || app.tags.includes(currentSearch)); visibleApps = visibleApps.filter(app => app.name.toLowerCase().includes(currentSearch) || app.tags.includes(currentSearch) || app.id.toLowerCase().includes(currentSearch));
} }
visibleApps.sort(appSorter); visibleApps.sort(appSorter);
@ -258,13 +260,14 @@ function refreshLibrary() {
let githubMatch = window.location.href.match(/\/(\w+)\.github\.io/); let githubMatch = window.location.href.match(/\/(\w+)\.github\.io/);
if(githubMatch) username = githubMatch[1]; if(githubMatch) username = githubMatch[1];
let url = `https://github.com/${username}/BangleApps/tree/master/apps/${app.id}`; let url = `https://github.com/${username}/BangleApps/tree/master/apps/${app.id}`;
let appurl = window.location.origin + window.location.pathname + "#" + encodeURIComponent(app.id);
return `<div class="tile column col-6 col-sm-12 col-xs-12"> return `<div class="tile column col-6 col-sm-12 col-xs-12">
<div class="tile-icon"> <div class="tile-icon">
<figure class="avatar"><img src="apps/${app.icon?`${app.id}/${app.icon}`:"unknown.png"}" alt="${escapeHtml(app.name)}"></figure><br/> <figure class="avatar"><img src="apps/${app.icon?`${app.id}/${app.icon}`:"unknown.png"}" alt="${escapeHtml(app.name)}"></figure><br/>
</div> </div>
<div class="tile-content"> <div class="tile-content">
<p class="tile-title text-bold">${escapeHtml(app.name)} ${versionInfo}</p> <p class="tile-title text-bold"><a name="${appurl}"></a>${escapeHtml(app.name)} ${versionInfo}</p>
<p class="tile-subtitle">${getAppDescription(app)}${app.readme?`<br/>${readme}`:""}</p> <p class="tile-subtitle">${getAppDescription(app)}${app.readme?`<br/>${readme}`:""}</p>
<a href="${url}" target="_blank" class="link-github"><img src="img/github-icon-sml.png" alt="See the code on GitHub"/></a> <a href="${url}" target="_blank" class="link-github"><img src="img/github-icon-sml.png" alt="See the code on GitHub"/></a>
</div> </div>
@ -658,6 +661,7 @@ let librarySearchInput = document.querySelector("#searchform input");
librarySearchInput.value = currentSearch; librarySearchInput.value = currentSearch;
librarySearchInput.addEventListener('input', evt => { librarySearchInput.addEventListener('input', evt => {
currentSearch = evt.target.value.toLowerCase(); currentSearch = evt.target.value.toLowerCase();
window.location.hash = "#"+encodeURIComponent(currentSearch);
refreshLibrary(); refreshLibrary();
}); });