@trullock/page-manager 1.0.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trullock/page-manager",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Single page app manager",
   "exports": {
     ".": "./src/index.js"

package/src/index.js

@@ -23,7 +23,7 @@ var options = {
 
 export function registerPage(opts) {
 
-	let loadPageClass = opts.pageClass || opts.pageClassLoader;
+	let loadPageClass = opts.pageClass ? (() => opts.pageClass) : opts.loadPageClass;
 	let namedRoutes = opts.namedRoutes || { [opts.name]: opts.route };
 	let auth = opts.auth || null;
 	let cacheMarkupBy = opts.cacheMarkupBy || 'path'
@@ -64,14 +64,14 @@ function emitUrlChanged(url)
 // TODO: 404 and error too?
 function initLoading()
 {
-	var entry = router.routesByName(options.loadingPageName);
-	var route = router.parse(entry.route);
+	var url = router.interpolate(options.loadingPageName, {});
+	var route = router.parse(url);
 	return loadPage(route, {});
 }
 
 function showLoading() {
-	var pageLookup = router.routesByName(options.loadingPageName);
-	var route = router.parse(pageLookup.route);
+	var url = router.interpolate(options.loadingPageName, {});
+	var route = router.parse(url);
 	var data = {
 		route: route,
 		scrollY: window.scrollY,
@@ -85,8 +85,8 @@ function showLoading() {
 }
 
 function hideLoading() {
-	var pageLookup = router.routesByName(options.loadingPageName);
-	var route = router.parse(pageLookup.route);
+	var url = router.interpolate(options.loadingPageName, {});
+	var route = router.parse(url);
 	var page = (pageCache[route.path] || pageCache[route.pattern]).page;
 	return Promise.resolve(page.hide());
 }
@@ -121,8 +121,8 @@ async function showPage(url, data, event)
 	if (routeResult == null) {
 		console.error(`Can't find page: '${url}'`);
 		
-		let page404 = router.routesByName(options.error404PageName);
-		routeResult = router.parse(page404.route)
+		let url = router.interpolate(options.error404PageName, {});
+		routeResult = router.parse(url)
 	}
 
 	data = data || {};
@@ -298,6 +298,11 @@ export async function init(opts) {
 
 	await initLoading();
 	
+	await showLoading();
+}
+
+export async function ready()
+{
 	// set initial page
 	emitUrlChanged(window.location.pathname + window.location.search + window.location.hash);
 	showPage(window.location.pathname + window.location.search + window.location.hash, null, { action: 'load', distance: 0 }).catch(e => {
@@ -310,7 +315,6 @@ export async function init(opts) {
 					handleHistoryAction({ action: e.action }, e.url, e.data, page);
 				return page;
 			});
-			
 		}
 	});