maishu-chitu
Advanced tools
Comparing version 3.4.0 to 3.4.2
/*! | ||
* | ||
* maishu-chitu v3.4.0 | ||
* maishu-chitu v3.4.2 | ||
* https://github.com/ansiboy/chitu | ||
@@ -286,7 +286,3 @@ * | ||
if (!pageUrl) throw Errors_1.Errors.argumentNull('pageUrl'); | ||
var routeData = _parseUrl(pageUrl); | ||
var containerName = routeData.values.container || Application.DefaultContainerName; | ||
var page = this.openPage(pageUrl, containerName, args); | ||
var page = this.showPage(pageUrl, args); | ||
var url = this.createUrl(page.name, page.data); | ||
@@ -301,8 +297,4 @@ this.setLocationHash(url); | ||
if (setUrl == null) setUrl = true; | ||
var page = this.showPage(pageUrl, args, true); | ||
var routeData = _parseUrl(pageUrl); | ||
var containerName = routeData.values.container || Application.DefaultContainerName; | ||
var page = this.openPage(pageUrl, containerName, args, true); | ||
if (setUrl) { | ||
@@ -1042,7 +1034,2 @@ var url = this.createUrl(page.name, page.data); | ||
value: function showPage(pageUrl, args, forceRender) { | ||
return this.openPage(pageUrl, Application_1.Application.DefaultContainerName, args, forceRender); | ||
} | ||
}, { | ||
key: "openPage", | ||
value: function openPage(pageUrl, containerName, args, forceRender) { | ||
args = args || {}; | ||
@@ -1068,2 +1055,3 @@ forceRender = forceRender == null ? false : true; | ||
if (this.currentPage != null && this.currentPage.url == pageUrl) return this.currentPage; | ||
var containerName = values.container || Application_1.Application.DefaultContainerName; | ||
@@ -1070,0 +1058,0 @@ var _this$getPage = this.getPage(pageUrl, containerName, args), |
/*! | ||
* | ||
* maishu-chitu v3.4.0 | ||
* maishu-chitu v3.4.2 | ||
* https://github.com/ansiboy/chitu | ||
@@ -233,5 +233,3 @@ * | ||
throw Errors_1.Errors.argumentNull('pageUrl'); | ||
let routeData = parseUrl(pageUrl); | ||
let containerName = routeData.values.container || Application.DefaultContainerName; | ||
let page = this.openPage(pageUrl, containerName, args); | ||
let page = this.showPage(pageUrl, args); | ||
let url = this.createUrl(page.name, page.data); | ||
@@ -246,5 +244,3 @@ this.setLocationHash(url); | ||
setUrl = true; | ||
let routeData = parseUrl(pageUrl); | ||
let containerName = routeData.values.container || Application.DefaultContainerName; | ||
let page = this.openPage(pageUrl, containerName, args, true); | ||
let page = this.showPage(pageUrl, args, true); | ||
if (setUrl) { | ||
@@ -687,5 +683,2 @@ let url = this.createUrl(page.name, page.data); | ||
showPage(pageUrl, args, forceRender) { | ||
return this.openPage(pageUrl, Application_1.Application.DefaultContainerName, args, forceRender); | ||
} | ||
openPage(pageUrl, containerName, args, forceRender) { | ||
args = args || {}; | ||
@@ -711,2 +704,3 @@ forceRender = forceRender == null ? false : true; | ||
return this.currentPage; | ||
let containerName = values.container || Application_1.Application.DefaultContainerName; | ||
let { page, isNew } = this.getPage(pageUrl, containerName, args); | ||
@@ -713,0 +707,0 @@ if (isNew || forceRender) { |
@@ -181,7 +181,3 @@ "use strict"; | ||
if (!pageUrl) throw Errors_1.Errors.argumentNull('pageUrl'); | ||
var routeData = _parseUrl(pageUrl); | ||
var containerName = routeData.values.container || Application.DefaultContainerName; | ||
var page = this.openPage(pageUrl, containerName, args); | ||
var page = this.showPage(pageUrl, args); | ||
var url = this.createUrl(page.name, page.data); | ||
@@ -196,8 +192,4 @@ this.setLocationHash(url); | ||
if (setUrl == null) setUrl = true; | ||
var page = this.showPage(pageUrl, args, true); | ||
var routeData = _parseUrl(pageUrl); | ||
var containerName = routeData.values.container || Application.DefaultContainerName; | ||
var page = this.openPage(pageUrl, containerName, args, true); | ||
if (setUrl) { | ||
@@ -204,0 +196,0 @@ var url = this.createUrl(page.name, page.data); |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -259,7 +259,2 @@ "use strict"; | ||
value: function showPage(pageUrl, args, forceRender) { | ||
return this.openPage(pageUrl, Application_1.Application.DefaultContainerName, args, forceRender); | ||
} | ||
}, { | ||
key: "openPage", | ||
value: function openPage(pageUrl, containerName, args, forceRender) { | ||
args = args || {}; | ||
@@ -285,2 +280,3 @@ forceRender = forceRender == null ? false : true; | ||
if (this.currentPage != null && this.currentPage.url == pageUrl) return this.currentPage; | ||
var containerName = values.container || Application_1.Application.DefaultContainerName; | ||
@@ -287,0 +283,0 @@ var _this$getPage = this.getPage(pageUrl, containerName, args), |
@@ -129,5 +129,3 @@ define(["require", "exports", "maishu-chitu-service", "./PageMaster", "./Errors"], function (require, exports, maishu_chitu_service_1, PageMaster_1, Errors_1) { | ||
throw Errors_1.Errors.argumentNull('pageUrl'); | ||
let routeData = parseUrl(pageUrl); | ||
let containerName = routeData.values.container || Application.DefaultContainerName; | ||
let page = this.openPage(pageUrl, containerName, args); | ||
let page = this.showPage(pageUrl, args); | ||
let url = this.createUrl(page.name, page.data); | ||
@@ -142,5 +140,3 @@ this.setLocationHash(url); | ||
setUrl = true; | ||
let routeData = parseUrl(pageUrl); | ||
let containerName = routeData.values.container || Application.DefaultContainerName; | ||
let page = this.openPage(pageUrl, containerName, args, true); | ||
let page = this.showPage(pageUrl, args, true); | ||
if (setUrl) { | ||
@@ -147,0 +143,0 @@ let url = this.createUrl(page.name, page.data); |
@@ -30,3 +30,2 @@ import { Callback1, Callback2 } from "maishu-chitu-service"; | ||
showPage(pageUrl: string, args?: PageData, forceRender?: boolean): Page; | ||
openPage(pageUrl: string, containerName: string, args?: PageData, forceRender?: boolean): Page; | ||
protected closePage(page: Page): void; | ||
@@ -33,0 +32,0 @@ private pushPage; |
@@ -156,5 +156,2 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
showPage(pageUrl, args, forceRender) { | ||
return this.openPage(pageUrl, Application_1.Application.DefaultContainerName, args, forceRender); | ||
} | ||
openPage(pageUrl, containerName, args, forceRender) { | ||
args = args || {}; | ||
@@ -180,2 +177,3 @@ forceRender = forceRender == null ? false : true; | ||
return this.currentPage; | ||
let containerName = values.container || Application_1.Application.DefaultContainerName; | ||
let { page, isNew } = this.getPage(pageUrl, containerName, args); | ||
@@ -182,0 +180,0 @@ if (isNew || forceRender) { |
@@ -36,3 +36,3 @@ { | ||
}, | ||
"version": "3.4.0" | ||
"version": "3.4.2" | ||
} |
@@ -214,5 +214,3 @@ import { IService, ServiceConstructor, Service } from "maishu-chitu-service"; | ||
let routeData = parseUrl(pageUrl) | ||
let containerName = (routeData.values.container as string) || Application.DefaultContainerName | ||
let page = this.openPage(pageUrl, containerName, args); | ||
let page = this.showPage(pageUrl, args); | ||
let url = this.createUrl(page.name, page.data); | ||
@@ -235,5 +233,3 @@ this.setLocationHash(url); | ||
let routeData = parseUrl(pageUrl) | ||
let containerName = (routeData.values.container as string) || Application.DefaultContainerName | ||
let page = this.openPage(pageUrl, containerName, args, true); | ||
let page = this.showPage(pageUrl, args, true); | ||
if (setUrl) { | ||
@@ -240,0 +236,0 @@ let url = this.createUrl(page.name, page.data); |
@@ -211,6 +211,2 @@ import { Callbacks, Callback1, Callback2 } from "maishu-chitu-service"; | ||
return this.openPage(pageUrl, Application.DefaultContainerName, args, forceRender) | ||
} | ||
public openPage(pageUrl: string, containerName: string, args?: PageData, forceRender?: boolean) { | ||
args = args || {} | ||
@@ -240,2 +236,3 @@ forceRender = forceRender == null ? false : true | ||
let containerName = (values.container as string) || Application.DefaultContainerName | ||
let { page, isNew } = this.getPage(pageUrl, containerName, args); | ||
@@ -259,2 +256,6 @@ if (isNew || forceRender) { | ||
// public openPage(pageUrl: string, containerName: string, args?: PageData, forceRender?: boolean) { | ||
// } | ||
protected closePage(page: Page) { | ||
@@ -261,0 +262,0 @@ if (page == null) |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
408687
6622