From e1a7b002ce72f607cf4d1422ab84916cfe25eab3 Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Wed, 9 Dec 2020 20:12:42 +0800 Subject: [PATCH] Fix eslint --- source/js/schedule.js | 12 +++++------- source/js/schemes/muse.js | 2 +- source/js/utils.js | 10 +++------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/source/js/schedule.js b/source/js/schedule.js index 42f3021..2559575 100644 --- a/source/js/schedule.js +++ b/source/js/schedule.js @@ -61,9 +61,7 @@ return 'about ' + Math.round(elapsed / msPerYear) + ' years' + tense; } - function buildEventDOM(tense, event) { - const start = event.start.dateTime; - const end = event.end.dateTime; + function buildEventDOM(tense, event, start, end) { const durationFormat = { weekday: 'short', hour : '2-digit', @@ -107,12 +105,12 @@ // Clean the event list eventList.innerHTML = ''; let prevEnd = 0; // used to decide where to insert an
+ const utc = new Date().getTimezoneOffset() * 60000; data.items.forEach(event => { // Parse data - const utc = new Date().getTimezoneOffset() * 60000; - const start = event.start.dateTime = new Date(event.start.dateTime || (new Date(event.start.date).getTime() + utc)); - const end = event.end.dateTime = new Date(event.end.dateTime || (new Date(event.end.date).getTime() + utc)); + const start = new Date(event.start.dateTime || (new Date(event.start.date).getTime() + utc)); + const end = new Date(event.end.dateTime || (new Date(event.end.date).getTime() + utc)); let tense = 'now'; if (end < now) { @@ -125,7 +123,7 @@ eventList.innerHTML += '
'; } - eventList.innerHTML += buildEventDOM(tense, event); + eventList.innerHTML += buildEventDOM(tense, event, start, end); prevEnd = end; }); }); diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js index feae9c8..801a8c4 100644 --- a/source/js/schemes/muse.js +++ b/source/js/schemes/muse.js @@ -40,7 +40,7 @@ document.addEventListener('DOMContentLoaded', () => { setTimeout(() => { // Trigger a DOM reflow element.classList.add(animateAction); - }, 0); + }); }); }, hideSidebar: function() { diff --git a/source/js/utils.js b/source/js/utils.js index b32c41d..36355bf 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -336,13 +336,9 @@ NexT.utils = { if (condition) { callback(); } else { - let script = document.createElement('script'); - script.onload = script.onreadystatechange = function(_, isAbort) { - if (isAbort || !script.readyState || /loaded|complete/.test(script.readyState)) { - script.onload = script.onreadystatechange = null; - script = undefined; - if (!isAbort && callback) setTimeout(callback, 0); - } + const script = document.createElement('script'); + script.onload = () => { + setTimeout(callback); }; script.src = url; document.head.appendChild(script);