Skip to content

Commit

Permalink
Fix indentations and TypeScript syntax
Browse files Browse the repository at this point in the history
Corrects indentation levels in files to conform the .editorconfig.
Also replaces vanilla javascript anonymous function calls with the
shorthand Typescript notation ( () => )
  • Loading branch information
TheDonDope committed Mar 6, 2016
1 parent 37889b4 commit b3a88a9
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 129 deletions.
112 changes: 56 additions & 56 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
{
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"es3": false,
"forin": true,
"freeze": true,
"immed": true,
"indent": 2,
"latedef": "nofunc",
"newcap": true,
"noarg": true,
"noempty": true,
"nonbsp": true,
"nonew": true,
"plusplus": false,
"quotmark": "single",
"undef": true,
"unused": false,
"strict": false,
"maxparams": 10,
"maxdepth": 5,
"maxstatements": 40,
"maxcomplexity": 8,
"maxlen": 140,
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"es3": false,
"forin": true,
"freeze": true,
"immed": true,
"indent": 2,
"latedef": "nofunc",
"newcap": true,
"noarg": true,
"noempty": true,
"nonbsp": true,
"nonew": true,
"plusplus": false,
"quotmark": "single",
"undef": true,
"unused": false,
"strict": false,
"maxparams": 10,
"maxdepth": 5,
"maxstatements": 40,
"maxcomplexity": 8,
"maxlen": 140,

"asi": false,
"boss": false,
"debug": false,
"eqnull": true,
"esnext": false,
"evil": false,
"expr": false,
"funcscope": false,
"globalstrict": false,
"iterator": false,
"lastsemic": false,
"laxbreak": false,
"laxcomma": false,
"loopfunc": true,
"maxerr": false,
"moz": false,
"multistr": false,
"notypeof": false,
"proto": false,
"scripturl": false,
"shadow": false,
"sub": true,
"supernew": false,
"validthis": false,
"noyield": false,
"asi": false,
"boss": false,
"debug": false,
"eqnull": true,
"esnext": false,
"evil": false,
"expr": false,
"funcscope": false,
"globalstrict": false,
"iterator": false,
"lastsemic": false,
"laxbreak": false,
"laxcomma": false,
"loopfunc": true,
"maxerr": false,
"moz": false,
"multistr": false,
"notypeof": false,
"proto": false,
"scripturl": false,
"shadow": false,
"sub": true,
"supernew": false,
"validthis": false,
"noyield": false,

"browser": true,
"node": true,
"browser": true,
"node": true,

"globals": {
"angular": false,
"ng": false
}
"globals": {
"angular": false,
"ng": false
}
}
82 changes: 41 additions & 41 deletions protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
exports.config = {
baseUrl: 'http://localhost:5555',

specs: [
'dist/dev/**/*.e2e.js'
],
exclude: [],

framework: 'jasmine2',

allScriptsTimeout: 110000,

jasmineNodeOpts: {
showTiming: true,
showColors: true,
isVerbose: false,
includeStackTrace: false,
defaultTimeoutInterval: 400000
},
directConnect: true,

capabilities: {
'browserName': 'chrome'
},

onPrepare: function() {
var SpecReporter = require('jasmine-spec-reporter');
// add jasmine spec reporter
jasmine.getEnv().addReporter(new SpecReporter({displayStacktrace: true}));

browser.ignoreSynchronization = false;
},


/**
* Angular 2 configuration
*
* useAllAngular2AppRoots: tells Protractor to wait for any angular2 apps on the page instead of just the one matching
* `rootEl`
*
*/
useAllAngular2AppRoots: true
baseUrl: 'http://localhost:5555',

specs: [
'dist/dev/**/*.e2e.js'
],
exclude: [],

framework: 'jasmine2',

allScriptsTimeout: 110000,

jasmineNodeOpts: {
showTiming: true,
showColors: true,
isVerbose: false,
includeStackTrace: false,
defaultTimeoutInterval: 400000
},
directConnect: true,

capabilities: {
'browserName': 'chrome'
},

onPrepare: function() {
var SpecReporter = require('jasmine-spec-reporter');
// add jasmine spec reporter
jasmine.getEnv().addReporter(new SpecReporter({displayStacktrace: true}));

browser.ignoreSynchronization = false;
},


/**
* Angular 2 configuration
*
* useAllAngular2AppRoots: tells Protractor to wait for any angular2 apps on the page instead of just the one matching
* `rootEl`
*
*/
useAllAngular2AppRoots: true
};
6 changes: 3 additions & 3 deletions src/about/components/about.component.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
describe('About', function() {
describe('About', () => {

beforeEach(function() {
beforeEach( () => {
browser.get('about');
});

it('should have correct feature heading', function() {
it('should have correct feature heading', () => {
expect(element(by.css('sd-app sd-about h2')).getText())
.toEqual('Features');
});
Expand Down
12 changes: 6 additions & 6 deletions src/app/components/app.component.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
describe('App', function() {
describe('App', () => {

beforeEach(function() {
beforeEach( () => {
browser.get('');
});

it('should have a title', function() {
it('should have a title', () => {
expect(browser.getTitle()).toEqual('Angular 2 Seed');
});

it('should have <nav>', function() {
it('should have <nav>', () => {
expect(element(by.css('sd-app sd-navbar nav')).isPresent()).toEqual(true);
});

it('should have correct nav text for Home', function() {
it('should have correct nav text for Home', () => {
expect(element(by.css('sd-app sd-navbar nav a:first-child')).getText()).toEqual('HOME');
});

it('should have correct nav text for About', function() {
it('should have correct nav text for About', () => {
expect(element(by.css('sd-app sd-navbar nav a:last-child')).getText()).toEqual('ABOUT');
});

Expand Down
10 changes: 5 additions & 5 deletions src/home/components/home.component.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
describe('Home', function() {
describe('Home', () => {

beforeEach(function() {
beforeEach( () => {
browser.get('');
});

it('should have an input', function() {
it('should have an input', () => {
expect(element(by.css('sd-app sd-home form input')).isPresent()).toEqual(true);
});

it('should have a list of computer scientists', function() {
it('should have a list of computer scientists', () => {
expect(element(by.css('sd-app sd-home ul')).getText())
.toEqual('Edsger Dijkstra\nDonald Knuth\nAlan Turing\nGrace Hopper');
});

it('should add a name to the list using the form', function() {
it('should add a name to the list using the form', () => {
element(by.css('sd-app sd-home form input')).sendKeys('Tim Berners-Lee');
element(by.css('sd-app sd-home form button')).click();
expect(element(by.css('sd-app sd-home ul')).getText())
Expand Down
2 changes: 1 addition & 1 deletion tools/utils/seed/code_change_tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let changed = files => {
// if (ENABLE_HOT_LOADING) {
// ng2HotLoader.onChange(files);
// } else {
browserSync.reload(files);
browserSync.reload(files);
//}
};

Expand Down
34 changes: 17 additions & 17 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": false,
"noImplicitAny": false,
"removeComments": true,
"noLib": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"sourceMap": true
},
"exclude": [
"node_modules",
"typings/browser.d.ts",
"typings/browser/**"
],
"compileOnSave": false
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": false,
"noImplicitAny": false,
"removeComments": true,
"noLib": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"sourceMap": true
},
"exclude": [
"node_modules",
"typings/browser.d.ts",
"typings/browser/**"
],
"compileOnSave": false
}

0 comments on commit b3a88a9

Please sign in to comment.