Skip to content

Commit 3e60620

Browse files
committed
CI and doc fixes.
1 parent b302f37 commit 3e60620

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

Gruntfile.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ module.exports = function (grunt) {
7676
preprocessors: {}
7777
},
7878
min: {
79-
browsers: ['Firefox', 'PhantomJS'],
79+
browsers: ['Chrome', 'Firefox', 'PhantomJS'],
8080
options: {
8181
files: [
8282
'bower_components/angular-1.3.2/angular.js',
@@ -87,9 +87,6 @@ module.exports = function (grunt) {
8787
'test/**/*.js'
8888
]
8989
}
90-
},
91-
ci: {
92-
browsers: ['Firefox', 'PhantomJS']
9390
}
9491
},
9592
coveralls: {

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
## js-data-angular
44

5-
Angular wrapper for [js-data](http://www.js-data.io/js-data).
5+
Angular wrapper for [js-data](http://www.js-data.io).
66

77
#### What about Angular-data?
88
Documentation for Angular-data 1.x can be found at [angular-data.pseudobry.com](http://angular-data.pseudobry.com).
99

1010
## API Documentation
11-
[DS](https://github.com/js-data/js-data/wiki/DS)
11+
[DS](http://www.js-data.io/docs/js-data-angular)
1212

1313
## Demo
1414
[js-data-angular.firebaseapp.com/](https://js-data-angular.firebaseapp.com/)
@@ -25,14 +25,14 @@ Documentation for Angular-data 1.x can be found at [angular-data.pseudobry.com](
2525
| Coverage | [![Coverage Status](https://coveralls.io/repos/js-data/js-data-angular/badge.png?branch=master)](https://coveralls.io/r/js-data/js-data-angular?branch=master) |
2626

2727
## Quick Start
28-
`bower install --save js-data js-data-http js-data-angular` or `npm install --save js-data js-data-http js-data-angular`.
28+
`bower install --save js-data js-data-angular` or `npm install --save js-data js-data-angular`.
2929

30-
Load `js-data-angular.js` after `js-data.js` and `js-data-http`.
30+
Load `js-data-angular.js` after `js-data.js`.
3131

3232
__Note:__ You only have to use `js-data-http` if you want to use the `DSHttpAdapter`.
3333

3434
```js
35-
angular.module('myApp', ['js-data', 'js-data-http']);
35+
angular.module('myApp', ['js-data']);
3636
```
3737

3838
```js
@@ -51,14 +51,14 @@ app.controller('postCtrl', function ($scope, $routeParams, Post, Comment) {
5151
var query = {
5252
postId: $routeParams.id
5353
};
54-
54+
5555
Post.find($routeParams.id);
5656
Comment.findAll(query);
57-
57+
5858
// My goodness this was easy
5959
Post.bindOne($scope, 'post', $routeParams.id);
6060
Comment.bindAll($scope, 'comments', query);
61-
61+
6262
// Long form (same effect as above)
6363
$scope.$watch(function () {
6464
return Post.lastModified($routeParams.id);

bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "js-data-angular",
44
"description": "Angular wrapper for js-data (originally angular-data).",
55
"version": "2.0.0-alpha.3-0",
6-
"homepage": "http://www.js-data.io/js-data-angular",
6+
"homepage": "http://www.js-data.io/docs/js-data-angular",
77
"repository": {
88
"type": "git",
99
"url": "https://github.com/js-data/js-data-angular.git"
@@ -29,7 +29,8 @@
2929
"angular-mocks-1.3.2": "angular-mocks#1.3.2"
3030
},
3131
"dependencies": {
32-
"js-data": "~1.0.x"
32+
"js-data": "~1.0.x",
33+
"angular": "~1.x"
3334
},
3435
"resolutions": {
3536
"angular": "1.3.2"

circle.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dependencies:
2+
pre:
3+
- bower install
4+
cache_directories:
5+
- "bower_components"
6+
test:
7+
post:
8+
- grunt coveralls || true

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "js-data-angular",
33
"description": "Angular wrapper for js-data.",
44
"version": "2.0.0-alpha.3-0",
5-
"homepage": "http://js-data-angular.pseudobry.com",
5+
"homepage": "http://www.js-data.io/docs/js-data-angular",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/js-data/js-data-angular.git"

0 commit comments

Comments
 (0)