diff --git a/extension/eventPage.js b/extension/eventPage.js index af575e1..dd196af 100644 --- a/extension/eventPage.js +++ b/extension/eventPage.js @@ -1,25 +1,27 @@ +/* global chrome */ +'use strict' -function fetch(url, cb, type) { - if (url.indexOf('//') === 0) { - url = 'http:'+url - } - let x = new XMLHttpRequest() - x.open('get', url, true) - if (type) { - x.responseType = type - } - x.onload = function () { - console.log(x.getResponseHeader('content-type')) - cb(URL.createObjectURL(x.response), x.getResponseHeader('content-type')) - } - x.onerror = function () { - console.error('error') - cb(null) - } - x.send() +function fetch (url, cb, type) { + if (url.indexOf('//') === 0) { + url = 'http:' + url + } + let x = new XMLHttpRequest() + x.open('get', url, true) + if (type) { + x.responseType = type + } + x.onload = function () { + console.log(x.getResponseHeader('content-type')) + cb(URL.createObjectURL(x.response), x.getResponseHeader('content-type')) + } + x.onerror = function () { + console.error('error') + cb(null) + } + x.send() } -chrome.extension.onMessage.addListener(function(request, sender, sendResponse) { - fetch(request, sendResponse, 'blob') - return true +chrome.extension.onMessage.addListener(function (request, sender, sendResponse) { + fetch(request, sendResponse, 'blob') + return true }) diff --git a/gulpfile.babel.js b/gulpfile.babel.js index b7b6d0e..13a9d54 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -7,6 +7,7 @@ import del from 'del' import Sequence from 'run-sequence' import watch from 'gulp-watch' import lazypipe from 'lazypipe' +import filter from 'gulp-filter' // script import standard from 'gulp-standard' @@ -61,10 +62,9 @@ function webpackTask (callback) { } let lintPipe = lazypipe() + .pipe(filter, ['**/*', '!extension/fimfic2epub.js', '!extension/tidy.js']) .pipe(standard) - .pipe(standard.reporter, 'default', { - breakOnError: false - }) + .pipe(standard.reporter, 'default', { breakOnError: false }) // Cleanup task gulp.task('clean', () => del('extension/fimfic2epub.js')) @@ -79,7 +79,7 @@ gulp.task('watch:script', () => { }) gulp.task('lint', () => { - return gulp.src(['gulpfile.babel.js', 'webpack.config.babel.js', 'src/**/*.js']).pipe(lintPipe()) + return gulp.src(['gulpfile.babel.js', 'webpack.config.babel.js', 'src/**/*.js', 'extension/**/*.js']).pipe(lintPipe()) }) gulp.task('watch:lint', () => { return watch(['src/**/*.js'], watchOpts, function (file) { diff --git a/package.json b/package.json index 88b4f1a..4da215a 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "babel-preset-node6": "^11.0.0", "del": "^2.2.0", "gulp": "^3.9.1", + "gulp-filter": "^4.0.0", "gulp-standard": "^7.0.1", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.8",