Skip to content

Updated the code to use spaces instead of tabs with a space indentation of 4 spaces #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hppycoder merged 2 commits into from
Jan 30, 2015
Merged

Updated the code to use spaces instead of tabs with a space indentation of 4 spaces #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6157b2c
Updated the whitespace to have spaces and an indentation of 4 spaces …
hppycoder Jan 27, 2015
8f7710c
Updated the code to use 2 spaces instead of 4. No code was changed be…
hppycoder Jan 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .idea/AngularLocalStorage.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"node": true,
"browser": true,
"esnext": true,
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 2,
"latedef": true,
"newcap": true,
"noarg": true,
"quotmark": "single",
"regexp": true,
"undef": true,
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true,
"jasmine": true,
"globals": {
"angular": false,
"inject": false
}
}
104 changes: 52 additions & 52 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
// Karma configuration

module.exports = function ( config ) {
config.set({
// base path, that will be used to resolve files and exclude
basePath : '',

frameworks : ['jasmine'],

// list of files / patterns to load in the browser
files : [
'components/angular/angular.js', 'components/angular-cookies/angular-cookies.js', 'components/angular-mocks/angular-mocks.js', 'src/*.js', 'test/*.spec.js'
],

// list of files to exclude
exclude : [],

// test results reporter to use
// possible values: 'dots', 'progress', 'junit'
reporters : ['progress'],

// web server port
port : 9876,

// cli runner port
runnerPort : 9100,

// enable / disable colors in the output (reporters and logs)
colors : true,

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel : 'karma.LOG_INFO',

// enable / disable watching file and executing tests whenever any file changes
autoWatch : true,

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers : ['Chrome', 'PhantomJS'],

// If browser does not capture in given timeout [ms], kill it
captureTimeout : 60000,

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun : false
});
module.exports = function (config) {
config.set({
// base path, that will be used to resolve files and exclude
basePath: '',

frameworks: ['jasmine'],

// list of files / patterns to load in the browser
files: [
'components/angular/angular.js', 'components/angular-cookies/angular-cookies.js', 'components/angular-mocks/angular-mocks.js', 'src/*.js', 'test/*.spec.js'
],

// list of files to exclude
exclude: [],

// test results reporter to use
// possible values: 'dots', 'progress', 'junit'
reporters: ['progress'],

// web server port
port: 9876,

// cli runner port
runnerPort: 9100,

// enable / disable colors in the output (reporters and logs)
colors: true,

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel: 'karma.LOG_INFO',

// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers: ['Chrome', 'PhantomJS'],

// If browser does not capture in given timeout [ms], kill it
captureTimeout: 60000,

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
});
};
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name":"angularLocalStorage",
"repository" : {
"type" : "git",
"url" : "https://github.com/agrublev/angularLocalStorage.git"
},
"devDependencies": {
"karma": "~0.11.14",
"karma-jasmine": "~0.1",
"karma-phantomjs-launcher": "~0.1.4"
},
"engines": {
"npm": ">=1.3.7",
"node": ">=0.10"
},
"scripts": {
"test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS"
}
"name": "angularLocalStorage",
"repository": {
"type": "git",
"url": "https://github.com/agrublev/angularLocalStorage.git"
},
"devDependencies": {
"karma": "~0.11.14",
"karma-jasmine": "~0.1",
"karma-phantomjs-launcher": "~0.1.4"
},
"engines": {
"npm": ">=1.3.7",
"node": ">=0.10"
},
"scripts": {
"test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS"
}
}
Loading