Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.0
Choose a base ref
...
head repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.4.1
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Jan 20, 2017

  1. chore(*): Allow prepublish script to do local npm install ../ui-router

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    8e86afc View commit details

  2. fix(resolve): Fix 'possibly unhandled rejection' in rejected resolves 

    Closes #2889
    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    f73e551 View commit details

  3. prep release 0.4.1

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    80f4443 View commit details

  4. release 0.4.1

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    326980b View commit details
Showing with 31 additions and 12 deletions.
  1. +10 −0 CHANGELOG.md
  2. +5 −0 Gruntfile.js
  3. +1 −1 bower.json
  4. +1 −1 component.json
  5. +2 −2 package.json
  6. +5 −3 release/angular-ui-router.js
  7. +3 −3 release/angular-ui-router.min.js
  8. +4 −2 src/resolve.js
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
<a name="0.4.1"></a>
### 0.4.1 (2017-01-19)
## [0.4.1](https://github.com/angular-ui/ui-router/compare/0.4.0...0.4.1) (2016-11-03)

#### Bug Fixes

* **resolve:** Fix 'possibly unhandled rejection' in rejected resolves ([f73e5516](https://github.com/angular-ui/ui-router/commit/f73e5516d8232d8307690c70f53d4a20eb486479), closes [#2889](https://github.com/angular-ui/ui-router/issues/2889))


<a name="0.4.0"></a>
## 0.4.0 (2017-01-17)
## [0.4.0](https://github.com/angular-ui/ui-router/compare/0.3.2...0.4.0) (2016-11-03)


#### Bug Fixes
5 changes: 5 additions & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -175,6 +175,11 @@ module.exports = function (grunt) {
);
});

grunt.registerTask('prepublish', function () {
grunt.config('buildtag', '');
grunt.config('builddir', 'release');
});

grunt.registerTask('prepare-release', function () {
var bower = grunt.file.readJSON('bower.json'),
component = grunt.file.readJSON('component.json'),
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.4.0",
"version": "0.4.1",
"license" : "MIT",
"main": "./release/angular-ui-router.js",
"dependencies": {
2 changes: 1 addition & 1 deletion component.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.4.0",
"version": "0.4.1",
"description": "State-based routing for AngularJS",
"keywords": [
"angular",
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-ui-router",
"description": "State-based routing for AngularJS",
"version": "0.4.0",
"version": "0.4.1",
"homepage": "http://angular-ui.github.com/",
"contributors": [
{
@@ -36,7 +36,7 @@
"scripts": {
"test": "grunt integrate",
"build": "grunt dist",
"prepublish": "grunt prepare-release dist"
"prepublish": "grunt prepublish dist"
},
"bugs": {
"url": "https://github.com/angular-ui/ui-router/issues"
8 changes: 5 additions & 3 deletions release/angular-ui-router.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* State-based routing for AngularJS
* @version v0.4.0
* @version v0.4.1
* @link http://angular-ui.github.com/
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -403,11 +403,13 @@ function $Resolve( $q, $injector) {
// To complete the overall resolution, we have to wait for the parent
// promise and for the promise for each invokable in our plan.
var resolution = $q.defer(),
result = resolution.promise,
result = silenceUncaughtInPromise(resolution.promise),
promises = result.$$promises = {},
values = extend({}, locals),
wait = 1 + plan.length/3,
merged = false;

silenceUncaughtInPromise(result);

function done() {
// Merge parent values we haven't got yet and publish our own $$values
@@ -487,7 +489,7 @@ function $Resolve( $q, $injector) {
}
}
// Publish promise synchronously; invocations further down in the plan may depend on it.
promises[key] = invocation.promise;
promises[key] = silenceUncaughtInPromise(invocation.promise);
}

return result;
Loading