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.2.18
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.3.0
Choose a head ref
Loading
Showing with 487 additions and 243 deletions.
  1. +30 −0 CHANGELOG.md
  2. +1 −1 Gruntfile.js
  3. +2 −2 README.md
  4. +1 −1 bower.json
  5. +1 −1 component.json
  6. +1 −1 package.json
  7. +121 −85 release/angular-ui-router.js
  8. +3 −3 release/angular-ui-router.min.js
  9. +4 −3 sample/app/app.js
  10. +11 −1 src/state.js
  11. +32 −11 src/stateDirectives.js
  12. +77 −72 src/viewDirective.js
  13. +54 −3 test/stateDirectivesSpec.js
  14. +3 −2 test/stateSpec.js
  15. +146 −57 test/viewDirectiveSpec.js
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
<a name="0.3.0"></a>
## 0.3.0 (2016-05-14)

This is a release of the `legacy` branch, primarily to fix the $scope destroy ordering issues introduced in 0.2.16.

We recommend all users to try the 1.0.0 alpha and report any issues it causes with your application. Read the [known breaking changes](https://github.com/angular-ui/ui-router/issues/2219) between the legacy and 1.0 branches.

# BC-BREAK

In 0.2.16 we delayed the ui-view $scope destroy() until after all animations were completed. This was a mistake, and we're reverting it in 0.3.0.

The original issue that we tried to address: https://github.com/angular-ui/ui-router/issues/1643

We are switching back to 0.2.15 behavior. The scope is now destroyed as soon as the view is swapped out. This allows cleanup to happen in response
to the $destroy event. If you need to do things after the animation, we've put the promise on the `element.data('$uiView')` in #2562

#### Bug Fixes

* **state:** Inject $state at runtime to force initialization ([de3a04a7](https://github.com/angular-ui/ui-router/commit/de3a04a7c676e05b5b868de4f65d03d9c588773c), closes [#2574](https://github.com/angular-ui/ui-router/issues/2574))
* **ui-sref:** update ui-sref-active/eq info when params change When ui-state dynamicly changes ([9698ec4d](https://github.com/angular-ui/ui-router/commit/9698ec4d2fbceb463cf11e43b7e74e385eda4beb), closes [#2554](https://github.com/angular-ui/ui-router/issues/2554))
* **ui-state:** update ui-sref-active/eq info when ui-state dynamicly changes watchers, make sur ([abb3deba](https://github.com/angular-ui/ui-router/commit/abb3debacb87e1a6c398a13f2d64c53e8b08a233), closes [#2488](https://github.com/angular-ui/ui-router/issues/2488))


#### Features

* **uiView:**
* Fire the $onInit hook ([b090ca03](https://github.com/angular-ui/ui-router/commit/b090ca0352eabc13662a8702a2b227b7db606362), closes [#2559](https://github.com/angular-ui/ui-router/issues/2559))
* Put $animate promises on element.data('$uiView') closes #2562 closes #2579 ([fde64e18](https://github.com/angular-ui/ui-router/commit/fde64e1897041e59cbc9f8d07b269dcd487abb9c))


<a name="0.2.18"></a>
### 0.2.18 (2016-02-07)

2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ module.exports = function (grunt) {

function ensureCleanMaster() {
return exec('git symbolic-ref HEAD').then(function (result) {
if (result.stdout.trim() !== 'refs/heads/master') throw new Error('Not on master branch, aborting');
if (result.stdout.trim() !== 'refs/heads/legacy') throw new Error('Not on legacy branch, aborting');
return exec('git status --porcelain');
}).then(function (result) {
if (result.stdout.trim() !== '') throw new Error('Working copy is dirty, aborting');
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

#### The de-facto solution to flexible routing with nested views
---
**[Download 0.2.17](http://angular-ui.github.io/ui-router/release/angular-ui-router.js)** (or **[Minified](http://angular-ui.github.io/ui-router/release/angular-ui-router.min.js)**) **|**
**[Download 0.2.18](https://cdn.rawgit.com/angular-ui/ui-router/0.2.18/release/angular-ui-router.js)** (or **[Minified](https://cdn.rawgit.com/angular-ui/ui-router/0.2.18/release/angular-ui-router.min.js)**) **|**
**[Guide](https://github.com/angular-ui/ui-router/wiki) |**
**[API](http://angular-ui.github.io/ui-router/site) |**
**[Sample](http://angular-ui.github.com/ui-router/sample/) ([Src](https://github.com/angular-ui/ui-router/tree/gh-pages/sample)) |**
@@ -17,7 +17,7 @@

*_Please help us out by testing the 1.0 alpha release!_*

[1.0.0alpha0 Announcement](https://github.com/angular-ui/ui-router/releases/tag/1.0.0alpha0) ([Source Code](https://github.com/angular-ui/ui-router/tree/feature-1.0)) | [Sample App](http://ui-router.github.io/sample-app/) ([Source Code](https://github.com/ui-router/sample-app)) | [Known Issues](https://github.com/angular-ui/ui-router/issues?q=is%3Aissue+is%3Aopen+label%3A1.0)
[1.0.0alpha0 Announcement](https://github.com/angular-ui/ui-router/releases/tag/1.0.0alpha0) ([Source Code](https://github.com/angular-ui/ui-router/tree/master)) | [Sample App](http://ui-router.github.io/sample-app/) ([Source Code](https://github.com/ui-router/sample-app)) | [Known Issues](https://github.com/angular-ui/ui-router/issues?q=is%3Aissue+is%3Aopen+label%3A1.0)


---
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.2.18",
"version": "0.3.0",
"license" : "MIT",
"main": "./release/angular-ui-router.js",
"dependencies": {
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.2.18",
"version": "0.3.0",
"description": "State-based routing for AngularJS",
"keywords": [
"angular",
2 changes: 1 addition & 1 deletion package.json
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.2.18",
"version": "0.3.0",
"homepage": "http://angular-ui.github.com/",
"contributors": [
{
Loading