Merge branch 'BetterSEQTA:main' into main

This commit is contained in:
Jones
2025-06-25 12:56:05 +09:30
committed by GitHub
6 changed files with 132 additions and 14 deletions
+12 -9
View File
@@ -13,6 +13,7 @@ import { CreateCustomShortcutDiv } from "@/seqta/utils/CreateEnable/CreateCustom
import { CreateElement } from "@/seqta/utils/CreateEnable/CreateElement";
import { FilterUpcomingAssessments } from "@/seqta/utils/FilterUpcomingAssessments";
import { getMockNotices } from "@/seqta/ui/dev/hideSensitiveContent";
import { setupFixedTooltips } from "@/seqta/utils/fixedTooltip";
let LessonInterval: any;
let currentSelectedDate = new Date();
@@ -628,12 +629,13 @@ function openNoticeModal(
// Get the current scale applied to the source element and compensate for it
const computedStyle = getComputedStyle(sourceElement);
const transform = computedStyle.transform;
let scaleX = 1, scaleY = 1;
if (transform && transform !== 'none') {
let scaleX = 1,
scaleY = 1;
if (transform && transform !== "none") {
const matrix = transform.match(/matrix.*\((.+)\)/);
if (matrix) {
const values = matrix[1].split(', ');
const values = matrix[1].split(", ");
scaleX = parseFloat(values[0]);
scaleY = parseFloat(values[3]);
}
@@ -642,11 +644,11 @@ function openNoticeModal(
// Apply inverse scale to get true original dimensions and positions
const newSourceWidth = newSourceRect.width / scaleX;
const newSourceHeight = newSourceRect.height / scaleY;
// Calculate position shift due to center-based scaling
const deltaX = (newSourceWidth - newSourceRect.width) / 2;
const deltaY = (newSourceHeight - newSourceRect.height) / 2;
const newSourceLeft = newSourceRect.left - deltaX;
const newSourceTop = newSourceRect.top - deltaY;
@@ -965,7 +967,7 @@ function makeLessonDiv(lesson: any, num: number) {
.join("");
lessonString += `
<div class="tooltip assessmenttooltip">
<div class="fixed-tooltip assessmenttooltip">
<svg style="width:28px;height:28px;border-radius:0;" viewBox="0 0 24 24">
<path fill="#ed3939" d="M16 2H4C2.9 2 2 2.9 2 4V20C2 21.11 2.9 22 4 22H16C17.11 22 18 21.11 18 20V4C18 2.9 17.11 2 16 2M16 20H4V4H6V12L8.5 9.75L11 12V4H16V20M20 15H22V17H20V15M22 7V13H20V7H22Z" />
</svg>
@@ -975,8 +977,9 @@ function makeLessonDiv(lesson: any, num: number) {
}
lessonString += "</div>";
return stringToHTML(lessonString);
const element = stringToHTML(lessonString);
setupFixedTooltips(element);
return element;
}
function buildAssessmentURL(programmeID: any, metaID: any, itemID = "") {
+5 -4
View File
@@ -41,7 +41,7 @@ export function OpenWhatsNewPopup() {
let imagecont = document.createElement("div");
imagecont.classList.add("whatsnewImgContainer");
/* let video = document.createElement("video");
let video = document.createElement("video");
let source = document.createElement("source");
source.setAttribute(
@@ -53,13 +53,13 @@ export function OpenWhatsNewPopup() {
video.loop = true;
video.appendChild(source);
video.classList.add("whatsnewImg");
imagecont.appendChild(video); */
imagecont.appendChild(video);
let whatsnewimg = document.createElement("img");
/* let whatsnewimg = document.createElement("img");
//whatsnewimg.src = "https://raw.githubusercontent.com/BetterSEQTA/BetterSEQTA-Plus/main/src/resources/update-image.webp";
whatsnewimg.src = browser.runtime.getURL('../../resources/update-image.webp');
whatsnewimg.classList.add("whatsnewImg");
imagecont.appendChild(whatsnewimg);
imagecont.appendChild(whatsnewimg); */
let textcontainer = document.createElement("div");
textcontainer.classList.add("whatsnewTextContainer");
@@ -77,6 +77,7 @@ export function OpenWhatsNewPopup() {
<li>Fixed 12-hour time not applying correctly in timetable</li>
<li>Fixed background flickering on page load</li>
<li>Fixed homepage lessons not properly changing days</li>
<li>Performance improvements for global search</li>
<li>Performance improvements across the extension</li>
<li>Other bug fixes and improvements</li>
+59
View File
@@ -0,0 +1,59 @@
export function setupFixedTooltips(root: Document | HTMLElement = document) {
const elements = root.querySelectorAll<HTMLElement>(".fixed-tooltip");
elements.forEach((tooltip) => {
const text = tooltip.querySelector<HTMLElement>(".tooltiptext");
if (!text) return;
tooltip.removeChild(text);
text.classList.add("tooltiptext-fixed");
let hideTimeout: number | undefined;
const show = () => {
if (hideTimeout) {
clearTimeout(hideTimeout);
hideTimeout = undefined;
}
document.body.appendChild(text);
const rect = tooltip.getBoundingClientRect();
text.style.left = `${rect.left + rect.width / 2}px`;
text.style.top = `${rect.bottom + 5}px`;
requestAnimationFrame(() => text.classList.add("show"));
};
const scheduleHide = () => {
hideTimeout = window.setTimeout(() => {
text.classList.remove("show");
setTimeout(() => {
if (text.parentElement === document.body) {
document.body.removeChild(text);
}
}, 200);
}, 300);
};
tooltip.addEventListener("mouseenter", show);
tooltip.addEventListener("mouseleave", scheduleHide);
tooltip.addEventListener("blur", scheduleHide);
tooltip.addEventListener("click", scheduleHide);
text.addEventListener("mouseenter", () => {
if (hideTimeout) {
clearTimeout(hideTimeout);
hideTimeout = undefined;
}
});
text.addEventListener("mouseleave", scheduleHide);
text.addEventListener("click", () => {
if (hideTimeout) {
clearTimeout(hideTimeout);
hideTimeout = undefined;
}
text.classList.remove("show");
setTimeout(() => {
if (text.parentElement === document.body) {
document.body.removeChild(text);
}
}, 200);
});
});
}