chore(): remove triple-equals lint rule & make some lint fixes to karma

config.
This commit is contained in:
Jeremy Elbourn
2016-01-20 17:34:45 -08:00
parent bc6d2bca39
commit 9dcb2bc50f
2 changed files with 6 additions and 11 deletions
+6 -7
View File
@@ -20,7 +20,8 @@ export function config(config) {
],
files: [
{pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true},
{pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true},
{pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true,
watched: true},
{pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: true},
{pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true},
{pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: true},
@@ -43,8 +44,8 @@ export function config(config) {
],
proxies: {
// required for component assests fetched by Angular's compiler
"/demo-app/": "/base/dist/demo-app/",
"/components/": "/base/dist/components/",
'/demo-app/': '/base/dist/demo-app/',
'/components/': '/base/dist/components/',
},
customLaunchers: customLaunchers,
@@ -100,12 +101,10 @@ export function config(config) {
// This speeds up the capturing a bit, as browsers don't even try to use websocket.
console.log('>>>> setting socket.io transport to polling <<<<');
config.transports = ['polling'];
}
else if (platform == 'browserstack') {
} else if (platform == 'browserstack') {
config.browserStack.build = buildId;
config.browserStack.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
}
else {
} else {
throw new Error(`Platform "${platform}" unknown, but Travis specified. Exiting.`);
}
-4
View File
@@ -32,10 +32,6 @@
"avoid-escape"
],
"semicolon": true,
"triple-equals": [
true,
"allow-null-check"
],
"typedef-whitespace": [
true,
{