diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 1a1c176..a6b4664 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -712,12 +712,12 @@ document.getElementById('newsButton').onclick = () => { } else { $('#landingContainer *').attr('tabindex', '-1') $('#newsContainer, #newsContainer *, #lower, #lower #center *').removeAttr('tabindex') - if(newsAlertShown){ - $('#newsButtonAlert').fadeOut(2000) - newsAlertShown = false - ConfigManager.setNewsCacheDismissed(true) - ConfigManager.save() - } + // if(newsAlertShown){ + // $('#newsButtonAlert').fadeOut(2000) + // newsAlertShown = false + // ConfigManager.setNewsCacheDismissed(true) + // ConfigManager.save() + // } } slide_(!newsActive) newsActive = !newsActive @@ -909,24 +909,24 @@ async function initNews(){ * between articles. If you are on the landing page, the up arrow will * open the news UI. */ -document.addEventListener('keydown', (e) => { - if(newsActive){ - if(e.key === 'ArrowRight' || e.key === 'ArrowLeft'){ - document.getElementById(e.key === 'ArrowRight' ? 'newsNavigateRight' : 'newsNavigateLeft').click() - } - // Interferes with scrolling an article using the down arrow. - // Not sure of a straight forward solution at this point. - // if(e.key === 'ArrowDown'){ - // document.getElementById('newsButton').click() - // } - } else { - if(getCurrentView() === VIEWS.landing){ - if(e.key === 'ArrowUp'){ - document.getElementById('newsButton').click() - } - } - } -}) +// document.addEventListener('keydown', (e) => { +// if(newsActive){ +// if(e.key === 'ArrowRight' || e.key === 'ArrowLeft'){ +// document.getElementById(e.key === 'ArrowRight' ? 'newsNavigateRight' : 'newsNavigateLeft').click() +// } +// // Interferes with scrolling an article using the down arrow. +// // Not sure of a straight forward solution at this point. +// // if(e.key === 'ArrowDown'){ +// // document.getElementById('newsButton').click() +// // } +// } else { +// if(getCurrentView() === VIEWS.landing){ +// if(e.key === 'ArrowUp'){ +// document.getElementById('newsButton').click() +// } +// } +// } +// }) /** * Display a news article on the UI. diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js index fc7d7cf..9f37281 100644 --- a/app/assets/js/scripts/uibinder.js +++ b/app/assets/js/scripts/uibinder.js @@ -21,7 +21,8 @@ const VIEWS = { loginOffline: '#loginOfflineContainer', settings: '#settingsContainer', welcome: '#welcomeContainer', - waiting: '#waitingContainer' + waiting: '#waitingContainer', + dynmap: '#dynmapContainer' } // The currently shown view container. diff --git a/app/dynmap.ejs b/app/dynmap.ejs new file mode 100644 index 0000000..9a147f0 --- /dev/null +++ b/app/dynmap.ejs @@ -0,0 +1,23 @@ +
\ No newline at end of file diff --git a/app/landing.ejs b/app/landing.ejs index 5ac72a1..9826cbf 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -159,62 +159,65 @@