diff --git a/bower.json b/bower.json index 7005baf9..a31ef967 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-router", - "version": "0.5.2", + "version": "0.5.3", "description": "A powerful client-side router.", "keywords": [ "aurelia", diff --git a/dist/amd/activation.js b/dist/amd/activation.js index 10bfd2ad..ff022b25 100644 --- a/dist/amd/activation.js +++ b/dist/amd/activation.js @@ -1,14 +1,9 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], function (exports, _navigationPlan, _navigationCommands, _util) { "use strict"; - var _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); - }; + var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var INVOKE_LIFECYCLE = _navigationPlan.INVOKE_LIFECYCLE; var REPLACE = _navigationPlan.REPLACE; @@ -16,7 +11,7 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func var processPotential = _util.processPotential; var affirmations = exports.affirmations = ["yes", "ok", "true"]; - var CanDeactivatePreviousStep = (function () { + var CanDeactivatePreviousStep = exports.CanDeactivatePreviousStep = (function () { function CanDeactivatePreviousStep() {} _prototypeProperties(CanDeactivatePreviousStep, null, { @@ -25,16 +20,13 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return processDeactivatable(navigationContext.plan, "canDeactivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanDeactivatePreviousStep; })(); - - exports.CanDeactivatePreviousStep = CanDeactivatePreviousStep; - var CanActivateNextStep = (function () { + var CanActivateNextStep = exports.CanActivateNextStep = (function () { function CanActivateNextStep() {} _prototypeProperties(CanActivateNextStep, null, { @@ -43,16 +35,13 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return processActivatable(navigationContext, "canActivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanActivateNextStep; })(); - - exports.CanActivateNextStep = CanActivateNextStep; - var DeactivatePreviousStep = (function () { + var DeactivatePreviousStep = exports.DeactivatePreviousStep = (function () { function DeactivatePreviousStep() {} _prototypeProperties(DeactivatePreviousStep, null, { @@ -61,16 +50,13 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return processDeactivatable(navigationContext.plan, "deactivate", next, true); }, writable: true, - enumerable: true, configurable: true } }); return DeactivatePreviousStep; })(); - - exports.DeactivatePreviousStep = DeactivatePreviousStep; - var ActivateNextStep = (function () { + var ActivateNextStep = exports.ActivateNextStep = (function () { function ActivateNextStep() {} _prototypeProperties(ActivateNextStep, null, { @@ -79,7 +65,6 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return processActivatable(navigationContext, "activate", next, true); }, writable: true, - enumerable: true, configurable: true } }); @@ -87,19 +72,20 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return ActivateNextStep; })(); - exports.ActivateNextStep = ActivateNextStep; - function processDeactivatable(plan, callbackName, next, ignoreResult) { - var inspect = function (val) { + var infos = findDeactivatable(plan, callbackName), + i = infos.length; + + function inspect(val) { if (ignoreResult || shouldContinue(val)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { if (i--) { try { var controller = infos[i]; @@ -111,10 +97,7 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func } else { return next(); } - }; - - var infos = findDeactivatable(plan, callbackName), - i = infos.length; + } return iterate(); } @@ -165,15 +148,19 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func } function processActivatable(navigationContext, callbackName, next, ignoreResult) { - var inspect = function (val, router) { + var infos = findActivatable(navigationContext, callbackName), + length = infos.length, + i = -1; + + function inspect(val, router) { if (ignoreResult || shouldContinue(val, router)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { i++; if (i < length) { @@ -190,11 +177,7 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func } else { return next(); } - }; - - var infos = findActivatable(navigationContext, callbackName), - length = infos.length, - i = -1; + } return iterate(); } @@ -246,4 +229,5 @@ define(["exports", "./navigation-plan", "./navigation-commands", "./util"], func return output; } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/app-router.js b/dist/amd/app-router.js index fef91889..cc50d728 100644 --- a/dist/amd/app-router.js +++ b/dist/amd/app-router.js @@ -1,54 +1,18 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router", "./pipeline-provider", "./navigation-commands"], function (exports, _aureliaDependencyInjection, _aureliaHistory, _router, _pipelineProvider, _navigationCommands) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - var _get = function get(object, property, receiver) { - var desc = Object.getOwnPropertyDescriptor(object, property); + var _get = function get(object, property, receiver) { var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc && desc.writable) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - if (desc === undefined) { - var parent = Object.getPrototypeOf(object); - - if (parent === null) { - return undefined; - } else { - return get(parent, property, receiver); - } - } else if ("value" in desc && desc.writable) { - return desc.value; - } else { - var getter = desc.get; - if (getter === undefined) { - return undefined; - } - return getter.call(receiver); - } - }; - - var _inherits = function (subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); - } - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - enumerable: false, - writable: true, - configurable: true - } - }); - if (superClass) subClass.__proto__ = superClass; - }; + var _inherits = function (subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }; var Container = _aureliaDependencyInjection.Container; var History = _aureliaHistory.History; var Router = _router.Router; var PipelineProvider = _pipelineProvider.PipelineProvider; var isNavigationCommand = _navigationCommands.isNavigationCommand; - var AppRouter = (function (Router) { + var AppRouter = exports.AppRouter = (function (Router) { function AppRouter(container, history, pipelineProvider) { _get(Object.getPrototypeOf(AppRouter.prototype), "constructor", this).call(this, container, history); this.pipelineProvider = pipelineProvider; @@ -63,7 +27,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" return [Container, History, PipelineProvider]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -81,25 +44,23 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" }); }, writable: true, - enumerable: true, configurable: true }, queueInstruction: { value: function queueInstruction(instruction) { - var _this2 = this; + var _this = this; return new Promise(function (resolve) { instruction.resolve = resolve; - _this2.queue.unshift(instruction); - _this2.dequeueInstruction(); + _this.queue.unshift(instruction); + _this.dequeueInstruction(); }); }, writable: true, - enumerable: true, configurable: true }, dequeueInstruction: { value: function dequeueInstruction() { - var _this3 = this; + var _this = this; if (this.isNavigating) { return; } @@ -117,10 +78,10 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" var pipeline = this.pipelineProvider.createPipeline(context); pipeline.run(context).then(function (result) { - _this3.isNavigating = false; + _this.isNavigating = false; if (result.completed) { - _this3.history.previousFragment = instruction.fragment; + _this.history.previousFragment = instruction.fragment; } if (result.output instanceof Error) { @@ -128,31 +89,30 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" } if (isNavigationCommand(result.output)) { - result.output.navigate(_this3); - } else if (!result.completed && _this3.history.previousFragment) { - _this3.navigate(_this3.history.previousFragment, false); + result.output.navigate(_this); + } else if (!result.completed && _this.history.previousFragment) { + _this.navigate(_this.history.previousFragment, false); } instruction.resolve(result); - _this3.dequeueInstruction(); + _this.dequeueInstruction(); })["catch"](function (error) { console.error(error); }); }, writable: true, - enumerable: true, configurable: true }, registerViewPort: { value: function registerViewPort(viewPort, name) { - var _this4 = this; + var _this = this; _get(Object.getPrototypeOf(AppRouter.prototype), "registerViewPort", this).call(this, viewPort, name); if (!this.isActive) { if ("configureRouter" in this.container.viewModel) { var result = this.container.viewModel.configureRouter() || Promise.resolve(); return result.then(function () { - return _this4.activate(); + return _this.activate(); }); } else { this.activate(); @@ -162,7 +122,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" } }, writable: true, - enumerable: true, configurable: true }, activate: { @@ -177,7 +136,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" this.dequeueInstruction(); }, writable: true, - enumerable: true, configurable: true }, deactivate: { @@ -186,7 +144,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" this.history.deactivate(); }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -196,7 +153,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" this.options = null; }, writable: true, - enumerable: true, configurable: true } }); @@ -204,8 +160,6 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" return AppRouter; })(Router); - exports.AppRouter = AppRouter; - function handleLinkClick(evt) { if (!this.isActive) { @@ -234,4 +188,5 @@ define(["exports", "aurelia-dependency-injection", "aurelia-history", "./router" return !targetWindow || targetWindow === window.name || targetWindow === "_self" || targetWindow === "top" && window === window.top; } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/index.js b/dist/amd/index.js index 0b3fd5fb..b8d1353e 100644 --- a/dist/amd/index.js +++ b/dist/amd/index.js @@ -10,4 +10,5 @@ define(["exports", "./router", "./app-router", "./pipeline-provider", "./navigat exports.NO_CHANGE = _navigationPlan.NO_CHANGE; exports.INVOKE_LIFECYCLE = _navigationPlan.INVOKE_LIFECYCLE; exports.REPLACE = _navigationPlan.REPLACE; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/model-binding.js b/dist/amd/model-binding.js index a2eef8de..e7d73332 100644 --- a/dist/amd/model-binding.js +++ b/dist/amd/model-binding.js @@ -1,12 +1,9 @@ define(["exports"], function (exports) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - var ApplyModelBindersStep = (function () { + var ApplyModelBindersStep = exports.ApplyModelBindersStep = (function () { function ApplyModelBindersStep() {} _prototypeProperties(ApplyModelBindersStep, null, { @@ -15,13 +12,11 @@ define(["exports"], function (exports) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return ApplyModelBindersStep; })(); - - exports.ApplyModelBindersStep = ApplyModelBindersStep; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/navigation-commands.js b/dist/amd/navigation-commands.js index a2349c4d..958a1a3d 100644 --- a/dist/amd/navigation-commands.js +++ b/dist/amd/navigation-commands.js @@ -1,17 +1,14 @@ define(["exports"], function (exports) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.isNavigationCommand = isNavigationCommand; function isNavigationCommand(obj) { return obj && typeof obj.navigate === "function"; } - var Redirect = (function () { + var Redirect = exports.Redirect = (function () { function Redirect(url) { this.url = url; this.shouldContinueProcessing = false; @@ -23,13 +20,11 @@ define(["exports"], function (exports) { (this.router || appRouter).navigate(this.url, { trigger: true, replace: true }); }, writable: true, - enumerable: true, configurable: true } }); return Redirect; })(); - - exports.Redirect = Redirect; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/navigation-context.js b/dist/amd/navigation-context.js index 644e3a06..6de9044d 100644 --- a/dist/amd/navigation-context.js +++ b/dist/amd/navigation-context.js @@ -1,13 +1,10 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var REPLACE = _navigationPlan.REPLACE; - var NavigationContext = (function () { + var NavigationContext = exports.NavigationContext = (function () { function NavigationContext(router, nextInstruction) { this.router = router; this.nextInstruction = nextInstruction; @@ -68,7 +65,6 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { }); }, writable: true, - enumerable: true, configurable: true }, buildTitle: { @@ -101,16 +97,13 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { return title; }, writable: true, - enumerable: true, configurable: true } }); return NavigationContext; })(); - - exports.NavigationContext = NavigationContext; - var CommitChangesStep = (function () { + var CommitChangesStep = exports.CommitChangesStep = (function () { function CommitChangesStep() {} _prototypeProperties(CommitChangesStep, null, { @@ -126,13 +119,11 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return CommitChangesStep; })(); - - exports.CommitChangesStep = CommitChangesStep; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/navigation-instruction.js b/dist/amd/navigation-instruction.js index 413110d4..aa501c74 100644 --- a/dist/amd/navigation-instruction.js +++ b/dist/amd/navigation-instruction.js @@ -1,12 +1,9 @@ define(["exports"], function (exports) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - var NavigationInstruction = (function () { + var NavigationInstruction = exports.NavigationInstruction = (function () { function NavigationInstruction(fragment, queryString, params, queryParams, config, parentInstruction) { this.fragment = fragment; this.queryString = queryString; @@ -34,7 +31,6 @@ define(["exports"], function (exports) { }; }, writable: true, - enumerable: true, configurable: true }, getWildCardName: { @@ -43,7 +39,6 @@ define(["exports"], function (exports) { return this.config.route.substr(wildcardIndex + 1); }, writable: true, - enumerable: true, configurable: true }, getWildcardPath: { @@ -58,7 +53,6 @@ define(["exports"], function (exports) { return path; }, writable: true, - enumerable: true, configurable: true }, getBaseUrl: { @@ -77,13 +71,11 @@ define(["exports"], function (exports) { return this.fragment.substr(0, this.fragment.lastIndexOf(path)); }, writable: true, - enumerable: true, configurable: true } }); return NavigationInstruction; })(); - - exports.NavigationInstruction = NavigationInstruction; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/navigation-plan.js b/dist/amd/navigation-plan.js index 6eaabaf9..4541a1e3 100644 --- a/dist/amd/navigation-plan.js +++ b/dist/amd/navigation-plan.js @@ -1,14 +1,9 @@ define(["exports"], function (exports) { "use strict"; - var _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); - }; + var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.buildNavigationPlan = buildNavigationPlan; var NO_CHANGE = exports.NO_CHANGE = "no-change"; @@ -76,7 +71,7 @@ define(["exports"], function (exports) { } } - var BuildNavigationPlanStep = (function () { + var BuildNavigationPlanStep = exports.BuildNavigationPlanStep = (function () { function BuildNavigationPlanStep() {} _prototypeProperties(BuildNavigationPlanStep, null, { @@ -88,7 +83,6 @@ define(["exports"], function (exports) { })["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); @@ -96,8 +90,6 @@ define(["exports"], function (exports) { return BuildNavigationPlanStep; })(); - exports.BuildNavigationPlanStep = BuildNavigationPlanStep; - function hasDifferentParameterValues(prev, next) { var prevParams = prev.params, @@ -116,4 +108,5 @@ define(["exports"], function (exports) { return false; } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/pipeline-provider.js b/dist/amd/pipeline-provider.js index b09e92fb..51d2df03 100644 --- a/dist/amd/pipeline-provider.js +++ b/dist/amd/pipeline-provider.js @@ -1,10 +1,7 @@ define(["exports", "aurelia-dependency-injection", "./pipeline", "./navigation-plan", "./model-binding", "./route-loading", "./navigation-context", "./activation"], function (exports, _aureliaDependencyInjection, _pipeline, _navigationPlan, _modelBinding, _routeLoading, _navigationContext, _activation) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var Container = _aureliaDependencyInjection.Container; var Pipeline = _pipeline.Pipeline; @@ -16,7 +13,7 @@ define(["exports", "aurelia-dependency-injection", "./pipeline", "./navigation-p var CanActivateNextStep = _activation.CanActivateNextStep; var DeactivatePreviousStep = _activation.DeactivatePreviousStep; var ActivateNextStep = _activation.ActivateNextStep; - var PipelineProvider = (function () { + var PipelineProvider = exports.PipelineProvider = (function () { function PipelineProvider(container) { this.container = container; this.steps = [BuildNavigationPlanStep, CanDeactivatePreviousStep, LoadRouteStep, ApplyModelBindersStep, CanActivateNextStep, DeactivatePreviousStep, ActivateNextStep, CommitChangesStep]; @@ -28,7 +25,6 @@ define(["exports", "aurelia-dependency-injection", "./pipeline", "./navigation-p return [Container]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -42,13 +38,11 @@ define(["exports", "aurelia-dependency-injection", "./pipeline", "./navigation-p return pipeline; }, writable: true, - enumerable: true, configurable: true } }); return PipelineProvider; })(); - - exports.PipelineProvider = PipelineProvider; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/pipeline.js b/dist/amd/pipeline.js index e126ed17..3fcca966 100644 --- a/dist/amd/pipeline.js +++ b/dist/amd/pipeline.js @@ -1,10 +1,7 @@ define(["exports"], function (exports) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; function createResult(ctx, next) { return { @@ -20,7 +17,7 @@ define(["exports"], function (exports) { var REJECTED = exports.REJECTED = "rejected"; var RUNNING = exports.RUNNING = "running"; - var Pipeline = (function () { + var Pipeline = exports.Pipeline = (function () { function Pipeline() { this.steps = []; } @@ -41,7 +38,6 @@ define(["exports"], function (exports) { return this; }, writable: true, - enumerable: true, configurable: true }, run: { @@ -90,13 +86,11 @@ define(["exports"], function (exports) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return Pipeline; })(); - - exports.Pipeline = Pipeline; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/route-loading.js b/dist/amd/route-loading.js index 6b915da1..2f835f4e 100644 --- a/dist/amd/route-loading.js +++ b/dist/amd/route-loading.js @@ -1,15 +1,12 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.loadNewRoute = loadNewRoute; var REPLACE = _navigationPlan.REPLACE; var buildNavigationPlan = _navigationPlan.buildNavigationPlan; - var RouteLoader = (function () { + var RouteLoader = exports.RouteLoader = (function () { function RouteLoader() {} _prototypeProperties(RouteLoader, null, { @@ -18,16 +15,13 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { throw Error("Route loaders must implment \"loadRoute(router, config)\"."); }, writable: true, - enumerable: true, configurable: true } }); return RouteLoader; })(); - - exports.RouteLoader = RouteLoader; - var LoadRouteStep = (function () { + var LoadRouteStep = exports.LoadRouteStep = (function () { function LoadRouteStep(routeLoader) { this.routeLoader = routeLoader; } @@ -38,7 +32,6 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { return [RouteLoader]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -47,15 +40,12 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { return loadNewRoute([], this.routeLoader, navigationContext).then(next)["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); return LoadRouteStep; })(); - - exports.LoadRouteStep = LoadRouteStep; function loadNewRoute(routers, routeLoader, navigationContext) { var toLoad = determineWhatToLoad(navigationContext); var loadPromises = toLoad.map(function (current) { @@ -138,4 +128,5 @@ define(["exports", "./navigation-plan"], function (exports, _navigationPlan) { return component; }); } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/router-configuration.js b/dist/amd/router-configuration.js index fb2fbe80..65601dd8 100644 --- a/dist/amd/router-configuration.js +++ b/dist/amd/router-configuration.js @@ -1,12 +1,9 @@ define(["exports"], function (exports) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - var RouterConfiguration = (function () { + var RouterConfiguration = exports.RouterConfiguration = (function () { function RouterConfiguration() { this.instructions = []; this.options = {}; @@ -38,7 +35,6 @@ define(["exports"], function (exports) { return this.mapRoute(config); }, writable: true, - enumerable: true, configurable: true }, mapRoute: { @@ -64,7 +60,6 @@ define(["exports"], function (exports) { return this; }, writable: true, - enumerable: true, configurable: true }, mapUnknownRoutes: { @@ -73,7 +68,6 @@ define(["exports"], function (exports) { return this; }, writable: true, - enumerable: true, configurable: true }, exportToRouter: { @@ -97,7 +91,6 @@ define(["exports"], function (exports) { router.options = this.options; }, writable: true, - enumerable: true, configurable: true }, configureRoute: { @@ -106,7 +99,6 @@ define(["exports"], function (exports) { router.addRoute(config, navModel); }, writable: true, - enumerable: true, configurable: true }, ensureDefaultsForRouteConfig: { @@ -117,7 +109,6 @@ define(["exports"], function (exports) { config.moduleId = ensureConfigValue(config, "moduleId", this.deriveModuleId); }, writable: true, - enumerable: true, configurable: true }, deriveName: { @@ -125,7 +116,6 @@ define(["exports"], function (exports) { return config.title || (config.route ? stripParametersFromRoute(config.route) : config.moduleId); }, writable: true, - enumerable: true, configurable: true }, deriveRoute: { @@ -133,7 +123,6 @@ define(["exports"], function (exports) { return config.moduleId || config.name; }, writable: true, - enumerable: true, configurable: true }, deriveTitle: { @@ -142,7 +131,6 @@ define(["exports"], function (exports) { return value.substr(0, 1).toUpperCase() + value.substr(1); }, writable: true, - enumerable: true, configurable: true }, deriveModuleId: { @@ -150,7 +138,6 @@ define(["exports"], function (exports) { return stripParametersFromRoute(config.route); }, writable: true, - enumerable: true, configurable: true } }); @@ -158,8 +145,6 @@ define(["exports"], function (exports) { return RouterConfiguration; })(); - exports.RouterConfiguration = RouterConfiguration; - function ensureConfigValue(config, property, getter) { var value = config[property]; @@ -176,4 +161,5 @@ define(["exports"], function (exports) { var length = colonIndex > 0 ? colonIndex - 1 : route.length; return route.substr(0, length); } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/router.js b/dist/amd/router.js index a7d9a7f7..9061f6b6 100644 --- a/dist/amd/router.js +++ b/dist/amd/router.js @@ -1,10 +1,7 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-context", "./navigation-instruction", "./router-configuration", "./util"], function (exports, _aureliaRouteRecognizer, _aureliaPath, _navigationContext, _navigationInstruction, _routerConfiguration, _util) { "use strict"; - var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var RouteRecognizer = _aureliaRouteRecognizer.RouteRecognizer; var join = _aureliaPath.join; @@ -12,7 +9,7 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con var NavigationInstruction = _navigationInstruction.NavigationInstruction; var RouterConfiguration = _routerConfiguration.RouterConfiguration; var processPotential = _util.processPotential; - var Router = (function () { + var Router = exports.Router = (function () { function Router(container, history) { this.container = container; this.history = history; @@ -28,7 +25,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con this.viewPorts[name] = viewPort; }, writable: true, - enumerable: true, configurable: true }, refreshBaseUrl: { @@ -39,7 +35,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } }, writable: true, - enumerable: true, configurable: true }, refreshNavigation: { @@ -55,6 +50,8 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } else { current.href = "#/" + this.baseUrl; } + } else { + current.href = "/" + this.baseUrl; } if (current.href[current.href.length - 1] != "/") { @@ -65,7 +62,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } }, writable: true, - enumerable: true, configurable: true }, configure: { @@ -81,7 +77,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con return this; }, writable: true, - enumerable: true, configurable: true }, navigate: { @@ -90,7 +85,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con return this.history.navigate(fragment, options); }, writable: true, - enumerable: true, configurable: true }, navigateBack: { @@ -98,7 +92,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con this.history.navigateBack(); }, writable: true, - enumerable: true, configurable: true }, createChild: { @@ -108,7 +101,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con return childRouter; }, writable: true, - enumerable: true, configurable: true }, createNavigationInstruction: { @@ -175,7 +167,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } }, writable: true, - enumerable: true, configurable: true }, createNavigationContext: { @@ -183,7 +174,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con return new NavigationContext(this, instruction); }, writable: true, - enumerable: true, configurable: true }, generate: { @@ -191,7 +181,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con return this.recognizer.generate(name, params); }, writable: true, - enumerable: true, configurable: true }, addRoute: { @@ -247,18 +236,17 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } }, writable: true, - enumerable: true, configurable: true }, handleUnknownRoutes: { value: function handleUnknownRoutes(config) { var callback = function (instruction) { return new Promise(function (resolve, reject) { - var done = function (inst) { + function done(inst) { inst = inst || instruction; inst.config.route = inst.params.path; resolve(inst); - }; + } if (!config) { instruction.config.moduleId = instruction.fragment; @@ -278,7 +266,6 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con this.catchAllHandler = callback; }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -291,13 +278,11 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con this.navigation = []; }, writable: true, - enumerable: true, configurable: true } }); return Router; })(); - - exports.Router = Router; + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/amd/util.js b/dist/amd/util.js index 05df0796..1d06faa2 100644 --- a/dist/amd/util.js +++ b/dist/amd/util.js @@ -21,4 +21,5 @@ define(["exports"], function (exports) { } } } + exports.__esModule = true; }); \ No newline at end of file diff --git a/dist/commonjs/activation.js b/dist/commonjs/activation.js index 8f424e46..1f1a34c5 100644 --- a/dist/commonjs/activation.js +++ b/dist/commonjs/activation.js @@ -1,21 +1,18 @@ "use strict"; -var _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); -}; +var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; -var INVOKE_LIFECYCLE = require("./navigation-plan").INVOKE_LIFECYCLE; -var REPLACE = require("./navigation-plan").REPLACE; +var _navigationPlan = require("./navigation-plan"); + +var INVOKE_LIFECYCLE = _navigationPlan.INVOKE_LIFECYCLE; +var REPLACE = _navigationPlan.REPLACE; var isNavigationCommand = require("./navigation-commands").isNavigationCommand; var processPotential = require("./util").processPotential; var affirmations = exports.affirmations = ["yes", "ok", "true"]; -var CanDeactivatePreviousStep = (function () { +var CanDeactivatePreviousStep = exports.CanDeactivatePreviousStep = (function () { function CanDeactivatePreviousStep() {} _prototypeProperties(CanDeactivatePreviousStep, null, { @@ -24,16 +21,13 @@ var CanDeactivatePreviousStep = (function () { return processDeactivatable(navigationContext.plan, "canDeactivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanDeactivatePreviousStep; })(); - -exports.CanDeactivatePreviousStep = CanDeactivatePreviousStep; -var CanActivateNextStep = (function () { +var CanActivateNextStep = exports.CanActivateNextStep = (function () { function CanActivateNextStep() {} _prototypeProperties(CanActivateNextStep, null, { @@ -42,16 +36,13 @@ var CanActivateNextStep = (function () { return processActivatable(navigationContext, "canActivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanActivateNextStep; })(); - -exports.CanActivateNextStep = CanActivateNextStep; -var DeactivatePreviousStep = (function () { +var DeactivatePreviousStep = exports.DeactivatePreviousStep = (function () { function DeactivatePreviousStep() {} _prototypeProperties(DeactivatePreviousStep, null, { @@ -60,16 +51,13 @@ var DeactivatePreviousStep = (function () { return processDeactivatable(navigationContext.plan, "deactivate", next, true); }, writable: true, - enumerable: true, configurable: true } }); return DeactivatePreviousStep; })(); - -exports.DeactivatePreviousStep = DeactivatePreviousStep; -var ActivateNextStep = (function () { +var ActivateNextStep = exports.ActivateNextStep = (function () { function ActivateNextStep() {} _prototypeProperties(ActivateNextStep, null, { @@ -78,7 +66,6 @@ var ActivateNextStep = (function () { return processActivatable(navigationContext, "activate", next, true); }, writable: true, - enumerable: true, configurable: true } }); @@ -86,19 +73,20 @@ var ActivateNextStep = (function () { return ActivateNextStep; })(); -exports.ActivateNextStep = ActivateNextStep; - function processDeactivatable(plan, callbackName, next, ignoreResult) { - var inspect = function (val) { + var infos = findDeactivatable(plan, callbackName), + i = infos.length; + + function inspect(val) { if (ignoreResult || shouldContinue(val)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { if (i--) { try { var controller = infos[i]; @@ -110,10 +98,7 @@ function processDeactivatable(plan, callbackName, next, ignoreResult) { } else { return next(); } - }; - - var infos = findDeactivatable(plan, callbackName), - i = infos.length; + } return iterate(); } @@ -164,15 +149,19 @@ function addPreviousDeactivatable(component, callbackName, list) { } function processActivatable(navigationContext, callbackName, next, ignoreResult) { - var inspect = function (val, router) { + var infos = findActivatable(navigationContext, callbackName), + length = infos.length, + i = -1; + + function inspect(val, router) { if (ignoreResult || shouldContinue(val, router)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { i++; if (i < length) { @@ -189,11 +178,7 @@ function processActivatable(navigationContext, callbackName, next, ignoreResult) } else { return next(); } - }; - - var infos = findActivatable(navigationContext, callbackName), - length = infos.length, - i = -1; + } return iterate(); } @@ -244,4 +229,5 @@ function shouldContinue(output, router) { } return output; -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/app-router.js b/dist/commonjs/app-router.js index 8832dfda..695e878e 100644 --- a/dist/commonjs/app-router.js +++ b/dist/commonjs/app-router.js @@ -1,53 +1,17 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; -var _get = function get(object, property, receiver) { - var desc = Object.getOwnPropertyDescriptor(object, property); +var _get = function get(object, property, receiver) { var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc && desc.writable) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - if (desc === undefined) { - var parent = Object.getPrototypeOf(object); - - if (parent === null) { - return undefined; - } else { - return get(parent, property, receiver); - } - } else if ("value" in desc && desc.writable) { - return desc.value; - } else { - var getter = desc.get; - if (getter === undefined) { - return undefined; - } - return getter.call(receiver); - } -}; - -var _inherits = function (subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); - } - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - enumerable: false, - writable: true, - configurable: true - } - }); - if (superClass) subClass.__proto__ = superClass; -}; +var _inherits = function (subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }; var Container = require("aurelia-dependency-injection").Container; var History = require("aurelia-history").History; var Router = require("./router").Router; var PipelineProvider = require("./pipeline-provider").PipelineProvider; var isNavigationCommand = require("./navigation-commands").isNavigationCommand; -var AppRouter = (function (Router) { +var AppRouter = exports.AppRouter = (function (Router) { function AppRouter(container, history, pipelineProvider) { _get(Object.getPrototypeOf(AppRouter.prototype), "constructor", this).call(this, container, history); this.pipelineProvider = pipelineProvider; @@ -62,7 +26,6 @@ var AppRouter = (function (Router) { return [Container, History, PipelineProvider]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -80,25 +43,23 @@ var AppRouter = (function (Router) { }); }, writable: true, - enumerable: true, configurable: true }, queueInstruction: { value: function queueInstruction(instruction) { - var _this2 = this; + var _this = this; return new Promise(function (resolve) { instruction.resolve = resolve; - _this2.queue.unshift(instruction); - _this2.dequeueInstruction(); + _this.queue.unshift(instruction); + _this.dequeueInstruction(); }); }, writable: true, - enumerable: true, configurable: true }, dequeueInstruction: { value: function dequeueInstruction() { - var _this3 = this; + var _this = this; if (this.isNavigating) { return; } @@ -116,10 +77,10 @@ var AppRouter = (function (Router) { var pipeline = this.pipelineProvider.createPipeline(context); pipeline.run(context).then(function (result) { - _this3.isNavigating = false; + _this.isNavigating = false; if (result.completed) { - _this3.history.previousFragment = instruction.fragment; + _this.history.previousFragment = instruction.fragment; } if (result.output instanceof Error) { @@ -127,31 +88,30 @@ var AppRouter = (function (Router) { } if (isNavigationCommand(result.output)) { - result.output.navigate(_this3); - } else if (!result.completed && _this3.history.previousFragment) { - _this3.navigate(_this3.history.previousFragment, false); + result.output.navigate(_this); + } else if (!result.completed && _this.history.previousFragment) { + _this.navigate(_this.history.previousFragment, false); } instruction.resolve(result); - _this3.dequeueInstruction(); + _this.dequeueInstruction(); })["catch"](function (error) { console.error(error); }); }, writable: true, - enumerable: true, configurable: true }, registerViewPort: { value: function registerViewPort(viewPort, name) { - var _this4 = this; + var _this = this; _get(Object.getPrototypeOf(AppRouter.prototype), "registerViewPort", this).call(this, viewPort, name); if (!this.isActive) { if ("configureRouter" in this.container.viewModel) { var result = this.container.viewModel.configureRouter() || Promise.resolve(); return result.then(function () { - return _this4.activate(); + return _this.activate(); }); } else { this.activate(); @@ -161,7 +121,6 @@ var AppRouter = (function (Router) { } }, writable: true, - enumerable: true, configurable: true }, activate: { @@ -176,7 +135,6 @@ var AppRouter = (function (Router) { this.dequeueInstruction(); }, writable: true, - enumerable: true, configurable: true }, deactivate: { @@ -185,7 +143,6 @@ var AppRouter = (function (Router) { this.history.deactivate(); }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -195,7 +152,6 @@ var AppRouter = (function (Router) { this.options = null; }, writable: true, - enumerable: true, configurable: true } }); @@ -203,8 +159,6 @@ var AppRouter = (function (Router) { return AppRouter; })(Router); -exports.AppRouter = AppRouter; - function handleLinkClick(evt) { if (!this.isActive) { @@ -232,4 +186,5 @@ function targetIsThisWindow(target) { var targetWindow = target.getAttribute("target"); return !targetWindow || targetWindow === window.name || targetWindow === "_self" || targetWindow === "top" && window === window.top; -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js index c009fe0f..988d173b 100644 --- a/dist/commonjs/index.js +++ b/dist/commonjs/index.js @@ -6,6 +6,9 @@ exports.PipelineProvider = require("./pipeline-provider").PipelineProvider; exports.Redirect = require("./navigation-commands").Redirect; exports.RouteLoader = require("./route-loading").RouteLoader; exports.RouterConfiguration = require("./router-configuration").RouterConfiguration; -exports.NO_CHANGE = require("./navigation-plan").NO_CHANGE; -exports.INVOKE_LIFECYCLE = require("./navigation-plan").INVOKE_LIFECYCLE; -exports.REPLACE = require("./navigation-plan").REPLACE; \ No newline at end of file +var _navigationPlan = require("./navigation-plan"); + +exports.NO_CHANGE = _navigationPlan.NO_CHANGE; +exports.INVOKE_LIFECYCLE = _navigationPlan.INVOKE_LIFECYCLE; +exports.REPLACE = _navigationPlan.REPLACE; +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/model-binding.js b/dist/commonjs/model-binding.js index 1ab83de6..e2c28c0a 100644 --- a/dist/commonjs/model-binding.js +++ b/dist/commonjs/model-binding.js @@ -1,11 +1,8 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; -var ApplyModelBindersStep = (function () { +var ApplyModelBindersStep = exports.ApplyModelBindersStep = (function () { function ApplyModelBindersStep() {} _prototypeProperties(ApplyModelBindersStep, null, { @@ -14,12 +11,10 @@ var ApplyModelBindersStep = (function () { return next(); }, writable: true, - enumerable: true, configurable: true } }); return ApplyModelBindersStep; })(); - -exports.ApplyModelBindersStep = ApplyModelBindersStep; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/navigation-commands.js b/dist/commonjs/navigation-commands.js index e694354f..0f22febd 100644 --- a/dist/commonjs/navigation-commands.js +++ b/dist/commonjs/navigation-commands.js @@ -1,16 +1,13 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.isNavigationCommand = isNavigationCommand; function isNavigationCommand(obj) { return obj && typeof obj.navigate === "function"; } -var Redirect = (function () { +var Redirect = exports.Redirect = (function () { function Redirect(url) { this.url = url; this.shouldContinueProcessing = false; @@ -22,12 +19,10 @@ var Redirect = (function () { (this.router || appRouter).navigate(this.url, { trigger: true, replace: true }); }, writable: true, - enumerable: true, configurable: true } }); return Redirect; })(); - -exports.Redirect = Redirect; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/navigation-context.js b/dist/commonjs/navigation-context.js index 6f3720e0..ca80d6d0 100644 --- a/dist/commonjs/navigation-context.js +++ b/dist/commonjs/navigation-context.js @@ -1,12 +1,9 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var REPLACE = require("./navigation-plan").REPLACE; -var NavigationContext = (function () { +var NavigationContext = exports.NavigationContext = (function () { function NavigationContext(router, nextInstruction) { this.router = router; this.nextInstruction = nextInstruction; @@ -67,7 +64,6 @@ var NavigationContext = (function () { }); }, writable: true, - enumerable: true, configurable: true }, buildTitle: { @@ -100,16 +96,13 @@ var NavigationContext = (function () { return title; }, writable: true, - enumerable: true, configurable: true } }); return NavigationContext; })(); - -exports.NavigationContext = NavigationContext; -var CommitChangesStep = (function () { +var CommitChangesStep = exports.CommitChangesStep = (function () { function CommitChangesStep() {} _prototypeProperties(CommitChangesStep, null, { @@ -125,12 +118,10 @@ var CommitChangesStep = (function () { return next(); }, writable: true, - enumerable: true, configurable: true } }); return CommitChangesStep; })(); - -exports.CommitChangesStep = CommitChangesStep; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/navigation-instruction.js b/dist/commonjs/navigation-instruction.js index 971d5b66..f91cc269 100644 --- a/dist/commonjs/navigation-instruction.js +++ b/dist/commonjs/navigation-instruction.js @@ -1,11 +1,8 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; -var NavigationInstruction = (function () { +var NavigationInstruction = exports.NavigationInstruction = (function () { function NavigationInstruction(fragment, queryString, params, queryParams, config, parentInstruction) { this.fragment = fragment; this.queryString = queryString; @@ -33,7 +30,6 @@ var NavigationInstruction = (function () { }; }, writable: true, - enumerable: true, configurable: true }, getWildCardName: { @@ -42,7 +38,6 @@ var NavigationInstruction = (function () { return this.config.route.substr(wildcardIndex + 1); }, writable: true, - enumerable: true, configurable: true }, getWildcardPath: { @@ -57,7 +52,6 @@ var NavigationInstruction = (function () { return path; }, writable: true, - enumerable: true, configurable: true }, getBaseUrl: { @@ -76,12 +70,10 @@ var NavigationInstruction = (function () { return this.fragment.substr(0, this.fragment.lastIndexOf(path)); }, writable: true, - enumerable: true, configurable: true } }); return NavigationInstruction; })(); - -exports.NavigationInstruction = NavigationInstruction; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/navigation-plan.js b/dist/commonjs/navigation-plan.js index ce3ee9b2..603c071e 100644 --- a/dist/commonjs/navigation-plan.js +++ b/dist/commonjs/navigation-plan.js @@ -1,13 +1,8 @@ "use strict"; -var _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); -}; +var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.buildNavigationPlan = buildNavigationPlan; var NO_CHANGE = exports.NO_CHANGE = "no-change"; @@ -75,7 +70,7 @@ function buildNavigationPlan(navigationContext, forceLifecycleMinimum) { } } -var BuildNavigationPlanStep = (function () { +var BuildNavigationPlanStep = exports.BuildNavigationPlanStep = (function () { function BuildNavigationPlanStep() {} _prototypeProperties(BuildNavigationPlanStep, null, { @@ -87,7 +82,6 @@ var BuildNavigationPlanStep = (function () { })["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); @@ -95,8 +89,6 @@ var BuildNavigationPlanStep = (function () { return BuildNavigationPlanStep; })(); -exports.BuildNavigationPlanStep = BuildNavigationPlanStep; - function hasDifferentParameterValues(prev, next) { var prevParams = prev.params, @@ -114,4 +106,5 @@ function hasDifferentParameterValues(prev, next) { } return false; -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/pipeline-provider.js b/dist/commonjs/pipeline-provider.js index 8911d324..13899dfc 100644 --- a/dist/commonjs/pipeline-provider.js +++ b/dist/commonjs/pipeline-provider.js @@ -1,9 +1,6 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var Container = require("aurelia-dependency-injection").Container; var Pipeline = require("./pipeline").Pipeline; @@ -11,11 +8,13 @@ var BuildNavigationPlanStep = require("./navigation-plan").BuildNavigationPlanSt var ApplyModelBindersStep = require("./model-binding").ApplyModelBindersStep; var LoadRouteStep = require("./route-loading").LoadRouteStep; var CommitChangesStep = require("./navigation-context").CommitChangesStep; -var CanDeactivatePreviousStep = require("./activation").CanDeactivatePreviousStep; -var CanActivateNextStep = require("./activation").CanActivateNextStep; -var DeactivatePreviousStep = require("./activation").DeactivatePreviousStep; -var ActivateNextStep = require("./activation").ActivateNextStep; -var PipelineProvider = (function () { +var _activation = require("./activation"); + +var CanDeactivatePreviousStep = _activation.CanDeactivatePreviousStep; +var CanActivateNextStep = _activation.CanActivateNextStep; +var DeactivatePreviousStep = _activation.DeactivatePreviousStep; +var ActivateNextStep = _activation.ActivateNextStep; +var PipelineProvider = exports.PipelineProvider = (function () { function PipelineProvider(container) { this.container = container; this.steps = [BuildNavigationPlanStep, CanDeactivatePreviousStep, LoadRouteStep, ApplyModelBindersStep, CanActivateNextStep, DeactivatePreviousStep, ActivateNextStep, CommitChangesStep]; @@ -27,7 +26,6 @@ var PipelineProvider = (function () { return [Container]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -41,12 +39,10 @@ var PipelineProvider = (function () { return pipeline; }, writable: true, - enumerable: true, configurable: true } }); return PipelineProvider; })(); - -exports.PipelineProvider = PipelineProvider; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/pipeline.js b/dist/commonjs/pipeline.js index c1613253..342347b9 100644 --- a/dist/commonjs/pipeline.js +++ b/dist/commonjs/pipeline.js @@ -1,9 +1,6 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; function createResult(ctx, next) { return { @@ -19,7 +16,7 @@ var CANCELLED = exports.CANCELLED = "cancelled"; var REJECTED = exports.REJECTED = "rejected"; var RUNNING = exports.RUNNING = "running"; -var Pipeline = (function () { +var Pipeline = exports.Pipeline = (function () { function Pipeline() { this.steps = []; } @@ -40,7 +37,6 @@ var Pipeline = (function () { return this; }, writable: true, - enumerable: true, configurable: true }, run: { @@ -89,12 +85,10 @@ var Pipeline = (function () { return next(); }, writable: true, - enumerable: true, configurable: true } }); return Pipeline; })(); - -exports.Pipeline = Pipeline; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/route-loading.js b/dist/commonjs/route-loading.js index 4be1fe42..b216fdfa 100644 --- a/dist/commonjs/route-loading.js +++ b/dist/commonjs/route-loading.js @@ -1,14 +1,13 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; exports.loadNewRoute = loadNewRoute; -var REPLACE = require("./navigation-plan").REPLACE; -var buildNavigationPlan = require("./navigation-plan").buildNavigationPlan; -var RouteLoader = (function () { +var _navigationPlan = require("./navigation-plan"); + +var REPLACE = _navigationPlan.REPLACE; +var buildNavigationPlan = _navigationPlan.buildNavigationPlan; +var RouteLoader = exports.RouteLoader = (function () { function RouteLoader() {} _prototypeProperties(RouteLoader, null, { @@ -17,16 +16,13 @@ var RouteLoader = (function () { throw Error("Route loaders must implment \"loadRoute(router, config)\"."); }, writable: true, - enumerable: true, configurable: true } }); return RouteLoader; })(); - -exports.RouteLoader = RouteLoader; -var LoadRouteStep = (function () { +var LoadRouteStep = exports.LoadRouteStep = (function () { function LoadRouteStep(routeLoader) { this.routeLoader = routeLoader; } @@ -37,7 +33,6 @@ var LoadRouteStep = (function () { return [RouteLoader]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -46,15 +41,12 @@ var LoadRouteStep = (function () { return loadNewRoute([], this.routeLoader, navigationContext).then(next)["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); return LoadRouteStep; })(); - -exports.LoadRouteStep = LoadRouteStep; function loadNewRoute(routers, routeLoader, navigationContext) { var toLoad = determineWhatToLoad(navigationContext); var loadPromises = toLoad.map(function (current) { @@ -136,4 +128,5 @@ function loadComponent(routeLoader, router, config) { component.config = config; return component; }); -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/router-configuration.js b/dist/commonjs/router-configuration.js index f8c155b2..a3779b71 100644 --- a/dist/commonjs/router-configuration.js +++ b/dist/commonjs/router-configuration.js @@ -1,11 +1,8 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; -var RouterConfiguration = (function () { +var RouterConfiguration = exports.RouterConfiguration = (function () { function RouterConfiguration() { this.instructions = []; this.options = {}; @@ -37,7 +34,6 @@ var RouterConfiguration = (function () { return this.mapRoute(config); }, writable: true, - enumerable: true, configurable: true }, mapRoute: { @@ -63,7 +59,6 @@ var RouterConfiguration = (function () { return this; }, writable: true, - enumerable: true, configurable: true }, mapUnknownRoutes: { @@ -72,7 +67,6 @@ var RouterConfiguration = (function () { return this; }, writable: true, - enumerable: true, configurable: true }, exportToRouter: { @@ -96,7 +90,6 @@ var RouterConfiguration = (function () { router.options = this.options; }, writable: true, - enumerable: true, configurable: true }, configureRoute: { @@ -105,7 +98,6 @@ var RouterConfiguration = (function () { router.addRoute(config, navModel); }, writable: true, - enumerable: true, configurable: true }, ensureDefaultsForRouteConfig: { @@ -116,7 +108,6 @@ var RouterConfiguration = (function () { config.moduleId = ensureConfigValue(config, "moduleId", this.deriveModuleId); }, writable: true, - enumerable: true, configurable: true }, deriveName: { @@ -124,7 +115,6 @@ var RouterConfiguration = (function () { return config.title || (config.route ? stripParametersFromRoute(config.route) : config.moduleId); }, writable: true, - enumerable: true, configurable: true }, deriveRoute: { @@ -132,7 +122,6 @@ var RouterConfiguration = (function () { return config.moduleId || config.name; }, writable: true, - enumerable: true, configurable: true }, deriveTitle: { @@ -141,7 +130,6 @@ var RouterConfiguration = (function () { return value.substr(0, 1).toUpperCase() + value.substr(1); }, writable: true, - enumerable: true, configurable: true }, deriveModuleId: { @@ -149,7 +137,6 @@ var RouterConfiguration = (function () { return stripParametersFromRoute(config.route); }, writable: true, - enumerable: true, configurable: true } }); @@ -157,8 +144,6 @@ var RouterConfiguration = (function () { return RouterConfiguration; })(); -exports.RouterConfiguration = RouterConfiguration; - function ensureConfigValue(config, property, getter) { var value = config[property]; @@ -174,4 +159,5 @@ function stripParametersFromRoute(route) { var colonIndex = route.indexOf(":"); var length = colonIndex > 0 ? colonIndex - 1 : route.length; return route.substr(0, length); -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/router.js b/dist/commonjs/router.js index 62d83e9f..2d9d4852 100644 --- a/dist/commonjs/router.js +++ b/dist/commonjs/router.js @@ -1,9 +1,6 @@ "use strict"; -var _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); -}; +var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; var RouteRecognizer = require("aurelia-route-recognizer").RouteRecognizer; var join = require("aurelia-path").join; @@ -11,7 +8,7 @@ var NavigationContext = require("./navigation-context").NavigationContext; var NavigationInstruction = require("./navigation-instruction").NavigationInstruction; var RouterConfiguration = require("./router-configuration").RouterConfiguration; var processPotential = require("./util").processPotential; -var Router = (function () { +var Router = exports.Router = (function () { function Router(container, history) { this.container = container; this.history = history; @@ -27,7 +24,6 @@ var Router = (function () { this.viewPorts[name] = viewPort; }, writable: true, - enumerable: true, configurable: true }, refreshBaseUrl: { @@ -38,7 +34,6 @@ var Router = (function () { } }, writable: true, - enumerable: true, configurable: true }, refreshNavigation: { @@ -54,6 +49,8 @@ var Router = (function () { } else { current.href = "#/" + this.baseUrl; } + } else { + current.href = "/" + this.baseUrl; } if (current.href[current.href.length - 1] != "/") { @@ -64,7 +61,6 @@ var Router = (function () { } }, writable: true, - enumerable: true, configurable: true }, configure: { @@ -80,7 +76,6 @@ var Router = (function () { return this; }, writable: true, - enumerable: true, configurable: true }, navigate: { @@ -89,7 +84,6 @@ var Router = (function () { return this.history.navigate(fragment, options); }, writable: true, - enumerable: true, configurable: true }, navigateBack: { @@ -97,7 +91,6 @@ var Router = (function () { this.history.navigateBack(); }, writable: true, - enumerable: true, configurable: true }, createChild: { @@ -107,7 +100,6 @@ var Router = (function () { return childRouter; }, writable: true, - enumerable: true, configurable: true }, createNavigationInstruction: { @@ -174,7 +166,6 @@ var Router = (function () { } }, writable: true, - enumerable: true, configurable: true }, createNavigationContext: { @@ -182,7 +173,6 @@ var Router = (function () { return new NavigationContext(this, instruction); }, writable: true, - enumerable: true, configurable: true }, generate: { @@ -190,7 +180,6 @@ var Router = (function () { return this.recognizer.generate(name, params); }, writable: true, - enumerable: true, configurable: true }, addRoute: { @@ -246,18 +235,17 @@ var Router = (function () { } }, writable: true, - enumerable: true, configurable: true }, handleUnknownRoutes: { value: function handleUnknownRoutes(config) { var callback = function (instruction) { return new Promise(function (resolve, reject) { - var done = function (inst) { + function done(inst) { inst = inst || instruction; inst.config.route = inst.params.path; resolve(inst); - }; + } if (!config) { instruction.config.moduleId = instruction.fragment; @@ -277,7 +265,6 @@ var Router = (function () { this.catchAllHandler = callback; }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -290,12 +277,10 @@ var Router = (function () { this.navigation = []; }, writable: true, - enumerable: true, configurable: true } }); return Router; })(); - -exports.Router = Router; \ No newline at end of file +exports.__esModule = true; \ No newline at end of file diff --git a/dist/commonjs/util.js b/dist/commonjs/util.js index b7d15939..145ceb2b 100644 --- a/dist/commonjs/util.js +++ b/dist/commonjs/util.js @@ -19,4 +19,5 @@ function processPotential(obj, resolve, reject) { return reject(error); } } -} \ No newline at end of file +} +exports.__esModule = true; \ No newline at end of file diff --git a/dist/es6/router.js b/dist/es6/router.js index ac0ceaf0..22ecbfef 100644 --- a/dist/es6/router.js +++ b/dist/es6/router.js @@ -38,6 +38,8 @@ export class Router { } else { current.href = '#/' + this.baseUrl; } + } else { + current.href = '/' + this.baseUrl; } if (current.href[current.href.length - 1] != '/') { diff --git a/dist/system/activation.js b/dist/system/activation.js index 4a775597..d49ae110 100644 --- a/dist/system/activation.js +++ b/dist/system/activation.js @@ -5,15 +5,18 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi function processDeactivatable(plan, callbackName, next, ignoreResult) { - var inspect = function (val) { + var infos = findDeactivatable(plan, callbackName), + i = infos.length; + + function inspect(val) { if (ignoreResult || shouldContinue(val)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { if (i--) { try { var controller = infos[i]; @@ -25,10 +28,7 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi } else { return next(); } - }; - - var infos = findDeactivatable(plan, callbackName), - i = infos.length; + } return iterate(); } @@ -79,15 +79,19 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi } function processActivatable(navigationContext, callbackName, next, ignoreResult) { - var inspect = function (val, router) { + var infos = findActivatable(navigationContext, callbackName), + length = infos.length, + i = -1; + + function inspect(val, router) { if (ignoreResult || shouldContinue(val, router)) { return iterate(); } else { return next.cancel(val); } - }; + } - var iterate = function () { + function iterate() { i++; if (i < length) { @@ -104,11 +108,7 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi } else { return next(); } - }; - - var infos = findActivatable(navigationContext, callbackName), - length = infos.length, - i = -1; + } return iterate(); } @@ -170,17 +170,12 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi processPotential = _util.processPotential; }], execute: function () { - _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); - }; + _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; affirmations = _export("affirmations", ["yes", "ok", "true"]); - CanDeactivatePreviousStep = (function () { + CanDeactivatePreviousStep = _export("CanDeactivatePreviousStep", (function () { function CanDeactivatePreviousStep() {} _prototypeProperties(CanDeactivatePreviousStep, null, { @@ -189,16 +184,13 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi return processDeactivatable(navigationContext.plan, "canDeactivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanDeactivatePreviousStep; - })(); - _export("CanDeactivatePreviousStep", CanDeactivatePreviousStep); - - CanActivateNextStep = (function () { + })()); + CanActivateNextStep = _export("CanActivateNextStep", (function () { function CanActivateNextStep() {} _prototypeProperties(CanActivateNextStep, null, { @@ -207,16 +199,13 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi return processActivatable(navigationContext, "canActivate", next); }, writable: true, - enumerable: true, configurable: true } }); return CanActivateNextStep; - })(); - _export("CanActivateNextStep", CanActivateNextStep); - - DeactivatePreviousStep = (function () { + })()); + DeactivatePreviousStep = _export("DeactivatePreviousStep", (function () { function DeactivatePreviousStep() {} _prototypeProperties(DeactivatePreviousStep, null, { @@ -225,16 +214,13 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi return processDeactivatable(navigationContext.plan, "deactivate", next, true); }, writable: true, - enumerable: true, configurable: true } }); return DeactivatePreviousStep; - })(); - _export("DeactivatePreviousStep", DeactivatePreviousStep); - - ActivateNextStep = (function () { + })()); + ActivateNextStep = _export("ActivateNextStep", (function () { function ActivateNextStep() {} _prototypeProperties(ActivateNextStep, null, { @@ -243,14 +229,12 @@ System.register(["./navigation-plan", "./navigation-commands", "./util"], functi return processActivatable(navigationContext, "activate", next, true); }, writable: true, - enumerable: true, configurable: true } }); return ActivateNextStep; - })(); - _export("ActivateNextStep", ActivateNextStep); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/app-router.js b/dist/system/app-router.js index 118c6d48..7b5d9dd3 100644 --- a/dist/system/app-router.js +++ b/dist/system/app-router.js @@ -44,49 +44,13 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", isNavigationCommand = _navigationCommands.isNavigationCommand; }], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - _get = function get(object, property, receiver) { - var desc = Object.getOwnPropertyDescriptor(object, property); + _get = function get(object, property, receiver) { var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc && desc.writable) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - if (desc === undefined) { - var parent = Object.getPrototypeOf(object); + _inherits = function (subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }; - if (parent === null) { - return undefined; - } else { - return get(parent, property, receiver); - } - } else if ("value" in desc && desc.writable) { - return desc.value; - } else { - var getter = desc.get; - if (getter === undefined) { - return undefined; - } - return getter.call(receiver); - } - }; - - _inherits = function (subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); - } - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - enumerable: false, - writable: true, - configurable: true - } - }); - if (superClass) subClass.__proto__ = superClass; - }; - - AppRouter = (function (Router) { + AppRouter = _export("AppRouter", (function (Router) { function AppRouter(container, history, pipelineProvider) { _get(Object.getPrototypeOf(AppRouter.prototype), "constructor", this).call(this, container, history); this.pipelineProvider = pipelineProvider; @@ -101,7 +65,6 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", return [Container, History, PipelineProvider]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -119,25 +82,23 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", }); }, writable: true, - enumerable: true, configurable: true }, queueInstruction: { value: function queueInstruction(instruction) { - var _this2 = this; + var _this = this; return new Promise(function (resolve) { instruction.resolve = resolve; - _this2.queue.unshift(instruction); - _this2.dequeueInstruction(); + _this.queue.unshift(instruction); + _this.dequeueInstruction(); }); }, writable: true, - enumerable: true, configurable: true }, dequeueInstruction: { value: function dequeueInstruction() { - var _this3 = this; + var _this = this; if (this.isNavigating) { return; } @@ -155,10 +116,10 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", var pipeline = this.pipelineProvider.createPipeline(context); pipeline.run(context).then(function (result) { - _this3.isNavigating = false; + _this.isNavigating = false; if (result.completed) { - _this3.history.previousFragment = instruction.fragment; + _this.history.previousFragment = instruction.fragment; } if (result.output instanceof Error) { @@ -166,31 +127,30 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", } if (isNavigationCommand(result.output)) { - result.output.navigate(_this3); - } else if (!result.completed && _this3.history.previousFragment) { - _this3.navigate(_this3.history.previousFragment, false); + result.output.navigate(_this); + } else if (!result.completed && _this.history.previousFragment) { + _this.navigate(_this.history.previousFragment, false); } instruction.resolve(result); - _this3.dequeueInstruction(); + _this.dequeueInstruction(); })["catch"](function (error) { console.error(error); }); }, writable: true, - enumerable: true, configurable: true }, registerViewPort: { value: function registerViewPort(viewPort, name) { - var _this4 = this; + var _this = this; _get(Object.getPrototypeOf(AppRouter.prototype), "registerViewPort", this).call(this, viewPort, name); if (!this.isActive) { if ("configureRouter" in this.container.viewModel) { var result = this.container.viewModel.configureRouter() || Promise.resolve(); return result.then(function () { - return _this4.activate(); + return _this.activate(); }); } else { this.activate(); @@ -200,7 +160,6 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", } }, writable: true, - enumerable: true, configurable: true }, activate: { @@ -215,7 +174,6 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", this.dequeueInstruction(); }, writable: true, - enumerable: true, configurable: true }, deactivate: { @@ -224,7 +182,6 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", this.history.deactivate(); }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -234,14 +191,12 @@ System.register(["aurelia-dependency-injection", "aurelia-history", "./router", this.options = null; }, writable: true, - enumerable: true, configurable: true } }); return AppRouter; - })(Router); - _export("AppRouter", AppRouter); + })(Router)); } }; }); \ No newline at end of file diff --git a/dist/system/model-binding.js b/dist/system/model-binding.js index 38666c80..e3e20a96 100644 --- a/dist/system/model-binding.js +++ b/dist/system/model-binding.js @@ -5,12 +5,9 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - ApplyModelBindersStep = (function () { + ApplyModelBindersStep = _export("ApplyModelBindersStep", (function () { function ApplyModelBindersStep() {} _prototypeProperties(ApplyModelBindersStep, null, { @@ -19,14 +16,12 @@ System.register([], function (_export) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return ApplyModelBindersStep; - })(); - _export("ApplyModelBindersStep", ApplyModelBindersStep); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/navigation-commands.js b/dist/system/navigation-commands.js index 66956d2f..3db8d61c 100644 --- a/dist/system/navigation-commands.js +++ b/dist/system/navigation-commands.js @@ -11,12 +11,9 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - Redirect = (function () { + Redirect = _export("Redirect", (function () { function Redirect(url) { this.url = url; this.shouldContinueProcessing = false; @@ -28,14 +25,12 @@ System.register([], function (_export) { (this.router || appRouter).navigate(this.url, { trigger: true, replace: true }); }, writable: true, - enumerable: true, configurable: true } }); return Redirect; - })(); - _export("Redirect", Redirect); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/navigation-context.js b/dist/system/navigation-context.js index d8e052f7..337806b0 100644 --- a/dist/system/navigation-context.js +++ b/dist/system/navigation-context.js @@ -7,12 +7,9 @@ System.register(["./navigation-plan"], function (_export) { REPLACE = _navigationPlan.REPLACE; }], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - NavigationContext = (function () { + NavigationContext = _export("NavigationContext", (function () { function NavigationContext(router, nextInstruction) { this.router = router; this.nextInstruction = nextInstruction; @@ -73,7 +70,6 @@ System.register(["./navigation-plan"], function (_export) { }); }, writable: true, - enumerable: true, configurable: true }, buildTitle: { @@ -106,16 +102,13 @@ System.register(["./navigation-plan"], function (_export) { return title; }, writable: true, - enumerable: true, configurable: true } }); return NavigationContext; - })(); - _export("NavigationContext", NavigationContext); - - CommitChangesStep = (function () { + })()); + CommitChangesStep = _export("CommitChangesStep", (function () { function CommitChangesStep() {} _prototypeProperties(CommitChangesStep, null, { @@ -131,14 +124,12 @@ System.register(["./navigation-plan"], function (_export) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return CommitChangesStep; - })(); - _export("CommitChangesStep", CommitChangesStep); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/navigation-instruction.js b/dist/system/navigation-instruction.js index 86a56210..982de0e6 100644 --- a/dist/system/navigation-instruction.js +++ b/dist/system/navigation-instruction.js @@ -5,12 +5,9 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - NavigationInstruction = (function () { + NavigationInstruction = _export("NavigationInstruction", (function () { function NavigationInstruction(fragment, queryString, params, queryParams, config, parentInstruction) { this.fragment = fragment; this.queryString = queryString; @@ -38,7 +35,6 @@ System.register([], function (_export) { }; }, writable: true, - enumerable: true, configurable: true }, getWildCardName: { @@ -47,7 +43,6 @@ System.register([], function (_export) { return this.config.route.substr(wildcardIndex + 1); }, writable: true, - enumerable: true, configurable: true }, getWildcardPath: { @@ -62,7 +57,6 @@ System.register([], function (_export) { return path; }, writable: true, - enumerable: true, configurable: true }, getBaseUrl: { @@ -81,14 +75,12 @@ System.register([], function (_export) { return this.fragment.substr(0, this.fragment.lastIndexOf(path)); }, writable: true, - enumerable: true, configurable: true } }); return NavigationInstruction; - })(); - _export("NavigationInstruction", NavigationInstruction); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/navigation-plan.js b/dist/system/navigation-plan.js index cf2b9c80..5c797ffb 100644 --- a/dist/system/navigation-plan.js +++ b/dist/system/navigation-plan.js @@ -85,19 +85,14 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _toArray = function (arr) { - return Array.isArray(arr) ? arr : Array.from(arr); - }; + _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); }; - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; NO_CHANGE = _export("NO_CHANGE", "no-change"); INVOKE_LIFECYCLE = _export("INVOKE_LIFECYCLE", "invoke-lifecycle"); REPLACE = _export("REPLACE", "replace"); - BuildNavigationPlanStep = (function () { + BuildNavigationPlanStep = _export("BuildNavigationPlanStep", (function () { function BuildNavigationPlanStep() {} _prototypeProperties(BuildNavigationPlanStep, null, { @@ -109,14 +104,12 @@ System.register([], function (_export) { })["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); return BuildNavigationPlanStep; - })(); - _export("BuildNavigationPlanStep", BuildNavigationPlanStep); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/pipeline-provider.js b/dist/system/pipeline-provider.js index 9f6e4081..14bf657c 100644 --- a/dist/system/pipeline-provider.js +++ b/dist/system/pipeline-provider.js @@ -22,12 +22,9 @@ System.register(["aurelia-dependency-injection", "./pipeline", "./navigation-pla ActivateNextStep = _activation.ActivateNextStep; }], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - PipelineProvider = (function () { + PipelineProvider = _export("PipelineProvider", (function () { function PipelineProvider(container) { this.container = container; this.steps = [BuildNavigationPlanStep, CanDeactivatePreviousStep, LoadRouteStep, ApplyModelBindersStep, CanActivateNextStep, DeactivatePreviousStep, ActivateNextStep, CommitChangesStep]; @@ -39,7 +36,6 @@ System.register(["aurelia-dependency-injection", "./pipeline", "./navigation-pla return [Container]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -53,14 +49,12 @@ System.register(["aurelia-dependency-injection", "./pipeline", "./navigation-pla return pipeline; }, writable: true, - enumerable: true, configurable: true } }); return PipelineProvider; - })(); - _export("PipelineProvider", PipelineProvider); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/pipeline.js b/dist/system/pipeline.js index 8a764222..a7b3a32a 100644 --- a/dist/system/pipeline.js +++ b/dist/system/pipeline.js @@ -14,16 +14,13 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; COMPLETED = _export("COMPLETED", "completed"); CANCELLED = _export("CANCELLED", "cancelled"); REJECTED = _export("REJECTED", "rejected"); RUNNING = _export("RUNNING", "running"); - Pipeline = (function () { + Pipeline = _export("Pipeline", (function () { function Pipeline() { this.steps = []; } @@ -44,7 +41,6 @@ System.register([], function (_export) { return this; }, writable: true, - enumerable: true, configurable: true }, run: { @@ -93,14 +89,12 @@ System.register([], function (_export) { return next(); }, writable: true, - enumerable: true, configurable: true } }); return Pipeline; - })(); - _export("Pipeline", Pipeline); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/route-loading.js b/dist/system/route-loading.js index 9f5ad96d..39005f72 100644 --- a/dist/system/route-loading.js +++ b/dist/system/route-loading.js @@ -92,12 +92,9 @@ System.register(["./navigation-plan"], function (_export) { buildNavigationPlan = _navigationPlan.buildNavigationPlan; }], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - RouteLoader = (function () { + RouteLoader = _export("RouteLoader", (function () { function RouteLoader() {} _prototypeProperties(RouteLoader, null, { @@ -106,16 +103,13 @@ System.register(["./navigation-plan"], function (_export) { throw Error("Route loaders must implment \"loadRoute(router, config)\"."); }, writable: true, - enumerable: true, configurable: true } }); return RouteLoader; - })(); - _export("RouteLoader", RouteLoader); - - LoadRouteStep = (function () { + })()); + LoadRouteStep = _export("LoadRouteStep", (function () { function LoadRouteStep(routeLoader) { this.routeLoader = routeLoader; } @@ -126,7 +120,6 @@ System.register(["./navigation-plan"], function (_export) { return [RouteLoader]; }, writable: true, - enumerable: true, configurable: true } }, { @@ -135,14 +128,12 @@ System.register(["./navigation-plan"], function (_export) { return loadNewRoute([], this.routeLoader, navigationContext).then(next)["catch"](next.cancel); }, writable: true, - enumerable: true, configurable: true } }); return LoadRouteStep; - })(); - _export("LoadRouteStep", LoadRouteStep); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/router-configuration.js b/dist/system/router-configuration.js index f010bf2c..4360fdf3 100644 --- a/dist/system/router-configuration.js +++ b/dist/system/router-configuration.js @@ -22,12 +22,9 @@ System.register([], function (_export) { return { setters: [], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - RouterConfiguration = (function () { + RouterConfiguration = _export("RouterConfiguration", (function () { function RouterConfiguration() { this.instructions = []; this.options = {}; @@ -59,7 +56,6 @@ System.register([], function (_export) { return this.mapRoute(config); }, writable: true, - enumerable: true, configurable: true }, mapRoute: { @@ -85,7 +81,6 @@ System.register([], function (_export) { return this; }, writable: true, - enumerable: true, configurable: true }, mapUnknownRoutes: { @@ -94,7 +89,6 @@ System.register([], function (_export) { return this; }, writable: true, - enumerable: true, configurable: true }, exportToRouter: { @@ -118,7 +112,6 @@ System.register([], function (_export) { router.options = this.options; }, writable: true, - enumerable: true, configurable: true }, configureRoute: { @@ -127,7 +120,6 @@ System.register([], function (_export) { router.addRoute(config, navModel); }, writable: true, - enumerable: true, configurable: true }, ensureDefaultsForRouteConfig: { @@ -138,7 +130,6 @@ System.register([], function (_export) { config.moduleId = ensureConfigValue(config, "moduleId", this.deriveModuleId); }, writable: true, - enumerable: true, configurable: true }, deriveName: { @@ -146,7 +137,6 @@ System.register([], function (_export) { return config.title || (config.route ? stripParametersFromRoute(config.route) : config.moduleId); }, writable: true, - enumerable: true, configurable: true }, deriveRoute: { @@ -154,7 +144,6 @@ System.register([], function (_export) { return config.moduleId || config.name; }, writable: true, - enumerable: true, configurable: true }, deriveTitle: { @@ -163,7 +152,6 @@ System.register([], function (_export) { return value.substr(0, 1).toUpperCase() + value.substr(1); }, writable: true, - enumerable: true, configurable: true }, deriveModuleId: { @@ -171,14 +159,12 @@ System.register([], function (_export) { return stripParametersFromRoute(config.route); }, writable: true, - enumerable: true, configurable: true } }); return RouterConfiguration; - })(); - _export("RouterConfiguration", RouterConfiguration); + })()); } }; }); \ No newline at end of file diff --git a/dist/system/router.js b/dist/system/router.js index 13dbeb32..ca14d41d 100644 --- a/dist/system/router.js +++ b/dist/system/router.js @@ -17,12 +17,9 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte processPotential = _util.processPotential; }], execute: function () { - _prototypeProperties = function (child, staticProps, instanceProps) { - if (staticProps) Object.defineProperties(child, staticProps); - if (instanceProps) Object.defineProperties(child.prototype, instanceProps); - }; + _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); }; - Router = (function () { + Router = _export("Router", (function () { function Router(container, history) { this.container = container; this.history = history; @@ -38,7 +35,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte this.viewPorts[name] = viewPort; }, writable: true, - enumerable: true, configurable: true }, refreshBaseUrl: { @@ -49,7 +45,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } }, writable: true, - enumerable: true, configurable: true }, refreshNavigation: { @@ -65,6 +60,8 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } else { current.href = "#/" + this.baseUrl; } + } else { + current.href = "/" + this.baseUrl; } if (current.href[current.href.length - 1] != "/") { @@ -75,7 +72,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } }, writable: true, - enumerable: true, configurable: true }, configure: { @@ -91,7 +87,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte return this; }, writable: true, - enumerable: true, configurable: true }, navigate: { @@ -100,7 +95,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte return this.history.navigate(fragment, options); }, writable: true, - enumerable: true, configurable: true }, navigateBack: { @@ -108,7 +102,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte this.history.navigateBack(); }, writable: true, - enumerable: true, configurable: true }, createChild: { @@ -118,7 +111,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte return childRouter; }, writable: true, - enumerable: true, configurable: true }, createNavigationInstruction: { @@ -185,7 +177,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } }, writable: true, - enumerable: true, configurable: true }, createNavigationContext: { @@ -193,7 +184,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte return new NavigationContext(this, instruction); }, writable: true, - enumerable: true, configurable: true }, generate: { @@ -201,7 +191,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte return this.recognizer.generate(name, params); }, writable: true, - enumerable: true, configurable: true }, addRoute: { @@ -257,18 +246,17 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } }, writable: true, - enumerable: true, configurable: true }, handleUnknownRoutes: { value: function handleUnknownRoutes(config) { var callback = function (instruction) { return new Promise(function (resolve, reject) { - var done = function (inst) { + function done(inst) { inst = inst || instruction; inst.config.route = inst.params.path; resolve(inst); - }; + } if (!config) { instruction.config.moduleId = instruction.fragment; @@ -288,7 +276,6 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte this.catchAllHandler = callback; }, writable: true, - enumerable: true, configurable: true }, reset: { @@ -301,14 +288,12 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte this.navigation = []; }, writable: true, - enumerable: true, configurable: true } }); return Router; - })(); - _export("Router", Router); + })()); } }; }); \ No newline at end of file diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 6c84983f..3936abf9 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,11 @@ +### 0.5.3 (2015-01-30) + + +#### Bug Fixes + +* **router:** url fragments duplicated on subsequent navigations between routes when using pus ([021e7410](http://github.com/aurelia/router/commit/021e741009830df963ffa465f0b2ebc0b2b43c30)) + + ### 0.5.2 (2015-01-29) diff --git a/package.json b/package.json index 421eba64..95a91c62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-router", - "version": "0.5.2", + "version": "0.5.3", "description": "A powerful client-side router.", "keywords": [ "aurelia",