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.14
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.15
Choose a head ref
  • 18 commits
  • 24 files changed
  • 5 contributors

Commits on Jan 31, 2018

  1. Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    Copy the full SHA
    3c11252 View commit details

Commits on Feb 1, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f3c1d2f View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9478078 View commit details
  3. Copy the full SHA
    1808dd1 View commit details
  4. Merge pull request #3631 from josephlin55555/master

    [Update] license year to current
    christopherthielen authored Feb 1, 2018
    Copy the full SHA
    a5b8476 View commit details
  5. Copy the full SHA
    46b8b2b View commit details

Commits on Feb 6, 2018

  1. Copy the full SHA
    4a72024 View commit details
  2. Copy the full SHA
    5b68e86 View commit details
  3. Copy the full SHA
    284fff7 View commit details
  4. Copy the full SHA
    e7ba9d1 View commit details
  5. Copy the full SHA
    ad146eb View commit details

Commits on Feb 7, 2018

  1. Copy the full SHA
    00139c6 View commit details

Commits on Feb 8, 2018

  1. Copy the full SHA
    1472dc6 View commit details

Commits on Feb 12, 2018

  1. Copy the full SHA
    1b54264 View commit details
  2. Copy the full SHA
    73b1f96 View commit details
  3. Merge pull request #3642 from angular-ui/greenkeeper/@uirouter/core-5…

    ….0.17
    
    Update @uirouter/core to the latest version 🚀
    christopherthielen authored Feb 12, 2018
    Copy the full SHA
    7f94292 View commit details
  4. Copy the full SHA
    cd76ad4 View commit details
  5. 1.0.15

    christopherthielen committed Feb 12, 2018
    Copy the full SHA
    3521ce1 View commit details
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 1.0.15 (2018-02-12)
[Compare `@uirouter/angularjs` versions 1.0.14 and 1.0.15](https://github.com/angular-ui/ui-router/compare/1.0.14...1.0.15)

### Bug Fixes

* **package:** update [@uirouter](https://github.com/uirouter)/core to version 5.0.17 ([1b54264](https://github.com/angular-ui/ui-router/commit/1b54264))


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

### Bug Fixes

* **core:** Fix leak of old transitions by mutating pathnode*.resolvables*.data ([0a1f518](https://github.com/ui-router/core/commit/0a1f518))

## 1.0.14 (2018-01-31)
[Compare `@uirouter/angularjs` versions 1.0.13 and 1.0.14](https://github.com/angular-ui/ui-router/compare/1.0.13...1.0.14)

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2013-2015 The AngularUI Team, Karsten Sperling
Copyright (c) 2013-2018 The AngularUI Team, Karsten Sperling

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@
"test",
"src"
],
"version": "1.0.13"
"version": "1.0.14"
}
30 changes: 11 additions & 19 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.14",
"version": "1.0.15",
"scripts": {
"clean": "shx rm -rf lib lib-esm _doc build release *.log",
"compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -24,10 +24,9 @@
"test:downstream": "npm run build && test_downstream_projects",
"watch": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1",
"debug": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1 --browsers=Chrome",
"docs": "./scripts/docs.js",
"docs": "generate_docs && publish_docs",
"release": "release --deps @uirouter/core && node ./scripts/bower_release.js",
"prepublishOnly": "npm run build",
"publishdocs": "node scripts/publishdocs.js",
"artifacts": "artifact_tagging"
},
"homepage": "https://ui-router.github.io",
@@ -71,45 +70,38 @@
"jsnext:main": "lib-esm/index.js",
"typings": "lib/index.d.ts",
"dependencies": {
"@uirouter/core": "5.0.16"
"@uirouter/core": "5.0.17"
},
"peerDependencies": {
"angular": ">=1.2.0"
},
"devDependencies": {
"@types/angular": "^1.6.42",
"@types/angular": "1.6.25",
"@types/angular-animate": "1.5.9",
"@types/angular-mocks": "1.5.11",
"@types/jasmine": "2.8.6",
"@types/jquery": "3.3.0",
"@uirouter/publish-scripts": "2.2.10",
"@uirouter/publish-scripts": "2.3.1",
"dts-downlevel": "0.3.0",
"fork-ts-checker-webpack-plugin": "0.3.0",
"jasmine-core": "2.9.1",
"jasmine-core": "3.0.0",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "1.1.1",
"karma-phantomjs-launcher": "1.0.4",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.9",
"lodash": "4.17.4",
"replace-in-file": "3.1.0",
"rollup": "0.55.1",
"lodash": "4.17.5",
"rollup": "0.55.5",
"rollup-plugin-node-resolve": "3.0.2",
"rollup-plugin-sourcemaps": "0.4.2",
"rollup-plugin-uglify": "3.0.0",
"shelljs": "0.8.1",
"shx": "0.2.2",
"ts-loader": "3.3.1",
"ts-loader": "3.5.0",
"tslint": "5.9.1",
"tslint-eslint-rules": "4.1.1",
"typedoc": "0.9.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.6",
"typescript": "2.6.2",
"ui-router-typedoc-themes": "1.0.2",
"webpack": "3.10.0"
"typescript": "2.7.1",
"webpack": "3.11.0"
}
}
58 changes: 0 additions & 58 deletions scripts/docs.js

This file was deleted.

39 changes: 0 additions & 39 deletions scripts/publishdocs.js

This file was deleted.

34 changes: 17 additions & 17 deletions test/ng1StateBuilderSpec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {StateBuilder, StateMatcher, ng1ViewsBuilder, extend} from "../src/index";
import {Resolvable} from "@uirouter/core";
import { StateBuilder, StateMatcher, ng1ViewsBuilder, extend } from '../src/index';
import { Resolvable } from '@uirouter/core';
declare var inject;

describe('Ng1 StateBuilder', function() {
var parent = { name: "" };
var builder, matcher, urlMatcherFactoryProvider: any = {
const parent = { name: '' };
let builder, matcher, urlMatcherFactoryProvider: any = {
compile: function() {},
isMatcher: function() {}
isMatcher: function() {},
};

beforeEach(function() {
@@ -16,32 +16,32 @@ describe('Ng1 StateBuilder', function() {
});

it('should use the state object to build a default view, when no `views` property is found', function() {
var config = { url: "/foo", templateUrl: "/foo.html", controller: "FooController", parent: parent };
var built = builder.builder('views')(config);
const config = { url: '/foo', templateUrl: '/foo.html', controller: 'FooController', parent: parent };
const built = builder.builder('views')(config);

expect(built.$default).not.toEqualData(config);
expect(built.$default).toEqualData({ templateUrl: "/foo.html", controller: "FooController", resolveAs: '$resolve' });
expect(built.$default).toEqualData({ templateUrl: '/foo.html', controller: 'FooController', resolveAs: '$resolve' });
});

it('It should use the views object to build views, when defined', function() {
var config = { a: { foo: "bar", controller: "FooController" } };
let builtViews = builder.builder('views')({ parent: parent, views: config });
const config = { a: { foo: 'bar', controller: 'FooController' } };
const builtViews = builder.builder('views')({ parent: parent, views: config });
expect(builtViews.a.foo).toEqualData(config.a.foo);
expect(builtViews.a.controller).toEqualData(config.a.controller);
});

it("should not allow a view config with both component and template keys", inject(function($injector) {
var config = { name: "foo", url: "/foo", template: "<h1>hey</h1>", controller: "FooController", parent: parent };
it('should not allow a view config with both component and template keys', inject(function($injector) {
const config = { name: 'foo', url: '/foo', template: '<h1>hey</h1>', controller: 'FooController', parent: parent };
expect(() => builder.builder('views')(config)).not.toThrow();
expect(() => builder.builder('views')(extend({ component: 'fooComponent' }, config))).toThrow();
expect(() => builder.builder('views')(extend({ componentProvider: () => 'fooComponent' }, config))).toThrow();
expect(() => builder.builder('views')(extend({ bindings: {}}, config))).toThrow();
expect(() => builder.builder('views')(extend({ bindings: {} }, config))).toThrow();
}));

it("should replace a resolve: string value with a function that injects the service of the same name", inject(function($injector) {
var config = { resolve: { foo: "bar" } };
it('should replace a resolve: string value with a function that injects the service of the same name', inject(function($injector) {
const config = { resolve: { foo: 'bar' } };
expect(builder.builder('resolvables')).toBeDefined();
var built: Resolvable[] = builder.builder('resolvables')(config);
expect(built[0].deps).toEqual(["bar"]);
const built: Resolvable[] = builder.builder('resolvables')(config);
expect(built[0].deps).toEqual(['bar']);
}));
});
Loading