Comparing version
@@ -109,3 +109,3 @@ 'use strict'; | ||
}; | ||
if (Object.isFrozen(routeInfo) || routeInfo.hasOwnProperty('attributes')) { | ||
if (!Object.isExtensible(routeInfo) || routeInfo.hasOwnProperty('attributes')) { | ||
return Object.freeze(Object.assign({}, routeInfo, attributes)); | ||
@@ -127,3 +127,3 @@ } | ||
}; | ||
if (Object.isFrozen(routeInfo) || routeInfo.hasOwnProperty('metadata')) { | ||
if (!Object.isExtensible(routeInfo) || routeInfo.hasOwnProperty('metadata')) { | ||
return Object.freeze(Object.assign({}, routeInfo, metadata)); | ||
@@ -130,0 +130,0 @@ } |
@@ -108,6 +108,8 @@ 'use strict'; | ||
newTransition.promise = newTransition.promise.then(function (result) { | ||
_this._updateURL(newTransition, oldState); | ||
_this.didTransition(_this.currentRouteInfos); | ||
_this.toInfos(newTransition, newState.routeInfos, true); | ||
_this.routeDidChange(newTransition); | ||
if (!newTransition.isAborted) { | ||
_this._updateURL(newTransition, oldState); | ||
_this.didTransition(_this.currentRouteInfos); | ||
_this.toInfos(newTransition, newState.routeInfos, true); | ||
_this.routeDidChange(newTransition); | ||
} | ||
return result; | ||
@@ -114,0 +116,0 @@ }, null, (0, _utils.promiseLabel)('Transition complete')); |
@@ -77,3 +77,3 @@ import { Promise } from 'rsvp'; | ||
}; | ||
if (Object.isFrozen(routeInfo) || routeInfo.hasOwnProperty('attributes')) { | ||
if (!Object.isExtensible(routeInfo) || routeInfo.hasOwnProperty('attributes')) { | ||
return Object.freeze(Object.assign({}, routeInfo, attributes)); | ||
@@ -95,3 +95,3 @@ } | ||
}; | ||
if (Object.isFrozen(routeInfo) || routeInfo.hasOwnProperty('metadata')) { | ||
if (!Object.isExtensible(routeInfo) || routeInfo.hasOwnProperty('metadata')) { | ||
return Object.freeze(Object.assign({}, routeInfo, metadata)); | ||
@@ -98,0 +98,0 @@ } |
@@ -66,6 +66,8 @@ import RouteRecognizer from 'route-recognizer'; | ||
newTransition.promise = newTransition.promise.then((result) => { | ||
this._updateURL(newTransition, oldState); | ||
this.didTransition(this.currentRouteInfos); | ||
this.toInfos(newTransition, newState.routeInfos, true); | ||
this.routeDidChange(newTransition); | ||
if (!newTransition.isAborted) { | ||
this._updateURL(newTransition, oldState); | ||
this.didTransition(this.currentRouteInfos); | ||
this.toInfos(newTransition, newState.routeInfos, true); | ||
this.routeDidChange(newTransition); | ||
} | ||
return result; | ||
@@ -72,0 +74,0 @@ }, null, promiseLabel('Transition complete')); |
{ | ||
"name": "router_js", | ||
"version": "6.2.5", | ||
"description": | ||
"A lightweight JavaScript library is built on top of route-recognizer and rsvp.js to provide an API for handling routes", | ||
"keywords": ["route-recognizer", "router", "rsvp"], | ||
"version": "6.2.6", | ||
"description": "A lightweight JavaScript library is built on top of route-recognizer and rsvp.js to provide an API for handling routes", | ||
"keywords": [ | ||
"route-recognizer", | ||
"router", | ||
"rsvp" | ||
], | ||
"bugs": { | ||
@@ -21,29 +24,30 @@ "url": "https://github.com/tildeio/router.js/issues" | ||
"problems": "tsc -p tsconfig.json --noEmit", | ||
"pretest": "tslint -c tslint.json --project tsconfig.json", | ||
"start": "ember server", | ||
"test": "ember test" | ||
}, | ||
"files": ["dist/cjs", "dist/modules"], | ||
"dependencies": { | ||
"@types/node": "^10.5.5" | ||
}, | ||
"files": [ | ||
"dist/cjs", | ||
"dist/modules" | ||
], | ||
"dependencies": {}, | ||
"devDependencies": { | ||
"@types/qunit": "^2.5.2", | ||
"babel-preset-env": "^1.6.1", | ||
"backburner.js": "^2.1.0", | ||
"@types/node": "^12.7.5", | ||
"@types/qunit": "^2.9.0", | ||
"babel-preset-env": "^1.7.0", | ||
"backburner.js": "^2.6.0", | ||
"broccoli-babel-transpiler": "^6.1.2", | ||
"broccoli-concat": "^3.2.2", | ||
"broccoli-funnel": "^2.0.1", | ||
"broccoli-merge-trees": "^2.0.0", | ||
"broccoli-tslinter": "^3.0.1", | ||
"broccoli-typescript-compiler": "^4.0.1", | ||
"ember-cli": "2.18.1", | ||
"loader.js": "^4.6.0", | ||
"prettier": "1.10.2", | ||
"qunit": "^2.5.0", | ||
"broccoli-concat": "^3.7.4", | ||
"broccoli-funnel": "^2.0.2", | ||
"broccoli-merge-trees": "^3.0.2", | ||
"broccoli-typescript-compiler": "~4.0.1", | ||
"ember-cli": "~3.9.0", | ||
"loader.js": "^4.7.0", | ||
"prettier": "1.18.2", | ||
"qunit": "^2.9.2", | ||
"route-recognizer": "^0.3.4", | ||
"rsvp": "^4.8.1", | ||
"tslint": "^5.11.0", | ||
"tslint-config-prettier": "^1.14.0", | ||
"tslint-plugin-prettier": "^1.3.0", | ||
"typescript": "~3.0.1" | ||
"rsvp": "^4.8.5", | ||
"tslint": "^5.20.0", | ||
"tslint-config-prettier": "^1.18.0", | ||
"tslint-plugin-prettier": "^2.0.1" | ||
}, | ||
@@ -50,0 +54,0 @@ "peerDependencies": { |
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
377436
0.09%2
-33.33%18
-5.26%5447
0.07%- Removed
- Removed