From 28ba380cca975829a9e5a44e76ccd8b8f01a25c1 Mon Sep 17 00:00:00 2001 From: ostertun Date: Sun, 11 Oct 2020 16:57:09 +0200 Subject: [PATCH] gitflow-hotfix-stash: site_build_logging --- client/scripts/custom.js.php | 10 ++++++++++ client/scripts/database.js | 4 ++++ client/scripts/regatten.js.php | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/client/scripts/custom.js.php b/client/scripts/custom.js.php index ae95a2e..cff0517 100644 --- a/client/scripts/custom.js.php +++ b/client/scripts/custom.js.php @@ -6,6 +6,8 @@ ?> +log('Script "custom.js" loaded'); + var loaderCount = 2; var showLoader = function() { if (loaderCount < 1) { @@ -19,6 +21,7 @@ var hideLoader = function() { if (loaderCount < 1) { $('#preloader').addClass('preloader-hide'); loaderCount = 0; + log('Loader hidden'); } } @@ -35,11 +38,15 @@ function eraseCookie(e) {createCookie(e, "", -1)} $(document).ready(function(){ 'use strict' + log('Document ready'); + var isAJAX = false; //Enables or disable AJAX page transitions and loading. var isDevelopment = false; // Enables development mode. Clean cache & Stops BG & Highlights from changing defaults. function init_template(){ + log('Initializing template...'); + //ADD YOUR CUSTOM JAVASCRIPT CODES HERE! //Do not put inside HTML files. //The init_template() function will be triggered when pages open. @@ -1345,6 +1352,9 @@ $(document).ready(function(){ $('#menu-welcome-a-okay').click(welcomeOk); showWelcome(); + log('Template initialized'); + log('Initializing app'); + initRegatten(); hideLoader(); diff --git a/client/scripts/database.js b/client/scripts/database.js index 37139bb..0bdce8e 100644 --- a/client/scripts/database.js +++ b/client/scripts/database.js @@ -445,6 +445,7 @@ async function updateSyncStatus() { } async function runPageScript() { + log('running page script...') if (canUseLocalDB) { var osUpdateTimes = db.transaction('update_times').objectStore('update_times'); osUpdateTimes.get('loggedin').onsuccess = function (event) { @@ -473,8 +474,10 @@ async function runPageScript() { } if (typeof siteScript === 'function') { + log('loading site script'); siteScript(); } else { + log('no site script'); hideLoader(); } } @@ -928,6 +931,7 @@ function checkSync() { } function initDatabase() { + log('Initializing DB...'); if (window.indexedDB) { var request = window.indexedDB.open('regatten_app_db_' + BOATCLASS, DB_VERSION); request.onerror = function (event) { diff --git a/client/scripts/regatten.js.php b/client/scripts/regatten.js.php index daa68f0..196e100 100644 --- a/client/scripts/regatten.js.php +++ b/client/scripts/regatten.js.php @@ -440,8 +440,12 @@ async function updateNewsBadge() { var initRegatten = function() { showLoader(); + log('Initializing DB...'); + initDatabase(); + log('Loading app specific code...'); + if (isLoggedIn()) { $('.show-loggedin').show(); $('.show-notloggedin').hide(); @@ -461,6 +465,7 @@ var initRegatten = function() { } var onServiceWorkerLoaded = function() { + log('sW loaded'); if ((swRegistration !== null) && canUseLocalDB) { pushesPossible = true; updatePushBadge(); @@ -470,6 +475,7 @@ var onServiceWorkerLoaded = function() { } var onDatabaseLoaded = function() { + log('DB loaded'); if (!canUseLocalDB && !$('#menu-welcome').hasClass('menu-active')) { function NoDbWarningOk() { createCookie('regatten_nodb_banner', true, 1);