Merge pull request #1123 from hgiesel/reviewerbottomdropjquery

Remove jQuery reviewer-bottom.ts and overview.ts
This commit is contained in:
Damien Elmes 2021-04-14 12:35:39 +10:00 committed by GitHub
commit ca6edc1470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 28 deletions

View File

@ -1,6 +0,0 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
$(function () {
$("#study").focus();
});

View File

@ -4,8 +4,7 @@
var time: number; // set in python code
let maxTime = 0;
$(function () {
$("#ansbut").focus();
document.addEventListener("DOMContentLoaded", () => {
updateTime();
setInterval(function () {
time += 1;
@ -13,35 +12,33 @@ $(function () {
}, 1000);
});
let updateTime = function () {
let timeNode = $("#time");
if (!maxTime) {
timeNode.text("");
function updateTime(): void {
const timeNode = document.getElementById("time");
if (maxTime === 0) {
timeNode.textContent = "";
return;
}
time = Math.min(maxTime, time);
const m = Math.floor(time / 60);
const s = time % 60;
let sStr = s.toString();
if (s < 10) {
sStr = "0" + s;
}
if (maxTime === time) {
timeNode.html("<font color=red>" + m + ":" + sStr + "</font>");
} else {
timeNode.text(m + ":" + sStr);
}
};
const sStr = String(s).padStart(2, "0");
const timeString = `${m}:${sStr}`;
function showQuestion(txt, maxTime_) {
// much faster than jquery's .html()
$("#middle")[0].innerHTML = txt;
if (maxTime === time) {
timeNode.innerHTML = `<font color=red>${timeString}</font>`;
} else {
timeNode.textContent = timeString;
}
}
function showQuestion(txt: string, maxTime_: number): void {
showAnswer(txt);
time = 0;
maxTime = maxTime_;
}
function showAnswer(txt) {
$("#middle")[0].innerHTML = txt;
function showAnswer(txt: string): void {
document.getElementById("middle").innerHTML = txt;
}
function selectedAnswerButton() {

View File

@ -187,7 +187,7 @@ class Overview:
self.web.stdHtml(
self._body % content.__dict__,
css=["css/overview.css"],
js=["js/vendor/jquery.min.js", "js/overview.js"],
js=["js/vendor/jquery.min.js"],
context=self,
)