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.1
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.2
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Jan 20, 2017

  1. chore(travis): install grunt before running npm install

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    3e59dc9 View commit details

  2. fix(state): avoid promise.catch() in favor of silenceUncaughtInPromise()

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    86df71e View commit details

  3. Prep for 0.4.2

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    5fd8177 View commit details

  4. release 0.4.2

    @christopherthielen
    christopherthielen committed Jan 20, 2017
    Copy the full SHA
    ef5ce80 View commit details
Showing with 21 additions and 11 deletions.
  1. +3 −2 .travis.yml
  2. +9 −0 CHANGELOG.md
  3. +1 −1 bower.json
  4. +1 −1 component.json
  5. +1 −1 package.json
  6. +2 −2 release/angular-ui-router.js
  7. +3 −3 release/angular-ui-router.min.js
  8. +1 −1 src/state.js
5 changes: 3 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,12 @@ language: node_js
node_js:
- "0.10"

before_install:
- npm install -g karma grunt-cli

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g karma
- npm install -g grunt-cli
- ./nodeserver.sh > /dev/null &

script:
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<a name="0.4.2"></a>
### 0.4.2 (2017-01-20)


#### Bug Fixes

* **state:** avoid promise.catch() in favor of silenceUncaughtInPromise() ([86df71e7](https://github.com/angular-ui/ui-router/commit/86df71e74bcf166847053a3c590991fc774f2100))


<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)
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.1",
"version": "0.4.2",
"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.1",
"version": "0.4.2",
"description": "State-based routing for AngularJS",
"keywords": [
"angular",
2 changes: 1 addition & 1 deletion 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.1",
"version": "0.4.2",
"homepage": "http://angular-ui.github.com/",
"contributors": [
{
4 changes: 2 additions & 2 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.1
* @version v0.4.2
* @link http://angular-ui.github.com/
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -3467,7 +3467,7 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
return $q.reject(error);
});

transition.catch(angular.noop);
silenceUncaughtInPromise(transition);
return transition;
};

Loading