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 .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: angular-ui/ui-router
Choose a Base Repository
angular-ui/ui-router
Acidburn0zzz/ui-router
AsuraZhu/ui-router
AvitarGlobal/ui-router
AydinSakar/ui-router
CNXTEoEorg/ui-router
Cyneric/ui-router
D-Wave/ui-router
DMSI-Earthos-Nusys-Enterprises/ui-router
DevynHong/ui-router
DveMac/ui-router
EARTH-SHIP-ENTERPRISE/ui-router
ESS-GlobalMediaManagers/ui-router
EarthShipSolution1/ui-router
EnigmaSpace/ui-router
EssCanada/ui-router
EssEden/ui-router
EssUtopia/ui-router
EugeneTruly/ui-router
FDIM/ui-router
Food-Net/ui-router
GehirnInc/ui-router
GlobalSystems/ui-router
GrantHeger/ui-router
HabitRPG/ui-router
Hanoch-Li/ui-router
Harmony-OS/ui-router
HarryWang74/ui-router
Klarence/ui-router
LandAllocation/ui-router
Leo9305/ui-router
MChorfa/ui-router
MattWalker/ui-router
MohammadYounes/ui-router
MrOrz/ui-router
PascalPrecht/ui-router
PatrickJS/ui-router
Randy85253/ui-router
Ribeiro/ui-router
SelenaMarieGomez/ui-router
SergeyKozachenko/ui-router
Sybertron/ui-router
Travel-Net/ui-router
Voles/ui-router
Xiot/ui-router
a8m/ui-router
abaran/ui-router
adambabik/ui-router
adamrights/ui-router
adrianhara/ui-router
afzalhub/ui-router
akiraaisha/ui-router
alexcastillo/ui-router
algaly/ui-router
amitava82/ui-router
asafdav/ui-router
avikaco/ui-router
azi/ui-router
bcronje/ui-router
beyang/ui-router
bfererencz/ui-router
blueghost56/ui-router
bnguyen82/ui-router
boneskull/ui-router
bottleofrum/ui-router
btmdave/ui-router
buunguyen/ui-router
caitp/ui-router
cburgdorf/ui-router
cciliber/ui-router
chaoming007/ui-router
dbkang/ui-router
deastman313/ui-router
deepinit-arek/ui-router
dgsunesen/ui-router
digitalbs/ui-router
dolymood/ui-router
drasya/ui-router
dreamineering/ui-router
edzius/ui-router
egermano/ui-router
elidor86/ui-router
estelle-peterson/ui-router
fastmonkeys/ui-router
fdeurioste/ui-router
floydprice/ui-router
fnakstad/ui-router
frapontillo/ui-router
fshao816/ui-router
gGonz/ui-router
gabrielmancini/ui-router
gdennie/ui-router
ggoodman/ui-router
giabao/ui-router
gromgull/ui-router
gsaini/ui-router
gsklee/ui-router
gtethan/ui-router
guoliangli123/ui-router
guoyingui/ui-router
guozhiqi/ui-router
hdctambien/ui-router
helmi03/ui-router
hllau/ui-router
iNuSys/ui-router
ianchen/ui-router
ifyio/ui-router
jacezq/ui-router
jacobgoldendesign/ui-router
jacobmumm/ui-router
jelical/ui-router
jhonrsalcedo/ui-router
jnaus/ui-router
johnparn/ui-router
joseym/ui-router
jpescada/ui-router
jrthib/ui-router
junojon/ui-router
kainhong/ui-router
klederson/ui-router
lahorichargha/ui-router
leiboT/ui-router
lion-git/ui-router
loyalforyou/ui-router
luo772435545/ui-router
madhudskumar/ui-router
mattbroekhuis/ui-router
mediaprojects/ui-router
meenie/ui-router
mfield/ui-router
mgechev/ui-router
mike-tempest/ui-router
minznerjosh/ui-router
miticv/ui-router
mlim1972/ui-router
mmukarram/ui-router
moderndegree/ui-router
msiconolfi/ui-router
nadavhury/ui-router
nakalsio/ui-router
nateabele/ui-router
nathasm/ui-router
ncuillery/ui-router
nenebale/ui-router
newobject/ui-router
nishant8BITS/ui-router
odikusar/ui-router
ouyangzhigang/ui-router
pascalopitz/ui-router
pc035860/ui-router
pennersr/ui-router
piousbox/ui-router
pkieltyka/ui-router
pombredanne/ui-router
qgerome/ui-router
riadbahri/ui-router
richardkeller/ui-router
roryf/ui-router
samtechnocrat/ui-router
scottopherson/ui-router
sebnilsson/ui-router
senior7515/ui-router
shairez/ui-router
shaode/ui-router
shashvattrip/ui-router
shaunrader/ui-router
shofiulalam/ui-router
shwei/ui-router
sinaidoron/ui-router
sivaraj-v/ui-router
skroski/ui-router
slonoed/ui-router
smalleast/ui-router
sorieil/ui-router
stevemao/ui-router
sunfirefox/ui-router
sww0930/ui-router
takanorip/ui-router
taokim/ui-router
tark000/ui-router
tdp100/ui-router
tfnico/ui-router
thisguychris/ui-router
tianxialzb/ui-router
timkindberg/ui-router
tobigit/ui-router
toddhgardner/ui-router
tsadykhov/ui-router
uapui-dev/ui-router
udoyen/ui-router
uturn/ui-router
vavrecka/ui-router
vorburger/ui-router
vram1980/ui-router
wp-ng/ui-router
wwhurley/ui-router
xudejian/ui-router
xushuo/ui-router
yangchuoxian/ui-router
zhaobeilin/ui-router
Nothing to show
base: 2315ac877312
head repository: angular-ui/ui-router
Choose a Head Repository
angular-ui/ui-router
Acidburn0zzz/ui-router
AsuraZhu/ui-router
AvitarGlobal/ui-router
AydinSakar/ui-router
CNXTEoEorg/ui-router
Cyneric/ui-router
D-Wave/ui-router
DMSI-Earthos-Nusys-Enterprises/ui-router
DevynHong/ui-router
DveMac/ui-router
EARTH-SHIP-ENTERPRISE/ui-router
ESS-GlobalMediaManagers/ui-router
EarthShipSolution1/ui-router
EnigmaSpace/ui-router
EssCanada/ui-router
EssEden/ui-router
EssUtopia/ui-router
EugeneTruly/ui-router
FDIM/ui-router
Food-Net/ui-router
GehirnInc/ui-router
GlobalSystems/ui-router
GrantHeger/ui-router
HabitRPG/ui-router
Hanoch-Li/ui-router
Harmony-OS/ui-router
HarryWang74/ui-router
Klarence/ui-router
LandAllocation/ui-router
Leo9305/ui-router
MChorfa/ui-router
MattWalker/ui-router
MohammadYounes/ui-router
MrOrz/ui-router
PascalPrecht/ui-router
PatrickJS/ui-router
Randy85253/ui-router
Ribeiro/ui-router
SelenaMarieGomez/ui-router
SergeyKozachenko/ui-router
Sybertron/ui-router
Travel-Net/ui-router
Voles/ui-router
Xiot/ui-router
a8m/ui-router
abaran/ui-router
adambabik/ui-router
adamrights/ui-router
adrianhara/ui-router
afzalhub/ui-router
akiraaisha/ui-router
alexcastillo/ui-router
algaly/ui-router
amitava82/ui-router
asafdav/ui-router
avikaco/ui-router
azi/ui-router
bcronje/ui-router
beyang/ui-router
bfererencz/ui-router
blueghost56/ui-router
bnguyen82/ui-router
boneskull/ui-router
bottleofrum/ui-router
btmdave/ui-router
buunguyen/ui-router
caitp/ui-router
cburgdorf/ui-router
cciliber/ui-router
chaoming007/ui-router
dbkang/ui-router
deastman313/ui-router
deepinit-arek/ui-router
dgsunesen/ui-router
digitalbs/ui-router
dolymood/ui-router
drasya/ui-router
dreamineering/ui-router
edzius/ui-router
egermano/ui-router
elidor86/ui-router
estelle-peterson/ui-router
fastmonkeys/ui-router
fdeurioste/ui-router
floydprice/ui-router
fnakstad/ui-router
frapontillo/ui-router
fshao816/ui-router
gGonz/ui-router
gabrielmancini/ui-router
gdennie/ui-router
ggoodman/ui-router
giabao/ui-router
gromgull/ui-router
gsaini/ui-router
gsklee/ui-router
gtethan/ui-router
guoliangli123/ui-router
guoyingui/ui-router
guozhiqi/ui-router
hdctambien/ui-router
helmi03/ui-router
hllau/ui-router
iNuSys/ui-router
ianchen/ui-router
ifyio/ui-router
jacezq/ui-router
jacobgoldendesign/ui-router
jacobmumm/ui-router
jelical/ui-router
jhonrsalcedo/ui-router
jnaus/ui-router
johnparn/ui-router
joseym/ui-router
jpescada/ui-router
jrthib/ui-router
junojon/ui-router
kainhong/ui-router
klederson/ui-router
lahorichargha/ui-router
leiboT/ui-router
lion-git/ui-router
loyalforyou/ui-router
luo772435545/ui-router
madhudskumar/ui-router
mattbroekhuis/ui-router
mediaprojects/ui-router
meenie/ui-router
mfield/ui-router
mgechev/ui-router
mike-tempest/ui-router
minznerjosh/ui-router
miticv/ui-router
mlim1972/ui-router
mmukarram/ui-router
moderndegree/ui-router
msiconolfi/ui-router
nadavhury/ui-router
nakalsio/ui-router
nateabele/ui-router
nathasm/ui-router
ncuillery/ui-router
nenebale/ui-router
newobject/ui-router
nishant8BITS/ui-router
odikusar/ui-router
ouyangzhigang/ui-router
pascalopitz/ui-router
pc035860/ui-router
pennersr/ui-router
piousbox/ui-router
pkieltyka/ui-router
pombredanne/ui-router
qgerome/ui-router
riadbahri/ui-router
richardkeller/ui-router
roryf/ui-router
samtechnocrat/ui-router
scottopherson/ui-router
sebnilsson/ui-router
senior7515/ui-router
shairez/ui-router
shaode/ui-router
shashvattrip/ui-router
shaunrader/ui-router
shofiulalam/ui-router
shwei/ui-router
sinaidoron/ui-router
sivaraj-v/ui-router
skroski/ui-router
slonoed/ui-router
smalleast/ui-router
sorieil/ui-router
stevemao/ui-router
sunfirefox/ui-router
sww0930/ui-router
takanorip/ui-router
taokim/ui-router
tark000/ui-router
tdp100/ui-router
tfnico/ui-router
thisguychris/ui-router
tianxialzb/ui-router
timkindberg/ui-router
tobigit/ui-router
toddhgardner/ui-router
tsadykhov/ui-router
uapui-dev/ui-router
udoyen/ui-router
uturn/ui-router
vavrecka/ui-router
vorburger/ui-router
vram1980/ui-router
wp-ng/ui-router
wwhurley/ui-router
xudejian/ui-router
xushuo/ui-router
yangchuoxian/ui-router
zhaobeilin/ui-router
Nothing to show
compare: 3d99a7859c73
Commits on Nov 07, 2014
- allow state params definitions as an array or object
- add missing reloadOnSearch field
- simplify ITypedState interface
- fix a whitespace consistency issue
Commits on Nov 15, 2014
Commits on Nov 17, 2014
If a state defined a query param and a substate defined a path param, the URLs were generated and matched in the wrong order.  A substate creates its UrlMatcher using .concat() and a concat()'d UrlMatcher assumed the parent params order mattered.  Switched to populating an array of params in the order they were parsed in UrlMatcher constructor.

Closes #1543
I think you lost _reload_ property from IStateOptions. Correct me if I'm wrong either please issue new version do we could use it in our project.
Empty array is mapped to undefined.

Closes #1511
fix(typescript): add reload to typescript defintiion
test(UrlMatcher): fix karma test for angular 1.0.8
…arisions

fix(uiSref): made isMatch delegate to $state.is/.includes with params

- Made is/includes use state.params.$$values() to encode values before comparison.

Closes #1513
fix(typescript): Update TypeScript API
Commits on Nov 21, 2014
- Allow arbitrary data be passed to a state as a parameter. Do not attempt to encode/decode the parameter.
- Store the location of the parameter: either "search", "path", or "config" (non-url params are "config")

Closes #1562
- Previously, the optional parameter's pattern itself was assumed to match 0-length strings
- That did not work if a regexp that was provided for a param required at least one character , ie, [A-Z0-9]{10,16}
- Now, we wrap the pattern group with a question mark if the parameter is optional (pattern)?

Closes #1576
Commits on Nov 23, 2014
Commits on Nov 24, 2014
- Type.$normalize can be passed either a decoded object, or an encoded object (string).  If the parameter is already decoded (checked via .is()), then it is returned. Else the parameter is decoded and returned.
Commits on Nov 28, 2014
Sebastian Gebhardt
Sebastian Gebhardt
Updated version number in README.md to 0.2.13
@@ -1,3 +1,32 @@
<a name="0.2.13"></a>
### 0.2.13 (2014-11-20)

This release primarily fixes issues reported against 0.2.12

#### Bug Fixes

* **$state:** fix $state.includes/.is to apply param types before comparisions fix(uiSref): ma ([19715d15](https://github.com/angular-ui/ui-router/commit/19715d15e3cbfff724519e9febedd05b49c75baa), closes [#1513](https://github.com/angular-ui/ui-router/issues/1513))
* Avoid re-synchronizing from url after .transitionTo ([b267ecd3](https://github.com/angular-ui/ui-router/commit/b267ecd348e5c415233573ef95ebdbd051875f52), closes [#1573](https://github.com/angular-ui/ui-router/issues/1573))
* **$urlMatcherFactory:**
* Built-in date type uses local time zone ([d726bedc](https://github.com/angular-ui/ui-router/commit/d726bedcbb5f70a5660addf43fd52ec730790293))
* make date type fn check .is before running ([aa94ce3b](https://github.com/angular-ui/ui-router/commit/aa94ce3b86632ad05301530a2213099da73a3dc0), closes [#1564](https://github.com/angular-ui/ui-router/issues/1564))
* early binding of array handler bypasses type resolution ([ada4bc27](https://github.com/angular-ui/ui-router/commit/ada4bc27df5eff3ba3ab0de94a09bd91b0f7a28c))
* add 'any' Type for non-encoding non-url params ([3bfd75ab](https://github.com/angular-ui/ui-router/commit/3bfd75ab445ee2f1dd55275465059ed116b10b27), closes [#1562](https://github.com/angular-ui/ui-router/issues/1562))
* fix encoding slashes in params ([0c983a08](https://github.com/angular-ui/ui-router/commit/0c983a08e2947f999683571477debd73038e95cf), closes [#1119](https://github.com/angular-ui/ui-router/issues/1119))
* fix mixed path/query params ordering problem ([a479fbd0](https://github.com/angular-ui/ui-router/commit/a479fbd0b8eb393a94320973e5b9a62d83912ee2), closes [#1543](https://github.com/angular-ui/ui-router/issues/1543))
* **ArrayType:**
* specify empty array mapping corner case ([74aa6091](https://github.com/angular-ui/ui-router/commit/74aa60917e996b0b4e27bbb4eb88c3c03832021d), closes [#1511](https://github.com/angular-ui/ui-router/issues/1511))
* fix .equals for array types ([5e6783b7](https://github.com/angular-ui/ui-router/commit/5e6783b77af9a90ddff154f990b43dbb17eeda6e), closes [#1538](https://github.com/angular-ui/ui-router/issues/1538))
* **Param:** fix default value shorthand declaration ([831d812a](https://github.com/angular-ui/ui-router/commit/831d812a524524c71f0ee1c9afaf0487a5a66230), closes [#1554](https://github.com/angular-ui/ui-router/issues/1554))
* **common:** fixed the _.filter clone to not create sparse arrays ([750f5cf5](https://github.com/angular-ui/ui-router/commit/750f5cf5fd91f9ada96f39e50d39aceb2caf22b6), closes [#1563](https://github.com/angular-ui/ui-router/issues/1563))
* **ie8:** fix calls to indexOf and filter ([dcb31b84](https://github.com/angular-ui/ui-router/commit/dcb31b843391b3e61dee4de13f368c109541813e), closes [#1556](https://github.com/angular-ui/ui-router/issues/1556))
#### Features
* add json parameter Type ([027f1fcf](https://github.com/angular-ui/ui-router/commit/027f1fcf9c0916cea651e88981345da6f9ff214a))
<a name="0.2.12"></a>
### 0.2.12 (2014-11-13)
@@ -140,7 +140,11 @@ module.exports = function (grunt) {

grunt.registerTask('widedocs', 'Convert to bootstrap container-fluid', function () {
promising(this,
system('sed -i.bak -e \'s/class="row"/class="row-fluid"/\' -e \'s/role="main" class="container"/role="main" class="container-fluid"/\' site/index.html')
system(
'sed -i.bak ' +
'-e \'s/class="row"/class="row-fluid"/\' ' +
'-e \'s/icon-cog"><\\/i>/icon-cog"><\\/i>Provider/\' ' +
'-e \'s/role="main" class="container"/role="main" class="container-fluid"/\' site/index.html')
);
});

@@ -151,9 +155,7 @@ module.exports = function (grunt) {
shjs.rm('-rf', 'build');
return system('git checkout gh-pages');
}).then(function () {
return system('git rebase master');
}).then(function () {
return system('git pull');
return system('git merge master');
}).then(function () {
return system('grunt dist-docs');
}).then(function () {
@@ -2,7 +2,7 @@

#### The de-facto solution to flexible routing with nested views
---
**[Download 0.2.11](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.13](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)**) **|**
**[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)) |**
@@ -15,29 +15,16 @@ declare module ng.ui {
controllerProvider?: any;
resolve?: {};
url?: string;
params?: any[];
params?: any;
views?: {};
abstract?: boolean;
onEnter?: (...args: any[]) => void;
onExit?: (...args: any[]) => void;
data?: any;
reloadOnSearch?: boolean;
}

interface ITypedState<T> {
name?: string;
template?: string;
templateUrl?: string;
templateProvider?: () => string;
controller?: any;
controllerAs?: string;
controllerProvider?: any;
resolve?: {};
url?: string;
params?: any[];
views?: {};
abstract?: boolean;
onEnter?: (...args: any[]) => void;
onExit?: (...args: any[]) => void;

interface ITypedState<T> extends IState {
data?: T;
}

@@ -81,6 +68,7 @@ declare module ng.ui {
inherit?: boolean;
relative?: IState;
notify?: boolean;
reload?: boolean;
}

interface IHrefOptions {
@@ -115,19 +103,19 @@ declare module ng.ui {
}

interface IUrlRouterService {
/*
* Triggers an update; the same update that happens when the address bar
* url changes, aka $locationChangeSuccess.
*
* This method is useful when you need to use preventDefault() on the
* $locationChangeSuccess event, perform some custom logic (route protection,
* auth, config, redirection, etc) and then finally proceed with the transition
* by calling $urlRouter.sync().
*
*/
/*
* Triggers an update; the same update that happens when the address bar
* url changes, aka $locationChangeSuccess.
*
* This method is useful when you need to use preventDefault() on the
* $locationChangeSuccess event, perform some custom logic (route protection,
* auth, config, redirection, etc) and then finally proceed with the transition
* by calling $urlRouter.sync().
*
*/
sync(): void;
}

interface IUiViewScrollProvider {
/*
* Reverts back to using the core $anchorScroll service for scrolling
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.2.12",
"version": "0.2.13",
"main": "./release/angular-ui-router.js",
"dependencies": {
"angular": ">= 1.0.8"
@@ -1,6 +1,6 @@
{
"name": "angular-ui-router",
"version": "0.2.12",
"version": "0.2.13",
"description": "State-based routing for AngularJS",
"keywords": [
"angular",
@@ -1,7 +1,7 @@
{
"name": "angular-ui-router",
"description": "State-based routing for AngularJS",
"version": "0.2.12",
"version": "0.2.13",
"homepage": "http://angular-ui.github.com/",
"contributors": [
{

Showing you all comments on commits in this comparison.

@JetFault

This comment has been minimized.

Copy link

JetFault commented on 5797c2e Nov 24, 2014

Question with how this works with the state name. If your name is 'parent.child' and you set parent: 'parent2' what is the intended behaviour?

@christopherthielen

This comment has been minimized.

Copy link
Contributor Author

christopherthielen commented on 5797c2e Nov 24, 2014

@JetFault good question. That should be an Error (it's not currently, but now it will be)

@futurechan

This comment has been minimized.

Copy link

futurechan commented on 027f1fc Jan 6, 2015

If this is what I think it is... aw yeah! Is there an example of how to use this?

@futurechan

This comment has been minimized.

Copy link

futurechan commented on 027f1fc Jan 15, 2015

@christopherthielen, do you have an example?

@christopherthielen

This comment has been minimized.

Copy link
Contributor Author

christopherthielen commented on 027f1fc Jan 15, 2015

You can’t perform that action at this time.