RA-#29 remove unused code from scripts
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@@ -20,8 +20,6 @@ $(document).ready(function(){
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
var pwaVersion = '<?php echo PWA_VERSION; ?>'; //must be identical to _manifest.json version. If not it will create update window loop
|
var pwaVersion = '<?php echo PWA_VERSION; ?>'; //must be identical to _manifest.json version. If not it will create update window loop
|
||||||
var pwaCookie = true; // if set to false, the PWA prompt will appear even if the user selects "maybe later"
|
|
||||||
var pwaNoCache = false; // always keep the cache clear to serve the freshest possible content
|
|
||||||
|
|
||||||
|
|
||||||
$('[data-pwa-version]').data('pwa-version', pwaVersion);
|
$('[data-pwa-version]').data('pwa-version', pwaVersion);
|
||||||
@@ -115,93 +113,11 @@ $(document).ready(function(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Creating Update Modal
|
|
||||||
function updateModal(){
|
|
||||||
var body = $('body');
|
|
||||||
var updateModal = $('#menu-update');
|
|
||||||
var mt = new Date();
|
|
||||||
var menuUpdate = mt.getHours() + ":" + mt.getMinutes() + ":" + mt.getSeconds();
|
|
||||||
if(!updateModal.length){
|
|
||||||
body.append('<div id="menu-update"></div>');
|
|
||||||
setTimeout(function(){
|
|
||||||
body.find('#menu-update').load('menu-update.html?ver='+menuUpdate);
|
|
||||||
},250);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
//Update Version in 5 Seconds After New Version Detected
|
|
||||||
function updateButton(){
|
|
||||||
var counter = 3;
|
|
||||||
var interval = setInterval(function() {
|
|
||||||
counter--;
|
|
||||||
log(counter);
|
|
||||||
$('.page-update').html('Aktuallisierung in ... '+ counter + ' Sekunden');
|
|
||||||
if (counter == 0) {
|
|
||||||
clearInterval(interval);
|
|
||||||
window.location.reload(true)
|
|
||||||
}
|
|
||||||
}, 1000);
|
|
||||||
caches.delete('workbox-runtime').then(function() {
|
|
||||||
log('Content Updated - Cache Removed!');
|
|
||||||
});
|
|
||||||
//localStorage.clear();
|
|
||||||
sessionStorage.clear()
|
|
||||||
caches.keys().then(cacheNames => {
|
|
||||||
cacheNames.forEach(cacheName => {
|
|
||||||
caches.delete(cacheName);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
//Check Version
|
|
||||||
function check_version(){
|
|
||||||
if($('link[data-pwa-version]').length){
|
|
||||||
function versionCheck(){
|
|
||||||
var dt = new Date();
|
|
||||||
var maniTimeVersion = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
|
|
||||||
var localVersionNumber = $('link[rel="manifest"]').data('pwa-version');
|
|
||||||
var onlineVersionJSON = "<?php echo SERVER_ADDR; ?>/manifest.json.php?ver=" + maniTimeVersion;
|
|
||||||
var onlineVersionNumber = "Connection Offline. Waiting to Reconect";
|
|
||||||
$.getJSON(onlineVersionJSON, function(onlineData) {onlineVersionNumber = onlineData.version;});
|
|
||||||
setTimeout(function(){
|
|
||||||
//console.log(' Checking PWA Content for updates...\n PWA Server Version: ' + onlineVersionNumber + '\n' + ' PWA Cached Version: ' + localVersionNumber);
|
|
||||||
if(onlineVersionNumber != localVersionNumber && onlineVersionNumber != "Connection Offline. Waiting to Reconect"){
|
|
||||||
updateModal();
|
|
||||||
log('New Version of Content Available. Refreshing. On Desktop Browsers a manual refresh maybe required.')
|
|
||||||
setTimeout(function(){
|
|
||||||
$('body').find('#menu-update').addClass('menu-active');
|
|
||||||
$('.menu-hider').addClass('menu-active-no-click');
|
|
||||||
updateButton();
|
|
||||||
},500);
|
|
||||||
}
|
|
||||||
if(onlineVersionNumber == localVersionNumber){/*No update required. Versions Identical*/}
|
|
||||||
if(onlineVersionNumber === "undefined"){/*Error Checking for Updates*/}
|
|
||||||
if(onlineVersionNumber === "Finding Online Version..."){
|
|
||||||
$('.reloadme').addClass('disabled');
|
|
||||||
$('body').find('#menu-update').removeClass('menu-active');
|
|
||||||
$('.menu-hider').removeClass('menu-active-no-click');
|
|
||||||
}
|
|
||||||
},3000);
|
|
||||||
}
|
|
||||||
//Checking for new version every 60 seconds
|
|
||||||
setInterval(function(){versionCheck()}, 50000);
|
|
||||||
//Initial Load Version Check in 10 Second After Load
|
|
||||||
setTimeout(function(){versionCheck();}, 10000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(pwaCookie == false){
|
|
||||||
eraseCookie('Sticky_pwa_rejected_install');
|
|
||||||
}
|
|
||||||
|
|
||||||
//Reload To Clear Button
|
//Reload To Clear Button
|
||||||
$('body').on('click', '.page-update, .reloadme', function() {
|
$('body').on('click', '.page-update, .reloadme', function() {
|
||||||
location.reload();
|
location.reload();
|
||||||
});
|
});
|
||||||
|
|
||||||
//Check for Version Change if Online If not Kill the Function
|
|
||||||
if (navigator.onLine) {check_version();} else {function check_version(){}}
|
|
||||||
|
|
||||||
//Adding Offline Alerts
|
//Adding Offline Alerts
|
||||||
var offlineAlerts = $('.offline-message');
|
var offlineAlerts = $('.offline-message');
|
||||||
|
|
||||||
@@ -224,47 +140,19 @@ $(document).ready(function(){
|
|||||||
setTimeout(function(){$('.online-message').removeClass('online-message-active');},2000);
|
setTimeout(function(){$('.online-message').removeClass('online-message-active');},2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
$('.simulate-offline').on('click',function(){isOffline();})
|
|
||||||
$('.simulate-online').on('click',function(){isOnline();})
|
|
||||||
|
|
||||||
//Disable links to other pages if offline.
|
|
||||||
//Warning! Enabling offline for iOS can cause issues
|
|
||||||
//To allow offline functionality delete the next 7 lines
|
|
||||||
function returnFalse(){
|
|
||||||
var detectHREF = $(this).attr('href');
|
|
||||||
if(detectHREF.match(/.html/)){
|
|
||||||
isOffline();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check if Online / Offline
|
//Check if Online / Offline
|
||||||
function updateOnlineStatus(event) {
|
function updateOnlineStatus(event) {
|
||||||
var condition = navigator.onLine ? "online" : "offline";
|
var condition = navigator.onLine ? "online" : "offline";
|
||||||
isOnline();
|
isOnline();
|
||||||
log( 'Connection: Online');
|
log( 'Connection: Online');
|
||||||
$("a").off( "click", returnFalse );
|
|
||||||
}
|
}
|
||||||
function updateOfflineStatus(event) {
|
function updateOfflineStatus(event) {
|
||||||
isOffline();
|
isOffline();
|
||||||
$("a").on( "click", returnFalse );
|
|
||||||
log( 'Connection: Offline');
|
log( 'Connection: Offline');
|
||||||
}
|
}
|
||||||
window.addEventListener('online', updateOnlineStatus);
|
window.addEventListener('online', updateOnlineStatus);
|
||||||
window.addEventListener('offline', updateOfflineStatus);
|
window.addEventListener('offline', updateOfflineStatus);
|
||||||
|
|
||||||
|
|
||||||
if(pwaNoCache == true){
|
|
||||||
caches.delete('workbox-runtime').then(function() {
|
|
||||||
});
|
|
||||||
localStorage.clear();
|
|
||||||
sessionStorage.clear()
|
|
||||||
caches.keys().then(cacheNames => {
|
|
||||||
cacheNames.forEach(cacheName => {
|
|
||||||
caches.delete(cacheName);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -307,15 +307,3 @@
|
|||||||
<a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a>
|
<a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="menu-update">
|
|
||||||
<div class="content bottom-0">
|
|
||||||
<p class="text-center mt-5"><i class="fa fa-sync-alt fa-7x color-highlight fa-spin"></i></p>
|
|
||||||
<h1 class="text-center mt-5 font-900">Update Verfügbar</h1>
|
|
||||||
<p class="text-center">
|
|
||||||
Eine neue Version unserer App ist verfügbar. Keine Sorge, Du musst nichts machen. Wir aktuallisieren den Inhalt in wenigen Sekunden.
|
|
||||||
</p>
|
|
||||||
<a href="#" class="page-update btn btn-center-xl btn-m shadow-xl rounded-s bg-highlight font-900 text-center">Update</a>
|
|
||||||
<p class="text-center font-10 bottom-0">Die App wird neu laden und das Update ist abgeschlossen.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|||||||
Reference in New Issue
Block a user