summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-02-12 17:51:35 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-02-12 17:51:35 +0100
commitb94f9b5d9f520aacb58baa4e5f449454162078b7 (patch)
treec01c32c7a25e438f48c96643d69eac0704d7976e /js
parent185aa04ae3c5c1b0b7453cf4b55fe313574fe3f6 (diff)
fix jshint
Diffstat (limited to 'js')
-rw-r--r--js/.jshintrc4
-rw-r--r--js/gulpfile.js9
2 files changed, 6 insertions, 7 deletions
diff --git a/js/.jshintrc b/js/.jshintrc
index a5c3f3bec..19894c5ea 100644
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -48,8 +48,6 @@
"t": true,
"url": true,
"navigator": true,
- "oc_requesttoken": true,
- "__dirname": true,
- "require": true
+ "oc_requesttoken": true
}
}
diff --git a/js/gulpfile.js b/js/gulpfile.js
index a3bd30eec..6e8907632 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -8,6 +8,7 @@
* @copyright Bernhard Posselt 2012, 2014
*/
+/*jslint node: true */
'use strict';
const gulp = require('gulp'),
@@ -22,7 +23,7 @@ const gulp = require('gulp'),
/**
* Configuration
*/
-const buildName = 'app.min.js';
+const buildTarget = 'app.min.js';
const phpunitConfig = __dirname + '/../phpunit.xml';
const karmaConfig = __dirname + '/karma.conf.js';
const destinationFolder = __dirname + '/build/';
@@ -45,7 +46,7 @@ gulp.task('default', ['lint'], () => {
return gulp.src(sources)
.pipe(ngAnnotate())
.pipe(sourcemaps.init())
- .pipe(concat(buildName))
+ .pipe(concat(buildTarget))
.pipe(uglify())
.pipe(sourcemaps.write())
.pipe(gulp.dest(destinationFolder));
@@ -67,14 +68,14 @@ gulp.task('karma', (done) => {
configFile: karmaConfig,
singleRun: true
}, done).start();
-})
+});
gulp.task('watch-karma', (done) => {
new KarmaServer({
configFile: karmaConfig,
autoWatch: true
}, done).start();
-})
+});
gulp.task('phpunit', () => {
gulp.src(phpSources)