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.10
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.11
Choose a head ref
  • 6 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 24, 2017

  1. Copy the full SHA
    3657ef1 View commit details

Commits on Oct 25, 2017

  1. Copy the full SHA
    36e3827 View commit details

Commits on Oct 27, 2017

  1. Copy the full SHA
    65383ad View commit details

Commits on Nov 11, 2017

  1. Copy the full SHA
    f6d23c3 View commit details

Commits on Nov 13, 2017

  1. Copy the full SHA
    f4d99b0 View commit details
  2. 1.0.11

    christopherthielen committed Nov 13, 2017
    Copy the full SHA
    5b54cbf View commit details
Showing with 314 additions and 149 deletions.
  1. +7 −0 CHANGELOG.md
  2. +11 −12 package.json
  3. +1 −1 scripts/publishdocs.js
  4. +2 −5 src/directives/viewDirective.ts
  5. +293 −131 yarn.lock
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.0.11 (2017-11-13)
[Compare `@uirouter/angularjs` versions 1.0.10 and 1.0.11](https://github.com/angular-ui/ui-router/compare/1.0.10...1.0.11)

### Bug Fixes

* **uiView:** Fix cfg.getTemplate is undefined ([f4d99b0](https://github.com/angular-ui/ui-router/commit/f4d99b0))

## 1.0.10 (2017-10-18)
[Compare `@uirouter/angularjs` versions 1.0.9 and 1.0.10](https://github.com/angular-ui/ui-router/compare/1.0.9...1.0.10)

23 changes: 11 additions & 12 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.10",
"version": "1.0.11",
"scripts": {
"clean": "shx rm -rf lib lib-esm _doc build release *.log",
"compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -83,7 +83,7 @@
"@types/angular-mocks": "1.5.11",
"@types/jasmine": "2.6.0",
"@types/jquery": "^1.10.31",
"@uirouter/publish-scripts": "2.0.2",
"@uirouter/publish-scripts": "2.0.6",
"conventional-changelog": "1.1.6",
"conventional-changelog-cli": "1.3.4",
"dts-downlevel": "^0.3.0",
@@ -94,7 +94,7 @@
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "2.0.4",
"karma-webpack": "2.0.5",
"lodash": "^4.5.1",
"replace-in-file": "2.6.4",
"rollup": "0.50.0",
@@ -105,16 +105,15 @@
"rollup-plugin-visualizer": "0.3.1",
"shelljs": "^0.7.0",
"shx": "0.2.2",
"ts-loader": "^2.3.7",
"tslint": "5.7.0",
"typedoc": "~0.5.0",
"typedoc-plugin-external-module-name": "^1.0.2",
"typedoc-plugin-internal-external": "^1.0.0",
"ts-loader": "3.0.5",
"tslint": "5.8.0",
"typedoc": "^0.8.0",
"typedoc-plugin-external-module-name": "1.0.10",
"typedoc-plugin-internal-external": "1.0.10",
"typedoc-plugin-single-line-tags": "1.0.0",
"typedoc-plugin-ui-router": "^1.0.0",
"typescript": "2.5.3",
"ui-router-typedoc-themes": "^1.0.1",
"watch": "^0.18.0",
"webpack": "3.6.0",
"yargs": "^4.2.0"
"webpack": "3.8.1"
}
}
}
2 changes: 1 addition & 1 deletion scripts/publishdocs.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ let sh = require('shelljs');
let readlineSync = require('readline-sync');
let fs = require('fs');
let path = require('path');
let util = require('./util');
let util = require('@uirouter/publish-scripts/util');
let _exec = util._exec;


7 changes: 2 additions & 5 deletions src/directives/viewDirective.ts
Original file line number Diff line number Diff line change
@@ -3,15 +3,12 @@
* @module directives
*/ /** for typedoc */
import { ng as angular } from "../angular";
import {
IInterpolateService, IScope, ITranscludeFunction, IAugmentedJQuery,
ICompileService, IControllerService, ITimeoutService, noop
} from "angular";
import { IInterpolateService, IScope, ITranscludeFunction, IAugmentedJQuery, ITimeoutService } from "angular";

import {
extend, unnestR, filter, tail, isDefined, isFunction, isString, trace, parse,
ActiveUIView, TransitionService, ResolveContext, Transition, PathNode, StateDeclaration,
Param, kebobString, HookRegOptions, ViewService, $QLike, Obj, TypedMap
Param, kebobString, HookRegOptions, ViewService, $QLike, Obj, TypedMap, noop,
} from "@uirouter/core";
import {Ng1ViewConfig} from "../statebuilders/views";
import {Ng1Controller, Ng1StateDeclaration} from "../interface";
Loading