@trullock/page-manager 0.6.9 → 0.6.11

package/package.json

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

package/src/index.js

@@ -30,7 +30,7 @@ var options = {
 			});
 	},
 	pageInterrupt: route => null,
-	pageContainer: () => document.body,
+	attachMarkup: $html => document.body.appendChild($html),
 	prepareMarkup: $html => { },
 	loadingPageName: 'loading',
 	error404PageName: 'error-404',
@@ -107,14 +107,16 @@ function loadPage(route, data) {
 	return fetchPage.then($template => {
 		var $html = $template.cloneNode(true);
 		options.prepareMarkup($html);
-		options.pageContainer().appendChild($html);
+		options.attachMarkup($html);
 		pageCache[route.path] = {
 			$html,
 			page: new (route.pageClass)($html)
 		}
 
 		var page = pageCache[route.path].page;
-		return page.boot(data).then(() => page);
+		
+		let booted = new Promise(resolve => resolve(page.boot(data)));
+		return booted.then(() => page);
 	});
 }
 
@@ -159,6 +161,7 @@ function showPage(url, data, event) {
 	if (event.action == 'load')
 	{
 		return getPage
+					.then(page => doShow(page, data))
 					.then(page => {
 						// clean initial load
 						if(stackPointer == -1)
@@ -173,8 +176,7 @@ function showPage(url, data, event) {
 							stack[stackPointer].data = data;
 						}
 						return page;
-					})
-					.then(page => doShow(page, data));
+					});
 	}
 
 	let currentState = stack[stackPointer];
@@ -321,8 +323,16 @@ export async function init(opts) {
 	// set initial page
 	showPage(window.location.pathname + window.location.search + window.location.hash, null, { action: 'load', distance: 0 }).catch(e => {
 		console.error(e);
+		
 		if (e instanceof PageShowError)
-			return showPage(e.url, e.data, { action: stackPointer == -1 ? 'load' : e.action || 'show' });
+		{
+			return showPage(e.url, e.data, { action: stackPointer == -1 ? 'load' : e.action || 'show' }).then(page => {
+				if(e.action == 'replace')
+					handleHistoryAction({ action: e.action }, e.url, e.data, page);
+				return page;
+			});
+			
+		}
 	});
 
 	function handlePopstate(context, direction, distance) {