Skip to content

Commit

Permalink
Merge pull request #138 from HarryDulaney/fix-load
Browse files Browse the repository at this point in the history
remove loader temp
  • Loading branch information
HarryDulaney authored Nov 5, 2023
2 parents 1f66d3a + e1e4795 commit c8f146a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@

<body>
<!----------------------------------------------- Loader overlay ---------------------------------------------------->
<div id="loader-container">
<!-- <div id="loader-container"class="show-loading">
<div class="loader"></div>
</div>
</div> -->
<!----------------------------------------------- NavBar ---------------------------------------------------->
<nav
id="nav-container"
Expand Down
8 changes: 0 additions & 8 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ var INITIALIZED = false;
var APP_CONTAINER = null;
var FOOTER_CONTAINER = null;
var NAV_BAR_CONTAINER = null;
var LOADER_CONTAINER = null;

var INTRO_NAV_ELEMENT_ID = null;
var ABOUT_NAV_ELEMENT_ID = null;
Expand Down Expand Up @@ -215,14 +214,10 @@ function toggleLoader() {
function showLoader() {
FOOTER_CONTAINER.classList.replace('show-footer', 'hide-footer');
NAV_BAR_CONTAINER.classList.replace('show-navbar', 'hide-navbar');
if (!LOADER_CONTAINER.classList.length === 0) {
LOADER_CONTAINER.classList.add('show-loading');
}
isLoading = true;
}

function hideLoader() {
LOADER_CONTAINER.classList.remove('show-loading');
FOOTER_CONTAINER.classList.replace('hide-footer', 'show-footer');
NAV_BAR_CONTAINER.classList.replace('hide-navbar', 'show-navbar');
isLoading = false;
Expand Down Expand Up @@ -260,9 +255,6 @@ $(function () {
initializePageElements();
FOOTER_CONTAINER = document.querySelector('#footer-container');
NAV_BAR_CONTAINER = document.querySelector('#nav-container');
LOADER_CONTAINER = document.querySelector('#loader-container');
showLoader();

setNavMenuElementIds();
initializeTheme();
var initialScrollPos = window.scrollY;
Expand Down

0 comments on commit c8f146a

Please sign in to comment.