Skip to content

Commit ee20345

Browse files
committedMay 17, 2016
refactor: make lint happy
1 parent 2d51260 commit ee20345

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed
 

‎console.log

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
PhantomJS 2.1.1 (Mac OS X 0.0.0)
2+
PhantomJS 2.1.1 (Mac OS X 0.0.0)
3+
PhantomJS 2.1.1 (Mac OS X 0.0.0)
4+
PhantomJS 2.1.1 (Mac OS X 0.0.0)
5+
PhantomJS 2.1.1 (Mac OS X 0.0.0)

‎lib/helper.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ var parser = function (pattern, out) {
3838
return parser(pattern.substring(matches[0].length), out)
3939
}
4040

41-
var gs_parser = function (pattern, out) {
41+
var gsParser = function (pattern, out) {
4242
if (pattern === '**') {
4343
out.glob_star++
4444
return out
4545
}
4646
return parser(pattern, out)
4747
}
4848

49-
var compare_weight_object = function (w1, w2) {
49+
var compareWeightObject = function (w1, w2) {
5050
return exports.mmComparePatternWeights(
5151
[w1.glob_star, w1.star, w1.ext_glob, w1.range, w1.optional],
5252
[w2.glob_star, w2.star, w2.ext_glob, w2.range, w2.optional]
@@ -58,10 +58,10 @@ exports.mmPatternWeight = function (pattern) {
5858
if (!m.globParts) return [0, 0, 0, 0, 0, 0]
5959
var result = m.globParts.reduce(function (prev, p) {
6060
var r = p.reduce(function (prev, p) {
61-
return gs_parser(p, prev)
61+
return gsParser(p, prev)
6262
}, {glob_star: 0, ext_glob: 0, word: 0, star: 0, optional: 0, range: 0})
6363
if (prev === undefined) return r
64-
return compare_weight_object(r, prev) > 0 ? r : prev
64+
return compareWeightObject(r, prev) > 0 ? r : prev
6565
}, undefined)
6666
result.glob_sets = m.set.length
6767
return [result.glob_sets, result.glob_star, result.star, result.ext_glob, result.range, result.optional]

‎lib/middleware/strip_host.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
var createStripHostMiddleware = function () {
77
return function (request, response, next) {
88
function stripHostFromUrl (url) {
9-
return url.replace(/^http[s]?:\/\/([a-z\-\.\:\d]+)\//, '/')
9+
return url.replace(/^http[s]?:\/\/([a-z\-\.:\d]+)\//, '/')
1010
}
1111

1212
request.normalizedUrl = stripHostFromUrl(request.url) || request.url

‎lib/reporter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ var createReporters = function (names, config, emitter, injector) {
125125
emitter.emit('load_error', 'reporter', name)
126126
return
127127
}
128-
var color_name = name + '_color'
129-
if (names.indexOf(color_name) !== -1) {
128+
var colorName = name + '_color'
129+
if (names.indexOf(colorName) !== -1) {
130130
return
131131
}
132132
try {
133-
log.debug('Trying to load color-version of reporter: %s (%s)', name, color_name)
133+
log.debug('Trying to load color-version of reporter: %s (%s)', name, colorName)
134134
reporters.push(injector.createChild([locals], ['reporter:' + name + '_color']).get('reporter:' + name))
135135
} catch (e) {
136136
log.debug('Couldn\'t load color-version.')

‎lib/server.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -208,23 +208,23 @@ Server.prototype._start = function (config, launcher, preprocess, fileList, webS
208208
})
209209

210210
if (config.browserConsoleLogOptions && config.browserConsoleLogOptions.path) {
211-
var config_level = config.browserConsoleLogOptions.level || 'debug'
212-
var config_format = config.browserConsoleLogOptions.format || '%b %T: %m'
213-
var config_path = config.browserConsoleLogOptions.path
214-
self.log.info('Writing browser console to file: %s', config_path)
215-
var browser_log_file = fs.openSync(config_path, 'w+')
211+
var configLevel = config.browserConsoleLogOptions.level || 'debug'
212+
var configFormat = config.browserConsoleLogOptions.format || '%b %T: %m'
213+
var configPath = config.browserConsoleLogOptions.path
214+
self.log.info('Writing browser console to file: %s', configPath)
215+
var browserLogFile = fs.openSync(configPath, 'w+')
216216
var levels = ['log', 'error', 'warn', 'info', 'debug']
217217
self.on('browser_log', function (browser, message, level) {
218-
if (levels.indexOf(level.toLowerCase()) > levels.indexOf(config_level)) return
218+
if (levels.indexOf(level.toLowerCase()) > levels.indexOf(configLevel)) return
219219
if (!helper.isString(message)) {
220220
message = util.inspect(message, {showHidden: false, colors: false})
221221
}
222-
var log_map = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
223-
var log_string = config_format.replace(/%[mtTb]/g, function (m) {
224-
return log_map[m]
222+
var logMap = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
223+
var logString = configFormat.replace(/%[mtTb]/g, function (m) {
224+
return logMap[m]
225225
})
226-
self.log.debug('Writing browser console line: %s', log_string)
227-
fs.write(browser_log_file, log_string + '\n')
226+
self.log.debug('Writing browser console line: %s', logString)
227+
fs.write(browserLogFile, logString + '\n')
228228
})
229229
}
230230

‎lib/watcher.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var DIR_SEP = require('path').sep
1111
var baseDirFromPattern = function (pattern) {
1212
return pattern
1313
.replace(/[\/\\][^\/\\]*\*.*$/, '') // remove parts with *
14-
.replace(/[\/\\][^\/\\]*[\!\+]\(.*$/, '') // remove parts with !(...) and +(...)
14+
.replace(/[\/\\][^\/\\]*[!\+]\(.*$/, '') // remove parts with !(...) and +(...)
1515
.replace(/[\/\\][^\/\\]*\)\?.*$/, '') || DIR_SEP // remove parts with (...)?
1616
}
1717

0 commit comments

Comments
 (0)
Please sign in to comment.