Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Linting abstractions, fixes and improvements. #129

Merged
merged 3 commits into from
Feb 24, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 2 additions & 21 deletions gruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,27 +85,8 @@ module.exports = function(grunt) {
options: { jshintrc: '.jshintrc' }
},
test: {
files:{ src : [ 'test/*.spec.js', 'gruntFile.js'] },
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), {
node: true,
globals: {
angular: false,
inject: false,
'$': false,

jasmine: false,
afterEach: false,
beforeEach: false,
ddescribe: false,
describe: false,
expect: false,
iit: false,
it: false,
spyOn: false,
xdescribe: false,
xit: false
}
})
files:{ src : [ 'test/*.js', 'gruntFile.js'] },
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), grunt.file.readJSON('test/.jshintrc'))
}
},

Expand Down
20 changes: 20 additions & 0 deletions test/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"node": true,
"globals": {
"angular": false,
"inject": false,
"$": false,

"jasmine": false,
"afterEach": false,
"beforeEach": false,
"ddescribe": false,
"describe": false,
"expect": false,
"iit": false,
"it": false,
"spyOn": false,
"xdescribe": false,
"xit": false
}
}
2 changes: 2 additions & 0 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Karma configuration
// Generated on Sat Dec 28 2013 20:27:08 GMT+0100 (CET)

'use strict';

module.exports = function(config) {
config.set({

Expand Down
12 changes: 6 additions & 6 deletions test/sortable.test-directives.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ angular.module('ui.sortable.testDirectives', [])
scope: true,
require: '?ngModel',
template: '<div>Directive: <span class="itemContent" ng-bind="text"></span> !!!</div>',
link: function(scope, element, attrs, ngModel) {
link: function(scope, element, attrs) {
scope.$watch(attrs.ngModel, function(value) {
scope.text = value;
});
scope.text = value;
});
}
};
}
Expand All @@ -23,10 +23,10 @@ angular.module('ui.sortable.testDirectives', [])
scope: true,
require: '?ngModel',
template: '<div>$destroy(able) Directive: <span class="itemContent" ng-bind="text"></span> !!!</div>',
link: function(scope, element, attrs, ngModel) {
link: function(scope, element, attrs) {
scope.$watch(attrs.ngModel, function(value) {
scope.text = value;
});
scope.text = value;
});

element.bind('$destroy', function() {
element.html('');
Expand Down