@trullock/page-manager 0.13.2 → 0.14.0

package/package.json

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

package/src/index.js

@@ -131,7 +131,7 @@ function loadPage(route, data) {
 
 		let page = new (route.pageClass)($html);
 
-		let cacheKey = page.cacheMarkupBy == 'path' ? route.path : route.pattern;
+		let cacheKey = route.pageClass.cacheMarkupBy == 'path' ? route.path : route.pattern;
 		pageCache[cacheKey] = {
 			$html,
 			page
@@ -504,7 +504,7 @@ export function navigate(url, data, checkBeforeHide = true) {
 
 	url = expandOnlyHash(url);
 
-	if (checkBeforeHide === true && stack[stackPointer].page.beforeHide && options.beforeHide) {
+	if (checkBeforeHide === true && options.beforeHide && stack[stackPointer].page.beforeHide) {
 
 		var interrupt = stack[stackPointer].page.beforeHide();
 		if (interrupt) {

package/src/page.js

@@ -5,12 +5,7 @@ export default class Page {
 		this.visible = false;
 	}
 
-	cacheMarkupBy = 'route'
-
-	invalidateCache(){
-		// TODO: pagemanager doesnt currently read this
-		this.dirty = true;
-	}
+	static cacheMarkupBy = 'route'
 
 	_title = null;
 	get title() {

package/tests/page.js

@@ -1,8 +1,6 @@
 export default class Page {
 
-	dirty = false;
-
-	cacheMarkupBy = 'route'
+	static cacheMarkupBy = 'route'
 	
 	constructor($page){
 		this.$page = $page;