fix: unaufgeloeste Merge-Konflikt-Marker aus i18n/calendar/week/css entfernt

Beim letzten Beta->Master-Merge sind die <<<<<<< / ======= / >>>>>>>
Marker mit committet worden. Das hat i18n.js mit einem SyntaxError beim
Parsen abgebrochen und damit den gesamten Frontend-Start kaputt gemacht
(=> komplett schwarze Seite, weil applyTheme nie lief).

Acht Bloecke aufgeloest, in allen Faellen die HEAD-Seite behalten
(neue Features: copy-Key, URL-State, all-day-continues-Logik, Event-
Popup-Header). v22 / sw cache v22.
This commit is contained in:
Scarriffle
2026-05-19 10:18:49 +02:00
parent f102f02cb9
commit 275e5a2ae0
6 changed files with 2 additions and 53 deletions

View File

@@ -123,7 +123,6 @@ export async function initCalendar() {
bindProfileModal();
bindSwipeNavigation();
handleHAOAuthReturn();
<<<<<<< HEAD
// Browser-Back/Forward: URL-Hash → State synchronisieren
window.addEventListener('hashchange', () => {
@@ -140,8 +139,6 @@ export async function initCalendar() {
}
if (changed) fetchAndRender();
});
=======
>>>>>>> e744b1829e99db6b80922f75542ced329138e474
}
function handleHAOAuthReturn() {
@@ -155,11 +152,7 @@ function handleHAOAuthReturn() {
};
if (params.has('ha_connected')) {
showToast('Home Assistant verbunden');
<<<<<<< HEAD
window.history.replaceState({}, '', window.location.pathname + window.location.hash);
=======
window.history.replaceState({}, '', window.location.pathname);
>>>>>>> e744b1829e99db6b80922f75542ced329138e474
fetchAndRender(true);
api.get('/homeassistant/accounts').then(accs => {
state.haAccounts = accs || [];
@@ -169,11 +162,7 @@ function handleHAOAuthReturn() {
} else if (params.has('ha_error')) {
const code = params.get('ha_error');
showToast(errMap[code] || `HA-Anmeldung fehlgeschlagen: ${code}`, true);
<<<<<<< HEAD
window.history.replaceState({}, '', window.location.pathname + window.location.hash);
=======
window.history.replaceState({}, '', window.location.pathname);
>>>>>>> e744b1829e99db6b80922f75542ced329138e474
}
}
@@ -268,10 +257,7 @@ async function fetchAndRender(force = false, silent = false) {
renderView();
updateTitle();
renderMiniCal();
<<<<<<< HEAD
writeUrlState();
=======
>>>>>>> e744b1829e99db6b80922f75542ced329138e474
prefetchIfNeeded(start, end); // extend cache in background if approaching an edge
return;
}