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: 1.0.16
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: 1.0.17
Choose a head ref
  • 7 commits
  • 4 files changed
  • 1 contributor

Commits on May 3, 2018

  1. Copy the full SHA
    d3da396 View commit details
  2. Copy the full SHA
    632df97 View commit details
  3. Copy the full SHA
    e681ebb View commit details

Commits on May 9, 2018

  1. Copy the full SHA
    f769ba2 View commit details

Commits on May 13, 2018

  1. Copy the full SHA
    4bb8852 View commit details
  2. update libs

    christopherthielen committed May 13, 2018
    Copy the full SHA
    4b502e6 View commit details
  3. 1.0.17

    christopherthielen committed May 13, 2018
    Copy the full SHA
    2a30024 View commit details
Showing with 222 additions and 54 deletions.
  1. +11 −0 CHANGELOG.md
  2. +8 −10 package.json
  3. +5 −5 src/directives/viewDirective.ts
  4. +198 −39 yarn.lock
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 1.0.17 (2018-05-13)
[Compare `@uirouter/angularjs` versions 1.0.16 and 1.0.17](https://github.com/angular-ui/ui-router/compare/1.0.16...1.0.17)


### Updated `@uirouter/core` from 5.0.18 to 5.0.19
[Compare `@uirouter/core` versions 5.0.18 and 5.0.19](https://github.com/ui-router/core/compare/5.0.18...5.0.19)

### Bug Fixes

* **enums:** Workaround angular compiler export issue https://github.com/angular/angular/issues/23759 ([38d25fa](https://github.com/ui-router/core/commit/38d25fa))

## 1.0.16 (2018-05-03)
[Compare `@uirouter/angularjs` versions 1.0.15 and 1.0.16](https://github.com/angular-ui/ui-router/compare/1.0.15...1.0.16)

18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@uirouter/angularjs",
"description": "State-based routing for AngularJS 1.x",
"version": "1.0.16",
"version": "1.0.17",
"scripts": {
"clean": "shx rm -rf lib lib-esm _doc build release *.log",
"compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -72,7 +72,7 @@
"jsnext:main": "lib-esm/index.js",
"typings": "lib/index.d.ts",
"dependencies": {
"@uirouter/core": "5.0.18"
"@uirouter/core": "5.0.19"
},
"peerDependencies": {
"angular": ">=1.2.0"
@@ -81,9 +81,9 @@
"@types/angular": "=1.6.25",
"@types/angular-animate": "^1.5.9",
"@types/angular-mocks": "^1.5.11",
"@types/jasmine": "^2.8.6",
"@types/jasmine": "^2.8.7",
"@types/jquery": "^3.3.1",
"@uirouter/publish-scripts": "^2.3.4",
"@uirouter/publish-scripts": "^2.3.18",
"dts-downlevel": "^0.3.0",
"fork-ts-checker-webpack-plugin": "^0.4.1",
"husky": "^0.14.3",
@@ -103,12 +103,10 @@
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-uglify": "^3.0.0",
"shelljs": "^0.8.1",
"shx": "^0.2.2",
"ts-loader": "^4.1.0",
"tslint": "^5.9.1",
"tslint-eslint-rules": "^5.1.0",
"ts-loader": "^4.3.0",
"tslint": "^5.10.0",
"tslint-eslint-rules": "^5.2.0",
"typescript": "^2.8.3",
"webpack": "^4.6.0"
"webpack": "^4.8.3"
}
}
10 changes: 5 additions & 5 deletions src/directives/viewDirective.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* @ng1api
* @module directives
*/

import {
$QLike,
ActiveUIView,
@@ -24,11 +29,6 @@ import {
ViewService,
} from '@uirouter/core';
import { IAugmentedJQuery, IInterpolateService, IScope, ITimeoutService, ITranscludeFunction } from 'angular';
/**
* @ng1api
* @module directives
*/
/** for typedoc */
import { ng as angular } from '../angular';
import { Ng1Controller, Ng1StateDeclaration } from '../interface';
import { getLocals } from '../services';
Loading