Merge pull request #9 from hft-app/ljans

Await data on initial start

Author: ljans

scripts/handler/core.js

@@ -27,6 +27,18 @@ class CoreHandler {
 	// Process request
 	async process(request) {
 
+		// Auto refresh
+		const checked = await this.controller.idb.state.get('checked');
+		if(!checked || new Date() - checked > 15*60*1000) {
+			await this.controller.idb.state.put(new Date(), 'checked');
+			
+			// Only refresh when online, wait for data on initial refresh
+			if(navigator.onLine) {
+				if(!checked) await controller.refresh();
+				else controller.refresh();
+			}
+		}
+		
 		// Load page and module
 		const page = request.params[1];
 		const module = this.modules[page];
@@ -53,13 +65,6 @@ class CoreHandler {
 		// Remember visitable page
 		if(page != 'error') await this.controller.idb.state.put(page, 'page');	
 
-		// Auto refresh
-		const checked = await this.controller.idb.state.get('checked');
-		if(!checked || new Date() - checked > 15*60*1000) {
-			await this.controller.idb.state.put(new Date(), 'checked');
-			if(navigator.onLine) controller.refresh();
-		}
-		
 		// Render template
 		return await this.controller.renderTemplate(page, data);
 	}