Skip to content

Commit 6f700f8

Browse files
committed
Fixes #335.
Stable Version 3.1.0
1 parent c3d47b0 commit 6f700f8

10 files changed

+294
-202
lines changed

.jshintrc

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"browser": true,
44
"esnext": true,
55
"bitwise": true,
6+
"asi": true,
67
"camelcase": true,
78
"curly": true,
89
"eqeqeq": true,

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
##### 3.1.1 - 20 September 2015
2+
3+
Stable Version 3.1.0
4+
5+
###### Backwards compatible API changes
6+
- #335 - Calling $q.reject in http interceptor doesn't resolve to calling reject handler in DS.findAll.then
7+
8+
###### Other
9+
- Built with js-data-http 2.1.1
10+
- Upgraded dependencies
11+
112
##### 3.0.0 - 02 July 2015
213

314
Stable Version 3.0.0

CONTRIBUTING.md

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
# Contributing Guide
22

3-
First, feel free to contact me with questions. [Mailing List](https://groups.google.com/forum/?fromgroups#!forum/js-data-angular). [Issues](https://github.com/js-data/js-data-angular/issues).
3+
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
44

5-
1. Contribute to the issue that is the reason you'll be developing in the first place
5+
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
6+
7+
- good - Your versions of Angular, js-data, js-data-angular, etc., relevant console logs/error, code examples that revealed the issue
8+
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
9+
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
10+
11+
[Github Issues](https://github.com/js-data/js-data-angular/issues).
12+
13+
#### Submitting Pull Requests
14+
15+
1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
616
1. Fork js-data-angular
7-
1. `git clone https://github.com/<you>/js-data-angular.git`
17+
1. `git clone git@github.com:<you>/js-data-angular.git`
818
1. `cd js-data-angular; npm install; bower install;`
9-
1. `grunt go` (builds and starts a watch)
10-
1. (in another terminal) `grunt karma:dev` (runs the tests)
1119
1. Write your code, including relevant documentation and tests
12-
1. Submit a PR and we'll review
20+
1. Run `grunt test` (build and test)
21+
1. Your code will be linted and checked for formatting, the tests will be run
22+
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
23+
1. Submit your PR and we'll review!
24+
1. Thanks!

Gruntfile.js

+31
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@ module.exports = function (grunt) {
7878
'test/**/*.js'
7979
]
8080
}
81+
},
82+
c9: {
83+
browsers: ['PhantomJS'],
84+
options: {
85+
files: [
86+
'bower_components/angular-1.3.2/angular.js',
87+
'bower_components/angular-mocks-1.3.2/angular-mocks.js',
88+
'node_modules/js-data/dist/js-data.min.js',
89+
'dist/js-data-angular.min.js',
90+
'karma.start.js',
91+
'test/**/*.js'
92+
]
93+
}
8194
}
8295
},
8396
coveralls: {
@@ -123,6 +136,22 @@ module.exports = function (grunt) {
123136
}
124137
});
125138

139+
grunt.registerTask('standard', function () {
140+
var child_process = require('child_process');
141+
var done = this.async();
142+
grunt.log.writeln('Linting for correcting formatting...');
143+
child_process.exec('node node_modules/standard/bin/cmd.js --parser babel-eslint src/*.js src/**/*.js src/**/**/*.js', function (err, stdout) {
144+
console.log(stdout);
145+
if (err) {
146+
grunt.log.writeln('Failed due to ' + (stdout.split('\n').length - 2) + ' lint errors!');
147+
done(err);
148+
} else {
149+
grunt.log.writeln('Done linting.');
150+
done();
151+
}
152+
});
153+
});
154+
126155
grunt.registerTask('version', function (filePath) {
127156
var file = grunt.file.read(filePath);
128157

@@ -133,10 +162,12 @@ module.exports = function (grunt) {
133162

134163
grunt.registerTask('build', [
135164
'clean',
165+
'standard',
136166
'webpack',
137167
'uglify'
138168
]);
139169
grunt.registerTask('go', ['build', 'watch:dist']);
140170
grunt.registerTask('default', ['build']);
141171
grunt.registerTask('test', ['build', 'karma:min']);
172+
grunt.registerTask('test_c9', ['build', 'karma:c9']);
142173
};

README.md

+18-6
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,28 @@ app.controller('postCtrl', function ($scope, $routeParams, Post, Comment) {
108108

109109
### Contributing
110110

111-
First, feel free to contact me with questions. [Mailing List](https://groups.io/org/groupsio/jsdata). [Issues](https://github.com/js-data/js-data-angular/issues).
111+
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
112112

113-
1. Contribute to the issue that is the reason you'll be developing in the first place
113+
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
114+
115+
- good - Your versions of Angular, js-data, js-data-angular, etc., relevant console logs/error, code examples that revealed the issue
116+
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
117+
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
118+
119+
[Github Issues](https://github.com/js-data/js-data-angular/issues).
120+
121+
#### Submitting Pull Requests
122+
123+
1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
114124
1. Fork js-data-angular
115-
1. `git clone https://github.com/<you>/js-data-angular.git`
125+
1. `git clone git@github.com:<you>/js-data-angular.git`
116126
1. `cd js-data-angular; npm install; bower install;`
117-
1. `grunt go` (builds and starts a watch)
118-
1. (in another terminal) `grunt karma:dev` (runs the tests)
119127
1. Write your code, including relevant documentation and tests
120-
1. Submit a PR and we'll review
128+
1. Run `grunt test` (build and test)
129+
1. Your code will be linted and checked for formatting, the tests will be run
130+
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
131+
1. Submit your PR and we'll review!
132+
1. Thanks!
121133

122134
### License
123135

0 commit comments

Comments
 (0)