Skip to content

Angular-ui-router version 0.2.18 with ui-sref-active #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 107 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
963f6e7
feat($IncludedByStateFilter): add parameters to $IncludedByStateFilter
cyrilf Feb 5, 2015
bad2d2c
Github -> GitHub
bbodenmiller Nov 2, 2015
06d41e3
Github -> GitHub
bbodenmiller Nov 2, 2015
d957a1e
fix(date-comparison): equalForKeys now supports dates
Yankovsky Nov 19, 2015
093c75a
fix(ui-sref-active): update class on $locationChangeSuccess event
Yankovsky Nov 19, 2015
1b9a407
new build
Yankovsky Nov 19, 2015
9d2e57f
Merge pull request #2351 from bbodenmiller/patch-1
wesleycho Nov 29, 2015
4b7f304
feat(urlMatcher): add support for optional spaces
wesleycho Dec 1, 2015
cbf7547
Merge pull request #2406 from wesleycho/feat/url-param-spaces
nateabele Dec 1, 2015
2199889
Merge pull request #1736 from cyrilf/includedByState-improvement
nateabele Dec 8, 2015
d31b333
fix(urlMatcherFactory.js): change to allow url query param names to c…
Dec 9, 2015
7c91403
fix(uiSrefActive): update the active classes when compiled
fpipita Jan 7, 2016
8c1bf30
fix(transitionTo): re-added the saved hash before broadcasting event
blokfyuh Jan 15, 2016
2d23875
Merge pull request #2464 from blokfyuh/blokfyuh-hash-fix-permissions-…
nateabele Jan 19, 2016
e05ff5a
Fixes https://github.com/angular-ui/ui-router/issues/2327, kudos to @…
Jan 22, 2016
20d6e24
fix(UrlMatcher): Array types: Pass empty arrays through in handler
christopherthielen Jan 23, 2016
02e9866
fix(UrlMatcher): Properly encode/decode slashes in parameters
christopherthielen Jan 23, 2016
350d3e8
fix(reloadOnSearch): Update `locals.globals.$stateParams` when reload…
christopherthielen Jan 23, 2016
e00aa69
fix($state): statechangeCancel: don't clobber url if a new transition…
christopherthielen Jan 23, 2016
41acad8
test(*): Run test suite against angular 1.4.9;
christopherthielen Jan 24, 2016
e92a929
Merge pull request #2478 from piotrd/fixes/2327
christopherthielen Jan 24, 2016
dfd1078
Merge pull request #2447 from fpipita/master
christopherthielen Jan 24, 2016
4c7b6a6
docs(state) document the reload transition parameter
christopherthielen Jan 24, 2016
77333c1
Prep for release 0.2.16
christopherthielen Jan 24, 2016
6ab4472
release 0.2.16
christopherthielen Jan 24, 2016
a89114a
fix(uiSrefActive): allow multiple classes
nateabele Jan 25, 2016
87f10df
release 0.2.17
nateabele Jan 25, 2016
2523bbd
feat(ui-view): Add noanimation attribute to specify static renderer. …
christopherthielen Jan 28, 2016
b8f3c14
fix(uiState): Corrected variable (#2488, #2508)
jrcPinappol Feb 1, 2016
d482cc8
Merge pull request #2511 from dEradicated/master
christopherthielen Feb 1, 2016
508f9ce
style(npmignore): add bower_components folder to ignore list
Jan 29, 2016
ad9c41d
fix($urlMatcherFactory): Fix to make the YUI Javascript compressor work
Feb 3, 2016
ac865f2
Merge pull request #2521 from royteeuwen/fix-yuicompressor
nateabele Feb 4, 2016
b215c11
Update README.md
christopherthielen Feb 4, 2016
f100e5f
Update README.md
christopherthielen Feb 5, 2016
3783e68
docs(resolve): fix a typo
prayagverma Feb 6, 2016
ef7992d
Merge pull request #2532 from pra85/patch-1
nateabele Feb 6, 2016
c4b30ef
Merge pull request #2497 from christopherthielen/master
christopherthielen Feb 6, 2016
2f1ebef
fix($urlRouter): revert BC: resolve clashing of routes
christopherthielen Feb 7, 2016
d6d8c33
fix(stateBuilder): fix non-url params on a state without a url.
christopherthielen Feb 7, 2016
72bef43
chore(*): run test suite against angular 1.5.0.
christopherthielen Feb 7, 2016
e817d49
prep for 0.2.18
christopherthielen Feb 7, 2016
ec6ca36
release 0.2.18
christopherthielen Feb 7, 2016
2db11a6
feat($IncludedByStateFilter): add parameters to $IncludedByStateFilter
cyrilf Feb 5, 2015
ecc630d
0.2.15 changelog.md
christopherthielen May 19, 2015
dd8ac86
refactor(package): Added support for commonjs
aaronroberson May 18, 2015
bda1864
docs(repo): updated contributing label images
eddiemonge May 20, 2015
332d91c
Revert "refactor(commonjs): Added support for commonjs"
nateabele May 20, 2015
e880209
fix(ui-view): change $viewContentLoading to pair with $viewContentLoaded
May 29, 2015
e928bfc
feat(uiSrefActive): allow active & active-eq on same element
joshuahiggins Jun 4, 2015
7634940
fix(urlMatcherFactory): include the slash in squashed params
eddiemonge Jun 26, 2015
6ce8710
test(): add test for generating urls with default params
christopherthielen Jul 18, 2015
93ef6b5
docs($urlProvider): wrong param type
JanDalF Jul 20, 2015
dfb426b
feat(uiState): add ui-state directive
nateabele Aug 19, 2015
627750d
fix(uiSref): Ensure URL once param checks pass
nateabele Aug 19, 2015
f7d952a
fix(UrlMatcherFactory): Correct trailing slash of terminal optional p…
JakobJingleheimer Aug 24, 2015
a370744
fix($stateParams): service instance reset between tests
pkt-zer0 Aug 24, 2015
85783f3
feat($stateChangeStart): Add options to event
scooper91 Aug 26, 2015
877dec9
change from plural 'states' to singular 'state'
epps Sep 3, 2015
f62e33b
fix(urlRouter): add check using `$sniffer`
wesleycho Sep 3, 2015
09c5f8b
chore(travis): upgrade to new infrastructure
wesleycho Sep 3, 2015
5ac4531
fix($urlRouter): resolve clashing of routes
just-boris Nov 26, 2014
df2e92e
Fix typos
stewx Sep 14, 2015
c583f55
fix(view): fix $animate usage for 1.4+
wesleycho Sep 14, 2015
fa838e9
fixed typo: validate to validates in docs
Sep 18, 2015
c59f1b3
docs($state): add note about default params
tamlyn Sep 14, 2015
6177ca4
chore(ts): remove type file
May 27, 2015
3be7b16
chore(bower): add MIT license
Jul 23, 2015
9e8e96d
chore(docs): change to handler
Gaff Aug 2, 2015
c251ae5
chore(state): remove unnecessary character
djindjic Jul 21, 2015
66113a9
feat(isStateFilter): Include optional state params.
philBrown Sep 28, 2015
bbce86e
feat($state): make state data inheritance prototypical
chrislambe Oct 2, 2015
3ab32c9
feat(UrlMatcher): Add param only type names
filipesilva Oct 6, 2015
88c6749
Revert "feat(UrlMatcher): Add param only type names"
nateabele Oct 6, 2015
e9d74ed
fix(urlMatcherFactory): fix configuring a parameter type by name in a…
christopherthielen Oct 6, 2015
0625f0a
fix(viewDirective): $destroy event is triggered before animation ends
Oct 30, 2015
1e2e10d
Github -> GitHub
bbodenmiller Nov 2, 2015
b0fe6dd
Github -> GitHub
bbodenmiller Nov 2, 2015
29d2c7b
feat(uiSrefActive): provide a ng-{class,style} like interface
fpipita Nov 7, 2015
bf94d47
feat(urlMatcher): add support for optional spaces
wesleycho Dec 1, 2015
4a19a46
fix(urlMatcherFactory.js): change to allow url query param names to c…
Dec 9, 2015
56efb27
fix(uiSrefActive): update the active classes when compiled
fpipita Jan 7, 2016
8613ef2
fix(transitionTo): re-added the saved hash before broadcasting event
blokfyuh Jan 15, 2016
ad9f4aa
Fixes https://github.com/angular-ui/ui-router/issues/2327, kudos to @…
Jan 22, 2016
5bba2d6
fix(UrlMatcher): Array types: Pass empty arrays through in handler
christopherthielen Jan 23, 2016
377e635
fix(UrlMatcher): Properly encode/decode slashes in parameters
christopherthielen Jan 23, 2016
e7e5e38
fix(reloadOnSearch): Update `locals.globals.$stateParams` when reload…
christopherthielen Jan 23, 2016
f639afc
fix($state): statechangeCancel: don't clobber url if a new transition…
christopherthielen Jan 23, 2016
1c3b7e6
test(*): Run test suite against angular 1.4.9;
christopherthielen Jan 24, 2016
00710b3
docs(state) document the reload transition parameter
christopherthielen Jan 24, 2016
7ef9ab1
Prep for release 0.2.16
christopherthielen Jan 24, 2016
06094bf
release 0.2.16
christopherthielen Jan 24, 2016
b6d1fb2
fix(uiSrefActive): allow multiple classes
nateabele Jan 25, 2016
681a2a9
release 0.2.17
nateabele Jan 25, 2016
4e64f1d
feat(ui-view): Add noanimation attribute to specify static renderer. …
christopherthielen Jan 28, 2016
8699107
fix(uiState): Corrected variable (#2488, #2508)
jrcPinappol Feb 1, 2016
e9f2037
style(npmignore): add bower_components folder to ignore list
Jan 29, 2016
8bf3b19
fix($urlMatcherFactory): Fix to make the YUI Javascript compressor work
Feb 3, 2016
bbc90a9
Update README.md
christopherthielen Feb 4, 2016
c567142
Update README.md
christopherthielen Feb 5, 2016
442bc07
docs(resolve): fix a typo
prayagverma Feb 6, 2016
508f1b0
fix($urlRouter): revert BC: resolve clashing of routes
christopherthielen Feb 7, 2016
aa999fb
fix(stateBuilder): fix non-url params on a state without a url.
christopherthielen Feb 7, 2016
509efc8
chore(*): run test suite against angular 1.5.0.
christopherthielen Feb 7, 2016
7233d86
prep for 0.2.18
christopherthielen Feb 7, 2016
3b64c6b
release 0.2.18
christopherthielen Feb 7, 2016
c8ffd6e
Merge branch 'fix/ui-sref-active' into feature/0.2.18-with-fix
ExpFront Jun 23, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ bower_components

# webstorm files
.idea
*.iml
*.ipr
*.iws
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
**/.*

# Build related stuff
/build
/config
/lib
/ngdoc_assets
/sample
/test
/bower_components
/node_modules
Gruntfile.js
files.js

Expand Down
72 changes: 72 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,75 @@
<a name="0.2.18"></a>
### 0.2.18 (2016-02-07)

This is a maintenance release which fixes a few known bugs introduced in 0.2.16.

#### Bug Fixes

* **$urlRouter:** revert BC: resolve clashing of routes This reverts commit b5c57c8ec2e14e17e75104 ([2f1ebefc](https://github.com/angular-ui/ui-router/commit/2f1ebefc242ff48960e0bf63da359296a38f6852), closes [#2501](https://github.com/angular-ui/ui-router/issues/2501))
* **uiState:** Corrected typo for 'ref' variable (#2488, #2508) ([b8f3c144](https://github.com/angular-ui/ui-router/commit/b8f3c144b913e620f177b78f3b4f52afa61d41a6))
* **$urlMatcherFactory:** Fix to make the YUI Javascript compressor work ([ad9c41d2](https://github.com/angular-ui/ui-router/commit/ad9c41d2e723d50e30dd3452fbd274b7057dc3d9))
* **stateBuilder:** fix non-url params on a state without a url. The parameters are now applied when ([d6d8c332](https://github.com/angular-ui/ui-router/commit/d6d8c3322c4dde8bb5b8dde25f9fcda49e9c4c81), closes [#2025](https://github.com/angular-ui/ui-router/issues/2025))
* **ui-view:** (ui-view) use static renderer when no animation is present for a ui-view ([2523bbdb](https://github.com/angular-ui/ui-router/commit/2523bbdb5542483a489c22804f1751b8b9f71703), closes [#2485](https://github.com/angular-ui/ui-router/issues/2485)). This allows a ui-view scope to be destroyed when switching states, before the next view is initialized.


#### Features

* **ui-view:** Add noanimation attribute to specify static renderer. ([2523bbdb](https://github.com/angular-ui/ui-router/commit/2523bbdb5542483a489c22804f1751b8b9f71703), closes [#2485](https://github.com/angular-ui/ui-router/issues/2485)). This allows a ui-view scope to be destroyed before the next ui-view is initialized, when ui-view animation is not present.


<a name="0.2.17"></a>
### 0.2.17 (2016-01-25)


#### Bug Fixes

* **uiSrefActive:** allow multiple classes ([a89114a0](https://github.com/angular-ui/ui-router/commit/a89114a083813c1a7280c48fc18e626caa5a31f4), closes [#2481](https://github.com/angular-ui/ui-router/issues/2481), [#2482](https://github.com/angular-ui/ui-router/issues/2482))


<a name="0.2.16"></a>
### 0.2.16 (2016-01-24)


#### Bug Fixes

* **$state:**
* statechangeCancel: Avoid infinite digest in .otherwise/redirect case. Don't clobber url if a new transition has started. Closes #222 ([e00aa695](https://github.com/angular-ui/ui-router/commit/e00aa695e41ddc5ebd5d2b226aa0917a751b11aa), closes [#2238](https://github.com/angular-ui/ui-router/issues/2238))
* transitionTo: Allow hash (#) value to be read as toParams['#'] in events. Re-add the saved hash before broadcasting $stateChangeStart event. ([8c1bf30d](https://github.com/angular-ui/ui-router/commit/8c1bf30d2a3b78ba40b330f12d854c885d6cc117))
* **$stateParams:** Fix for testing: reset service instance between tests ([2aeb0c4b](https://github.com/angular-ui/ui-router/commit/2aeb0c4b205baf6cfa2ef25bb986bb160dc13bf9))
* **$urlRouter:**
* Sort URL rules by specificity. Potential minor BC if apps were relying on rule registration order. ([b5c57c8e](https://github.com/angular-ui/ui-router/commit/b5c57c8ec2e14e17e75104c1424654f126ea4011))
* Use $sniffer for pushstate compat check ([c219e801](https://github.com/angular-ui/ui-router/commit/c219e801797f340ef9c5c919ab890ef003a7a042))
* **UrlMatcher:**
* Properly encode/decode slashes in parameters Closes #2172 Closes #2250 Closes #1 ([02e98660](https://github.com/angular-ui/ui-router/commit/02e98660a80dfd1ca4b113dd24ee304af91e9f8c), closes [#2339](https://github.com/angular-ui/ui-router/issues/2339))
* Array types: Fix default value for array query parameters. Pass empty arrays through in handler. ([20d6e243](https://github.com/angular-ui/ui-router/commit/20d6e243f1745ddbf257217245a1dc22eabe13da), closes [#2222](https://github.com/angular-ui/ui-router/issues/2222))
* Remove trailing slash, if parameter is optional and was squashed from URL ([77fa11bf](https://github.com/angular-ui/ui-router/commit/77fa11bf0787d0f6da97ab0003ab29afb7411391), closes [#1902](https://github.com/angular-ui/ui-router/issues/1902))
* Allow a parameter declaration to configure the parameter type by name. closes #2294 ([e4010249](https://github.com/angular-ui/ui-router/commit/e40102492d40fe1cf6ba14d955fcc9f345c16458))
* include the slash when recognizing squashed params in url ([b5130bb1](https://github.com/angular-ui/ui-router/commit/b5130bb1215e15f832ea6daa670410b9a950c0d4), closes [#2064](https://github.com/angular-ui/ui-router/issues/2064))
* Allow url query param names to contain periods ([d31b3337](https://github.com/angular-ui/ui-router/commit/d31b3337cc2ce71d87c92fdded629e46558d0b49))
* **reloadOnSearch:** Update `locals.globals.$stateParams` when reloadOnSearch=false ([350d3e87](https://github.com/angular-ui/ui-router/commit/350d3e87783a2263fd7d23913da34f1268c3300b), closes [#2356](https://github.com/angular-ui/ui-router/issues/2356))
* **ui-view:**
* fix $animate usage for ng 1.4+ ([9b6d9a2d](https://github.com/angular-ui/ui-router/commit/9b6d9a2d0ce4ae08384165cb517bddea59b67892))
* change $viewContentLoading to pair with $viewContentLoaded ([f9b43d66](https://github.com/angular-ui/ui-router/commit/f9b43d66833f0e17de41fd8d1cc3b491e3ba4a0e), closes [#685](https://github.com/angular-ui/ui-router/issues/685))
* $destroy event is triggered before animation ends ([1be13795](https://github.com/angular-ui/ui-router/commit/1be13795686ab78abb2d5094bc8addcacb928975))
* **uiSref:**
* Ensure URL once param checks pass ([9dc31c54](https://github.com/angular-ui/ui-router/commit/9dc31c5465328e5666468b0c2319ce205f4b72f8), closes [#2091](https://github.com/angular-ui/ui-router/issues/2091))
* uiSrefActive: update the active classes after linking directive ([7c914030](https://github.com/angular-ui/ui-router/commit/7c914030f13e05e45a941c1b723cb785db729890))


#### Features

* **$IncludedByStateFilter:** add parameters to $IncludedByStateFilter ([963f6e71](https://github.com/angular-ui/ui-router/commit/963f6e71633b9c3a266f3991d79089b7d14786b4), closes [#1735](https://github.com/angular-ui/ui-router/issues/1735))
* **isStateFilter:** Include optional state params. ([71d74699](https://github.com/angular-ui/ui-router/commit/71d7469987ee9ca86a41c8c6393ccd5d8913c3d6))
* **$state:** make state data inheritance prototypical ([c4fec8c7](https://github.com/angular-ui/ui-router/commit/c4fec8c7998113902af4152d716c42dada6eb465))
* **$stateChangeStart:** Add options to event ([a1f07559](https://github.com/angular-ui/ui-router/commit/a1f07559ec74e10ff80bc4be81f287e3772b8fcb))
* **UrlMatcher:** Add param only type names ([6a371f9b](https://github.com/angular-ui/ui-router/commit/6a371f9b70e37a82eb324122879e4473c3f6d526))
* **uiSrefActive:**
* provide a ng-{class,style} like interface ([a9ff6feb](https://github.com/angular-ui/ui-router/commit/a9ff6febb469e0d5cd49054216c4472df7a6259d))
* allow active & active-eq on same element ([d9a676ba](https://github.com/angular-ui/ui-router/commit/d9a676ba2c4d9e954be224c60496bcb38f6074e3))
* **uiState:** add ui-state directive ([3831af1d](https://github.com/angular-ui/ui-router/commit/3831af1dc71b601351e6694af0665a77297f8f7f), closes [#395](https://github.com/angular-ui/ui-router/issues/395), [#900](https://github.com/angular-ui/ui-router/issues/900), [#1932](https://github.com/angular-ui/ui-router/issues/1932))
* **urlMatcher:** add support for optional spaces in params ([4b7f3046](https://github.com/angular-ui/ui-router/commit/4b7f304617f0b3590b532103b5c2fb526c98a9e4))


<a name="0.2.15"></a>
### 0.2.15 (2015-05-19)

Expand Down
32 changes: 14 additions & 18 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = function (grunt) {
},
karma: {
options: {
configFile: 'config/karma.js',
configFile: 'config/karma-1.4.9.js',
singleRun: true,
exclude: [],
frameworks: ['jasmine'],
Expand All @@ -88,21 +88,17 @@ module.exports = function (grunt) {
background: false,
browsers: [ grunt.option('browser') || 'Chrome' ]
},
past: {
configFile: 'config/karma-1.0.8.js'
},
unstable: {
configFile: 'config/karma-1.1.5.js'
},
future: {
configFile: 'config/karma-1.3.0.js'
},
ng108: { configFile: 'config/karma-1.0.8.js' },
ng115: { configFile: 'config/karma-1.1.5.js' },
ng1214: { configFile: 'config/karma-1.2.14.js' },
ng130: { configFile: 'config/karma-1.3.0.js' },
ng149: { configFile: 'config/karma-1.4.9.js' },
ng150: { configFile: 'config/karma-1.5.0.js' },
background: {
background: true,
browsers: [ grunt.option('browser') || 'PhantomJS' ]
},
watch: {
configFile: 'config/karma.js',
singleRun: false,
autoWatch: true,
autoWatchInterval: 1
Expand All @@ -129,7 +125,7 @@ module.exports = function (grunt) {
}
});

grunt.registerTask('integrate', ['build', 'jshint', 'karma:unit', 'karma:past', 'karma:unstable']);
grunt.registerTask('integrate', ['build', 'jshint', 'karma:ng108', 'karma:ng115', 'karma:ng1214', 'karma:ng130', 'karma:ng149', 'karma:ng150']);
grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);
grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']);
Expand Down Expand Up @@ -183,14 +179,14 @@ module.exports = function (grunt) {
var bower = grunt.file.readJSON('bower.json'),
component = grunt.file.readJSON('component.json'),
version = bower.version;
if (version != grunt.config('pkg.version')) throw 'Version mismatch in bower.json';
if (version != component.version) throw 'Version mismatch in component.json';
if (version != grunt.config('pkg.version')) throw new Error('Version mismatch in bower.json');
if (version != component.version) throw new Error('Version mismatch in component.json');

promising(this,
ensureCleanMaster().then(function () {
return exec('git tag -l \'' + version + '\'');
}).then(function (result) {
if (result.stdout.trim() !== '') throw 'Tag \'' + version + '\' already exists';
if (result.stdout.trim() !== '') throw new Error('Tag \'' + version + '\' already exists');
grunt.config('buildtag', '');
grunt.config('builddir', 'release');
})
Expand Down Expand Up @@ -220,7 +216,7 @@ module.exports = function (grunt) {
grunt.log.write(result.stderr + result.stdout);
}, function (error) {
grunt.log.write(error.stderr + '\n');
throw 'Failed to run \'' + cmd + '\'';
throw new Error('Failed to run \'' + cmd + '\'');
});
}

Expand All @@ -236,10 +232,10 @@ module.exports = function (grunt) {

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

#### The de-facto solution to flexible routing with nested views
---
**[Download 0.2.15](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.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)**) **|**
**[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)) |**
Expand All @@ -13,6 +13,13 @@
**[Help!](http://stackoverflow.com/questions/ask?tags=angularjs,angular-ui-router) |**
**[Discuss](https://groups.google.com/forum/#!categories/angular-ui/router)**

---

*_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)


---

AngularUI Router is a routing framework for [AngularJS](http://angularjs.org), which allows you to organize the
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "angular-ui-router",
"version": "0.2.15",
"version": "0.2.18",
"license" : "MIT",
"main": "./release/angular-ui-router.js",
"dependencies": {
"angular": ">= 1.0.8"
"angular": "^1.0.8"
},
"ignore": [
"**/.*",
Expand Down
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.15",
"version": "0.2.18",
"description": "State-based routing for AngularJS",
"keywords": [
"angular",
Expand Down
File renamed without changes.
27 changes: 27 additions & 0 deletions config/karma-1.4.9.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Karma configuration file
module.exports = function (karma) {

var files = require('../files').files;

karma.set({
// base path, that will be used to resolve files and exclude
basePath: '..',

// list of files / patterns to load in the browser
files: [].concat(files.angular('1.4.9'), files.testUtils, files.src, files.test),

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel: karma.LOG_DEBUG,
frameworks: ['jasmine'],

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
browsers: [ 'PhantomJS' ]
})
};
27 changes: 27 additions & 0 deletions config/karma-1.5.0.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Karma configuration file
module.exports = function (karma) {

var files = require('../files').files;

karma.set({
// base path, that will be used to resolve files and exclude
basePath: '..',

// list of files / patterns to load in the browser
files: [].concat(files.angular('1.5.0'), files.testUtils, files.src, files.test),

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel: karma.LOG_DEBUG,
frameworks: ['jasmine'],

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
browsers: [ 'PhantomJS' ]
})
};
5 changes: 3 additions & 2 deletions files.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ routerFiles = {
'src/stateFilters.js'
],
testUtils: [
'test/testUtils.js'
'test/testUtils.js',
'node_modules/phantomjs-polyfill/bind-polyfill.js'
],
test: [
'test/*Spec.js',
Expand All @@ -23,7 +24,7 @@ routerFiles = {
return [
'lib/angular-' + version + '/angular.js',
'lib/angular-' + version + '/angular-mocks.js'
].concat(['1.2.14', '1.3.0'].indexOf(version) !== -1 ? ['lib/angular-' + version + '/angular-animate.js'] : []);
].concat(['1.0.8', '1.1.5'].indexOf(version) === -1 ? ['lib/angular-' + version + '/angular-animate.js'] : []);
}
};

Expand Down
Loading