Skip to content

Commit 3e64335

Browse files
committed
Merge pull request angular-ui#129 from thgreasi/master
Linting abstractions, fixes and improvements.
2 parents e802204 + ff2b93d commit 3e64335

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed

gruntFile.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,27 +85,8 @@ module.exports = function(grunt) {
8585
options: { jshintrc: '.jshintrc' }
8686
},
8787
test: {
88-
files:{ src : [ 'test/*.spec.js', 'gruntFile.js'] },
89-
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), {
90-
node: true,
91-
globals: {
92-
angular: false,
93-
inject: false,
94-
'$': false,
95-
96-
jasmine: false,
97-
afterEach: false,
98-
beforeEach: false,
99-
ddescribe: false,
100-
describe: false,
101-
expect: false,
102-
iit: false,
103-
it: false,
104-
spyOn: false,
105-
xdescribe: false,
106-
xit: false
107-
}
108-
})
88+
files:{ src : [ 'test/*.js', 'gruntFile.js'] },
89+
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), grunt.file.readJSON('test/.jshintrc'))
10990
}
11091
},
11192

test/.jshintrc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"node": true,
3+
"globals": {
4+
"angular": false,
5+
"inject": false,
6+
"$": false,
7+
8+
"jasmine": false,
9+
"afterEach": false,
10+
"beforeEach": false,
11+
"ddescribe": false,
12+
"describe": false,
13+
"expect": false,
14+
"iit": false,
15+
"it": false,
16+
"spyOn": false,
17+
"xdescribe": false,
18+
"xit": false
19+
}
20+
}

test/karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Karma configuration
22
// Generated on Sat Dec 28 2013 20:27:08 GMT+0100 (CET)
33

4+
'use strict';
5+
46
module.exports = function(config) {
57
config.set({
68

test/sortable.test-directives.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ angular.module('ui.sortable.testDirectives', [])
88
scope: true,
99
require: '?ngModel',
1010
template: '<div>Directive: <span class="itemContent" ng-bind="text"></span> !!!</div>',
11-
link: function(scope, element, attrs, ngModel) {
11+
link: function(scope, element, attrs) {
1212
scope.$watch(attrs.ngModel, function(value) {
13-
scope.text = value;
14-
});
13+
scope.text = value;
14+
});
1515
}
1616
};
1717
}
@@ -23,10 +23,10 @@ angular.module('ui.sortable.testDirectives', [])
2323
scope: true,
2424
require: '?ngModel',
2525
template: '<div>$destroy(able) Directive: <span class="itemContent" ng-bind="text"></span> !!!</div>',
26-
link: function(scope, element, attrs, ngModel) {
26+
link: function(scope, element, attrs) {
2727
scope.$watch(attrs.ngModel, function(value) {
28-
scope.text = value;
29-
});
28+
scope.text = value;
29+
});
3030

3131
element.bind('$destroy', function() {
3232
element.html('');

0 commit comments

Comments
 (0)