Skip to content

Commit e4e8316

Browse files
hppycoderhppycoder
committed
Merge pull request agrublev#65 from hppycoder/master-whitespaceJshint
Updated the code to use spaces instead of tabs with a space indentation of 2 spaces
2 parents 90ee87f + 8f7710c commit e4e8316

6 files changed

Lines changed: 492 additions & 464 deletions

File tree

‎.idea/AngularLocalStorage.iml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.jshintrc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"node": true,
3+
"browser": true,
4+
"esnext": true,
5+
"bitwise": true,
6+
"camelcase": true,
7+
"curly": true,
8+
"eqeqeq": true,
9+
"immed": true,
10+
"indent": 2,
11+
"latedef": true,
12+
"newcap": true,
13+
"noarg": true,
14+
"quotmark": "single",
15+
"regexp": true,
16+
"undef": true,
17+
"unused": true,
18+
"strict": true,
19+
"trailing": true,
20+
"smarttabs": true,
21+
"jasmine": true,
22+
"globals": {
23+
"angular": false,
24+
"inject": false
25+
}
26+
}

‎karma.conf.js‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
// Karma configuration
22

3-
module.exports = function ( config ) {
4-
config.set({
5-
// base path, that will be used to resolve files and exclude
6-
basePath : '',
7-
8-
frameworks : ['jasmine'],
9-
10-
// list of files / patterns to load in the browser
11-
files : [
12-
'components/angular/angular.js', 'components/angular-cookies/angular-cookies.js', 'components/angular-mocks/angular-mocks.js', 'src/*.js', 'test/*.spec.js'
13-
],
14-
15-
// list of files to exclude
16-
exclude : [],
17-
18-
// test results reporter to use
19-
// possible values: 'dots', 'progress', 'junit'
20-
reporters : ['progress'],
21-
22-
// web server port
23-
port : 9876,
24-
25-
// cli runner port
26-
runnerPort : 9100,
27-
28-
// enable / disable colors in the output (reporters and logs)
29-
colors : true,
30-
31-
// level of logging
32-
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
33-
logLevel : 'karma.LOG_INFO',
34-
35-
// enable / disable watching file and executing tests whenever any file changes
36-
autoWatch : true,
37-
38-
// Start these browsers, currently available:
39-
// - Chrome
40-
// - ChromeCanary
41-
// - Firefox
42-
// - Opera
43-
// - Safari (only Mac)
44-
// - PhantomJS
45-
// - IE (only Windows)
46-
browsers : ['Chrome', 'PhantomJS'],
47-
48-
// If browser does not capture in given timeout [ms], kill it
49-
captureTimeout : 60000,
50-
51-
// Continuous Integration mode
52-
// if true, it capture browsers, run tests and exit
53-
singleRun : false
54-
});
3+
module.exports = function (config) {
4+
config.set({
5+
// base path, that will be used to resolve files and exclude
6+
basePath: '',
7+
8+
frameworks: ['jasmine'],
9+
10+
// list of files / patterns to load in the browser
11+
files: [
12+
'components/angular/angular.js', 'components/angular-cookies/angular-cookies.js', 'components/angular-mocks/angular-mocks.js', 'src/*.js', 'test/*.spec.js'
13+
],
14+
15+
// list of files to exclude
16+
exclude: [],
17+
18+
// test results reporter to use
19+
// possible values: 'dots', 'progress', 'junit'
20+
reporters: ['progress'],
21+
22+
// web server port
23+
port: 9876,
24+
25+
// cli runner port
26+
runnerPort: 9100,
27+
28+
// enable / disable colors in the output (reporters and logs)
29+
colors: true,
30+
31+
// level of logging
32+
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
33+
logLevel: 'karma.LOG_INFO',
34+
35+
// enable / disable watching file and executing tests whenever any file changes
36+
autoWatch: true,
37+
38+
// Start these browsers, currently available:
39+
// - Chrome
40+
// - ChromeCanary
41+
// - Firefox
42+
// - Opera
43+
// - Safari (only Mac)
44+
// - PhantomJS
45+
// - IE (only Windows)
46+
browsers: ['Chrome', 'PhantomJS'],
47+
48+
// If browser does not capture in given timeout [ms], kill it
49+
captureTimeout: 60000,
50+
51+
// Continuous Integration mode
52+
// if true, it capture browsers, run tests and exit
53+
singleRun: false
54+
});
5555
};

‎package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name":"angularLocalStorage",
3-
"repository" : {
4-
"type" : "git",
5-
"url" : "https://github.com/agrublev/angularLocalStorage.git"
6-
},
7-
"devDependencies": {
8-
"karma": "~0.11.14",
9-
"karma-jasmine": "~0.1",
10-
"karma-phantomjs-launcher": "~0.1.4"
11-
},
12-
"engines": {
13-
"npm": ">=1.3.7",
14-
"node": ">=0.10"
15-
},
16-
"scripts": {
17-
"test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS"
18-
}
2+
"name": "angularLocalStorage",
3+
"repository": {
4+
"type": "git",
5+
"url": "https://github.com/agrublev/angularLocalStorage.git"
6+
},
7+
"devDependencies": {
8+
"karma": "~0.11.14",
9+
"karma-jasmine": "~0.1",
10+
"karma-phantomjs-launcher": "~0.1.4"
11+
},
12+
"engines": {
13+
"npm": ">=1.3.7",
14+
"node": ">=0.10"
15+
},
16+
"scripts": {
17+
"test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS"
18+
}
1919
}

0 commit comments

Comments
 (0)