Skip to content

Commit 555e2a7

Browse files
committed
jshint for modules
1 parent 94bd379 commit 555e2a7

File tree

5 files changed

+16
-25
lines changed

5 files changed

+16
-25
lines changed

Gruntfile.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,11 @@ module.exports = function (grunt) {
6060
}
6161
},
6262
jshint: {
63-
dist: {
64-
files: {
65-
src: [
66-
'./dist/ui-scroll.js',
67-
'./dist/ui-scroll-jqlite.js'
68-
]
69-
},
70-
options: {
71-
jshintrc: '.jshintrc'
72-
}
73-
},
7463
src: {
7564
files: {
7665
src: [
77-
'./src/ui-scroll.js',
78-
'./src/ui-scroll-jqlite.js'
66+
'./src/*.js',
67+
'./src/modules/*.js'
7968
]
8069
},
8170
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), grunt.file.readJSON('./src/.jshintrc'))
@@ -125,6 +114,7 @@ module.exports = function (grunt) {
125114
]);
126115

127116
grunt.registerTask('buildWatcher', [
117+
'jshint:src',
128118
'webpack',
129119
'copy:sources'
130120
]);

src/modules/elementRoutines.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
export default class ElementRoutines {
22

3-
constructor($injector) {
3+
constructor($injector, $q) {
44
this.$animate = ($injector.has && $injector.has('$animate')) ? $injector.get('$animate') : null;
55
this.isAngularVersionLessThen1_3 = angular.version.major === 1 && angular.version.minor < 3;
6+
this.$q = $q;
67
}
78

89
insertElement(newElement, previousElement) {
@@ -18,11 +19,11 @@ export default class ElementRoutines {
1819

1920
insertElementAnimated(newElement, previousElement) {
2021
if (!this.$animate) {
21-
return insertElement(newElement, previousElement);
22+
return this.insertElement(newElement, previousElement);
2223
}
2324

2425
if (this.isAngularVersionLessThen1_3) {
25-
const deferred = $q.defer();
26+
const deferred = this.$q.defer();
2627
// no need for parent - previous element is never null
2728
this.$animate.enter(newElement, null, previousElement, () => deferred.resolve());
2829

@@ -35,11 +36,11 @@ export default class ElementRoutines {
3536

3637
removeElementAnimated(wrapper) {
3738
if (!this.$animate) {
38-
return removeElement(wrapper);
39+
return this.removeElement(wrapper);
3940
}
4041

4142
if (this.isAngularVersionLessThen1_3) {
42-
const deferred = $q.defer();
43+
const deferred = this.$q.defer();
4344
this.$animate.leave(wrapper.element, () => {
4445
wrapper.scope.$destroy();
4546
return deferred.resolve();

src/modules/viewport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Padding from './padding'
1+
import Padding from './padding';
22

33
export default function Viewport(elementRoutines, buffer, element, viewportController, padding) {
44
let topPadding = null;

src/ui-scroll-grid.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ angular.module('ui.scroll.grid', [])
3131

3232
this.exchangeWith = (index) => controller.exchangeWith(column, index);
3333

34-
Object.defineProperty(this, 'columnId', {get: () => column.id})
34+
Object.defineProperty(this, 'columnId', {get: () => column.id});
3535
}
3636

3737
function ColumnController(controller, columns, header) {
@@ -234,10 +234,10 @@ angular.module('ui.scroll.grid', [])
234234
controllers[0].gridController = controllers[0].gridController || new GridController(controllers[0]);
235235
controllers[0].gridController.registerColumn(element);
236236
}
237-
}
237+
};
238238
}])
239239

240-
.directive('uiScrollTd', ['$log', function () {
240+
.directive('uiScrollTd', function () {
241241
return {
242242
require: ['?^^uiScrollViewport'],
243243
restrict: 'A',
@@ -249,5 +249,5 @@ angular.module('ui.scroll.grid', [])
249249
}
250250
}
251251
}
252-
}
253-
}]);
252+
};
253+
});

src/ui-scroll.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ angular.module('ui.scroll', [])
8181
let ridActual = 0;// current data revision id
8282
let pending = [];
8383

84-
let elementRoutines = new ElementRoutines($injector);
84+
let elementRoutines = new ElementRoutines($injector, $q);
8585
let buffer = new ScrollBuffer(elementRoutines, bufferSize);
8686
let viewport = new Viewport(elementRoutines, buffer, element, viewportController, padding);
8787
let adapter = new Adapter($rootScope, $parse, $attr, viewport, buffer, adjustBuffer, element);

0 commit comments

Comments
 (0)