@trullock/page-manager 0.14.3 → 0.14.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/index.js +12 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trullock/page-manager",
3
- "version": "0.14.3",
3
+ "version": "0.14.4",
4
4
  "description": "Single page app manager",
5
5
  "exports": {
6
6
  ".": "./src/index.js"
package/src/index.js CHANGED
@@ -170,21 +170,23 @@ async function showPage(url, data, event) {
170
170
  return showPage(interrupt.url, null, event);
171
171
  }
172
172
 
173
- var getPage = showLoading().then(() => {
174
- if (pageCache[route.path])
175
- return pageCache[route.path].page;
173
+ await showLoading();
176
174
 
177
- if (pageCache[route.pattern])
178
- return pageCache[route.pattern].page;
179
-
180
- return loadPage(route, data)
181
- });
175
+ var getPage = null
176
+ if (pageCache[route.path])
177
+ getPage = pageCache[route.path].page;
178
+ else if (pageCache[route.pattern])
179
+ getPage = pageCache[route.pattern].page;
180
+ else
181
+ getPage = loadPage(route, data)
182
182
 
183
183
  // handle initial page
184
184
  if (event.action == 'load')
185
185
  {
186
186
  const page = await getPage;
187
187
  await doShow(page, data);
188
+ await hideLoading();
189
+
188
190
  // clean initial load
189
191
  if (stackPointer == -1) {
190
192
  stack.push({ uid: 0, data, page });
@@ -205,6 +207,7 @@ async function showPage(url, data, event) {
205
207
  handleHistoryAction(event, url, data, currentState.page);
206
208
  const page = await getPage;
207
209
  await doUpdate(page, data);
210
+ await hideLoading();
208
211
  return page;
209
212
  }
210
213
 
@@ -225,6 +228,7 @@ async function showPage(url, data, event) {
225
228
  // else if (event.action == 'fwd')
226
229
  // history.go(-1);
227
230
  // });
231
+ await hideLoading();
228
232
  return page
229
233
  }
230
234
 
@@ -234,14 +238,12 @@ async function doShow(page, data) {
234
238
 
235
239
  await Promise.resolve(page.show(data));
236
240
  document.title = page.title;
237
- await hideLoading();
238
241
  }
239
242
 
240
243
  async function doUpdate(page, data) {
241
244
 
242
245
  await Promise.resolve(page.update(data));
243
246
  document.title = page.title
244
- await hideLoading();
245
247
  }
246
248
 
247
249
  function handleHistoryAction(event, url, data, page) {