Skip to content
This repository has been archived by the owner on Apr 25, 2019. It is now read-only.

Commit

Permalink
Updates to codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
roeldev committed Nov 18, 2015
1 parent fbe13c7 commit a5add46
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
4 changes: 1 addition & 3 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@
["do", "case", "try", "void", "while", "function"],
//"requirePaddingNewLinesInObjects": true,
"requireParenthesesAroundIIFE": true,
"requireQuotedKeysInObjects": true,
"requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterKeywords":
["do", "for", "if", "else", "switch", "case", "try", "catch", "void", "while", "with", "return", "typeof"],
"requireSpaceAfterLineComment":
{ "allExcept": ["#", "=",
"------------------------------------------------------------------------------", "//////////////////////////////////////////////////////////////////////////////"] },
{ "allExcept": ["#", "="] },
"requireSpaceBeforeBinaryOperators": true,
"requireSpaceBeforeObjectValues": true,
"requireSpaceBetweenArguments": true,
Expand Down
5 changes: 2 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ var GulpJsCs = require('gulp-jscs');
var GulpJsCsStylish = require('gulp-jscs-stylish');
var GulpMocha = require('gulp-mocha');
var RunSequence = require('run-sequence');
var Utils = require('./lib/utils.js');

//------------------------------------------------------------------------------
// -----------------------------------------------------------------------------

var JS_SRC = ['gulpfile.js', 'lib/**/*.js', 'test/*.js'];

function noop()
{
}

////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------

Gulp.task('lint', function()
{
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var _ = require('underscore');

////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------

var Utils = module.exports =
{
Expand Down
12 changes: 6 additions & 6 deletions test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var Confirge = require('../lib/index.js');
var Path = require('path');
var Utils = require('../lib/utils.js');

//------------------------------------------------------------------------------
// -----------------------------------------------------------------------------

var OBJ_PLAIN = { 'title': 'test obj', 'success': true };
var EXPECTED_YAML = { 'title': 'test yaml', 'success': true };
Expand All @@ -22,7 +22,7 @@ var EXPECTED_VARS = {
}
};

////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------

function getFixtureFile($file, $relative)
{
Expand All @@ -39,7 +39,7 @@ function noop()
{
}

//------------------------------------------------------------------------------
// -----------------------------------------------------------------------------

describe('Confirge()', function confirgeTests()
{
Expand Down Expand Up @@ -216,7 +216,7 @@ describe('Confirge.replace()', function confirgeReplaceTests()
'key2-2': [
'replace me too! %var1%',
'skip me! %var2%',
[ 'down the rabbit hole', 'last %var1% replacement' ]
['down the rabbit hole', 'last %var1% replacement']
]
}
};
Expand All @@ -231,7 +231,7 @@ describe('Confirge.replace()', function confirgeReplaceTests()
'key2-2': [
'replace me too! value1',
'skip me! %var2%',
[ 'down the rabbit hole', 'last value1 replacement' ]
['down the rabbit hole', 'last value1 replacement']
]
}
});
Expand Down Expand Up @@ -280,7 +280,7 @@ describe('Confirge.extend()', function confirgeExtendTests()
});
});

//------------------------------------------------------------------------------
// -----------------------------------------------------------------------------

describe('Utils.findReplacements()', function utilsFindReplacementsTests()
{
Expand Down

0 comments on commit a5add46

Please sign in to comment.