@angular/router
Advanced tools
Comparing version 3.4.5 to 3.4.6
/** | ||
* @license Angular v3.4.5 | ||
* (c) 2010-2016 Google, Inc. https://angular.io/ | ||
* @license Angular v3.4.6 | ||
* (c) 2010-2017 Google, Inc. https://angular.io/ | ||
* License: MIT | ||
@@ -5,0 +5,0 @@ */(function (global, factory) { |
/** | ||
* @license Angular v3.4.5 | ||
* (c) 2010-2016 Google, Inc. https://angular.io/ | ||
* @license Angular v3.4.6 | ||
* (c) 2010-2017 Google, Inc. https://angular.io/ | ||
* License: MIT | ||
@@ -5,0 +5,0 @@ */(function (global, factory) { |
/** | ||
* @license Angular v3.4.5 | ||
* (c) 2010-2016 Google, Inc. https://angular.io/ | ||
* @license Angular v3.4.6 | ||
* (c) 2010-2017 Google, Inc. https://angular.io/ | ||
* License: MIT | ||
*/ | ||
!function(global,factory){"object"==typeof exports&&"undefined"!=typeof module?factory(exports,require("@angular/core"),require("@angular/router"),require("@angular/upgrade/static")):"function"==typeof define&&define.amd?define(["exports","@angular/core","@angular/router","@angular/upgrade/static"],factory):factory((global.ng=global.ng||{},global.ng.router=global.ng.router||{},global.ng.router.upgrade=global.ng.router.upgrade||{}),global.ng.core,global.ng.router,global.ng.upgrade.static)}(this,function(exports,_angular_core,_angular_router,_angular_upgrade_static){"use strict";function initialRouterNavigation(ngUpgrade,ref,preloader,opts){return function(){if(!ngUpgrade.$injector)throw new Error("\n RouterUpgradeInitializer can be used only after UpgradeModule.bootstrap has been called.\n Remove RouterUpgradeInitializer and call setUpLocationSync after UpgradeModule.bootstrap.\n ");var router=ngUpgrade.injector.get(_angular_router.Router),ref=ngUpgrade.injector.get(_angular_core.ApplicationRef);router.resetRootComponentType(ref.componentTypes[0]),preloader.setUpPreloading(),opts.initialNavigation===!1?router.setUpLocationChangeListener():router.initialNavigation(),setUpLocationSync(ngUpgrade)}}function setUpLocationSync(ngUpgrade){var router=ngUpgrade.injector.get(_angular_router.Router),url=document.createElement("a");ngUpgrade.$injector.get("$rootScope").$on("$locationChangeStart",function(_,next,__){url.href=next,router.navigateByUrl(url.pathname)})}var RouterUpgradeInitializer={provide:_angular_router.ROUTER_INITIALIZER,useFactory:initialRouterNavigation,deps:[_angular_upgrade_static.UpgradeModule,_angular_core.ApplicationRef,_angular_router.RouterPreloader,_angular_router.ROUTER_CONFIGURATION]};exports.RouterUpgradeInitializer=RouterUpgradeInitializer,exports.initialRouterNavigation=initialRouterNavigation,exports.setUpLocationSync=setUpLocationSync}); |
{ | ||
"name": "@angular/router", | ||
"version": "3.4.5", | ||
"version": "3.4.6", | ||
"description": "Angular - the routing library", | ||
@@ -24,7 +24,7 @@ "main": "bundles/router.umd.js", | ||
"peerDependencies": { | ||
"@angular/core": "2.4.5", | ||
"@angular/common": "2.4.5", | ||
"@angular/platform-browser": "2.4.5", | ||
"@angular/core": "2.4.6", | ||
"@angular/common": "2.4.6", | ||
"@angular/platform-browser": "2.4.6", | ||
"rxjs": "^5.0.1" | ||
} | ||
} |
@@ -69,3 +69,2 @@ /** | ||
* | ||
* @selector ':not(a)[routerLink]' | ||
* @ngModule RouterModule | ||
@@ -72,0 +71,0 @@ * |
@@ -69,3 +69,2 @@ /** | ||
* | ||
* \@selector ':not(a)[routerLink]' | ||
* \@ngModule RouterModule | ||
@@ -72,0 +71,0 @@ * |
@@ -71,3 +71,2 @@ /** | ||
* | ||
* @selector ':not(a)[routerLink]' | ||
* @ngModule RouterModule | ||
@@ -101,3 +100,2 @@ * | ||
* | ||
* @selector 'a[routerLink]' | ||
* @ngModule RouterModule | ||
@@ -104,0 +102,0 @@ * |
@@ -70,3 +70,2 @@ /** | ||
* | ||
* \@selector ':not(a)[routerLink]' | ||
* \@ngModule RouterModule | ||
@@ -185,3 +184,2 @@ * | ||
* | ||
* \@selector 'a[routerLink]' | ||
* \@ngModule RouterModule | ||
@@ -188,0 +186,0 @@ * |
@@ -31,3 +31,2 @@ /** | ||
* ``` | ||
* @selector 'a[routerLink]' | ||
* @ngModule RouterModule | ||
@@ -34,0 +33,0 @@ * |
@@ -31,3 +31,2 @@ /** | ||
* ``` | ||
* \@selector 'a[routerLink]' | ||
* \@ngModule RouterModule | ||
@@ -34,0 +33,0 @@ * |
@@ -351,3 +351,5 @@ /** | ||
this.setUpLocationChangeListener(); | ||
this.navigateByUrl(this.location.path(true), { replaceUrl: true }); | ||
if (this.navigationId === 0) { | ||
this.navigateByUrl(this.location.path(true), { replaceUrl: true }); | ||
} | ||
}; | ||
@@ -766,4 +768,4 @@ /** | ||
.then(function () { | ||
_this.navigated = true; | ||
if (navigationIsSuccessful) { | ||
_this.navigated = true; | ||
_this.routerEvents.next(new NavigationEnd(id, _this.serializeUrl(url), _this.serializeUrl(_this.currentUrlTree))); | ||
@@ -1082,3 +1084,3 @@ resolvePromise(true); | ||
var /** @type {?} */ obs = map.call(from(d.guards), function (c) { | ||
var /** @type {?} */ guard = _this.getToken(c, c.node); | ||
var /** @type {?} */ guard = _this.getToken(c, d.node); | ||
var /** @type {?} */ observable; | ||
@@ -1085,0 +1087,0 @@ if (guard.canActivateChild) { |
@@ -8,3 +8,2 @@ /** | ||
*/ | ||
import { Observable } from 'rxjs/Observable'; | ||
import { fromPromise } from 'rxjs/observable/fromPromise'; | ||
@@ -17,2 +16,3 @@ import { of } from 'rxjs/observable/of'; | ||
import { mergeAll } from 'rxjs/operator/mergeAll'; | ||
import { isObservable, isPromise } from '../private_import_core'; | ||
import { PRIMARY_OUTLET } from '../shared'; | ||
@@ -162,6 +162,6 @@ /** | ||
export function wrapIntoObservable(value) { | ||
if (value instanceof Observable) { | ||
if (isObservable(value)) { | ||
return value; | ||
} | ||
if (value instanceof Promise) { | ||
if (isPromise(value)) { | ||
return fromPromise(value); | ||
@@ -168,0 +168,0 @@ } |
@@ -1,1 +0,1 @@ | ||
[{"__symbolic":"module","version":3,"metadata":{"shallowEqualArrays":{"__symbolic":"function"},"shallowEqual":{"__symbolic":"function"},"flatten":{"__symbolic":"function"},"first":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":0},"elseExpression":null}},"last":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":{"__symbolic":"binop","operator":"-","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":1}},"elseExpression":null}},"and":{"__symbolic":"function","parameters":["bools"],"value":{"__symbolic":"pre","operator":"!","operand":{"__symbolic":"error","message":"Function call not supported","line":63,"character":21}}},"merge":{"__symbolic":"function"},"forEach":{"__symbolic":"function"},"waitForMap":{"__symbolic":"function"},"andObservables":{"__symbolic":"function"},"wrapIntoObservable":{"__symbolic":"function"}}},{"__symbolic":"module","version":1,"metadata":{"shallowEqualArrays":{"__symbolic":"function"},"shallowEqual":{"__symbolic":"function"},"flatten":{"__symbolic":"function"},"first":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":0},"elseExpression":null}},"last":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":{"__symbolic":"binop","operator":"-","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":1}},"elseExpression":null}},"and":{"__symbolic":"function","parameters":["bools"],"value":{"__symbolic":"pre","operator":"!","operand":{"__symbolic":"error","message":"Function call not supported","line":63,"character":21}}},"merge":{"__symbolic":"function"},"forEach":{"__symbolic":"function"},"waitForMap":{"__symbolic":"function"},"andObservables":{"__symbolic":"function"},"wrapIntoObservable":{"__symbolic":"function"}}}] | ||
[{"__symbolic":"module","version":3,"metadata":{"shallowEqualArrays":{"__symbolic":"function"},"shallowEqual":{"__symbolic":"function"},"flatten":{"__symbolic":"function"},"first":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":0},"elseExpression":null}},"last":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":{"__symbolic":"binop","operator":"-","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":1}},"elseExpression":null}},"and":{"__symbolic":"function","parameters":["bools"],"value":{"__symbolic":"pre","operator":"!","operand":{"__symbolic":"error","message":"Function call not supported","line":64,"character":21}}},"merge":{"__symbolic":"function"},"forEach":{"__symbolic":"function"},"waitForMap":{"__symbolic":"function"},"andObservables":{"__symbolic":"function"},"wrapIntoObservable":{"__symbolic":"function"}}},{"__symbolic":"module","version":1,"metadata":{"shallowEqualArrays":{"__symbolic":"function"},"shallowEqual":{"__symbolic":"function"},"flatten":{"__symbolic":"function"},"first":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":0},"elseExpression":null}},"last":{"__symbolic":"function","parameters":["a"],"value":{"__symbolic":"if","condition":{"__symbolic":"binop","operator":">","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":0},"thenExpression":{"__symbolic":"index","expression":{"__symbolic":"reference","name":"a"},"index":{"__symbolic":"binop","operator":"-","left":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"a"},"member":"length"},"right":1}},"elseExpression":null}},"and":{"__symbolic":"function","parameters":["bools"],"value":{"__symbolic":"pre","operator":"!","operand":{"__symbolic":"error","message":"Function call not supported","line":64,"character":21}}},"merge":{"__symbolic":"function"},"forEach":{"__symbolic":"function"},"waitForMap":{"__symbolic":"function"},"andObservables":{"__symbolic":"function"},"wrapIntoObservable":{"__symbolic":"function"}}}] |
@@ -12,3 +12,3 @@ /** | ||
*/ | ||
export var /** @type {?} */ VERSION = new Version('3.4.5'); | ||
export var /** @type {?} */ VERSION = new Version('3.4.6'); | ||
//# sourceMappingURL=version.js.map |
@@ -1,1 +0,1 @@ | ||
[{"__symbolic":"module","version":3,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["3.4.5"]}}},{"__symbolic":"module","version":1,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["3.4.5"]}}}] | ||
[{"__symbolic":"module","version":3,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["3.4.6"]}}},{"__symbolic":"module","version":1,"metadata":{"VERSION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"Version"},"arguments":["3.4.6"]}}}] |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1127558
132
15362