Compare commits

..

No commits in common. "bb578ff9eb6af81dd4d978a6edcc8b843cd6451b" and "ff8d9c80e6b5e65a80505f0b830f48cc20cae657" have entirely different histories.

4 changed files with 8 additions and 35 deletions

View File

@ -19,13 +19,13 @@ table {
} }
.song { .song {
padding: 3em 0 1em 1em; padding: 1em 0 0 1em;
} }
.title { .title {
font-size: 1.5em; font-size: 1.5em;
font-weight: bold; font-weight: bold;
margin-bottom: 2em; margin-bottom: 1em;
} }
.chords { .chords {

View File

@ -191,8 +191,7 @@ main.song {
&.font-size>.button:hover, &.font-size>.button.active { background-color: #bf616a } &.font-size>.button:hover, &.font-size>.button.active { background-color: #bf616a }
&.transpose>.button:hover, &.transpose>.button.active { background-color: #5e81ac } &.transpose>.button:hover, &.transpose>.button.active { background-color: #5e81ac }
&.autoscroll>.button:hover, &.autoscroll>.button.active { background-color: #d08770 } &.autoscroll>.button.active { background-color: #d08770 }
&.autoscroll>#autoscroll.active { background-color: #bf616a }
.button{ .button{
display: grid; display: grid;

View File

@ -3,40 +3,18 @@ const song = document.querySelector("iframe.song").contentWindow;
// Autoscroll // Autoscroll
var scroll; var scroll;
var scrollTimeout = 60;
const minTimeout = 10;
const maxTimeout = 120;
const scrollIncrement = 20;
function pageScroll() { function pageScroll() {
song.scrollBy(0, 1); song.scrollBy(0, 1);
scroll = setTimeout(pageScroll, scrollTimeout); scroll = setTimeout(pageScroll, 80);
} }
function updateScrollSpeed() { document.querySelector("#autoscroll").addEventListener("click", function() {
if (controls.querySelector("#autoscroll").classList.contains("active")) {
clearTimeout(scroll);
scroll = setTimeout(pageScroll, scrollTimeout);
}
}
controls.querySelector("#autoscroll-increase").addEventListener("click", () => {
scrollTimeout = Math.max(minTimeout, scrollTimeout - scrollIncrement);
updateScrollSpeed();
});
controls.querySelector("#autoscroll-decrease").addEventListener("click", () => {
scrollTimeout = Math.min(maxTimeout, scrollTimeout + scrollIncrement);
updateScrollSpeed();
});
controls.querySelector("#autoscroll").addEventListener("click", function() {
this.classList.toggle("active");
if (this.classList.contains("active")) { if (this.classList.contains("active")) {
pageScroll();
} else {
clearTimeout(scroll); clearTimeout(scroll);
} else {
pageScroll();
} }
this.classList.toggle("active");
}); });
// Scaling // Scaling
@ -53,6 +31,5 @@ controls.querySelector("#font-size-increase").addEventListener("click", () => pa
controls.querySelector("#font-size-decrease").addEventListener("click", () => pageScale(-0.1)); controls.querySelector("#font-size-decrease").addEventListener("click", () => pageScale(-0.1));
controls.querySelector("#font-size-reset").addEventListener("click", () => pageScale(0)); controls.querySelector("#font-size-reset").addEventListener("click", () => pageScale(0));
// Display the controls on JS-enabled browsers // Display the controls on JS-enabled browsers
window.addEventListener("load", () => controls.classList.remove = "hidden"); window.addEventListener("load", () => controls.classList.remove = "hidden");

View File

@ -1,5 +1,4 @@
{% extends "index.html" %} {% extends "index.html" %}
{% block content %} {% block content %}
<main class="song"> <main class="song">
{% for asset in page.assets %} {% for asset in page.assets %}
@ -17,9 +16,7 @@
<div class="button icon-add" id="transpose-increase"></div> <div class="button icon-add" id="transpose-increase"></div>
</section> </section>
<section class="autoscroll"> <section class="autoscroll">
<div class="button icon-subtract" id="autoscroll-decrease"></div>
<div class="button icon-scroll" id="autoscroll"></div> <div class="button icon-scroll" id="autoscroll"></div>
<div class="button icon-add" id="autoscroll-increase"></div>
</section> </section>
</nav> </nav>
{% endif %} {% endif %}