Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 982f3f7

Browse files
authored
Merge pull request #91 from material-components/sgomes-update-google-eslint
style(js): Update styling to match latest Google styleguide.
2 parents 6a954f8 + a08b0fd commit 982f3f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+973
-973
lines changed

karma.conf.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ const SL_LAUNCHERS = {
2626
base: 'SauceLabs',
2727
browserName: 'chrome',
2828
version: 'latest',
29-
platform: 'OS X 10.11'
29+
platform: 'OS X 10.11',
3030
},
3131
'sl-chrome-beta': {
3232
base: 'SauceLabs',
3333
browserName: 'chrome',
34-
version: 'beta'
34+
version: 'beta',
3535
},
3636
'sl-chrome-previous': {
3737
base: 'SauceLabs',
3838
browserName: 'chrome',
3939
version: 'latest-1',
40-
platform: 'OS X 10.11'
40+
platform: 'OS X 10.11',
4141
},
4242
// NOTE(traviskaufman): Disabling firefox for now as it has been consistently flaky recently. See
4343
// https://github.com/material-components/material-components-web/issues/5
@@ -57,13 +57,13 @@ const SL_LAUNCHERS = {
5757
base: 'SauceLabs',
5858
browserName: 'internet explorer',
5959
version: '11',
60-
platform: 'Windows 8.1'
60+
platform: 'Windows 8.1',
6161
},
6262
'sl-android-stable': {
6363
base: 'SauceLabs',
6464
browserName: 'android',
65-
version: '5.0'
66-
}
65+
version: '5.0',
66+
},
6767
// NOTE(traviskaufman): Temporarily disabling these browsers as they are consistently flaky using
6868
// Sauce Labs and almost always yield false negatives.
6969
// 'sl-edge': {
@@ -102,10 +102,10 @@ module.exports = function(config) {
102102
basePath: '',
103103
frameworks: ['tap'],
104104
files: [
105-
'test/unit/index.js'
105+
'test/unit/index.js',
106106
],
107107
preprocessors: {
108-
'test/unit/index.js': ['webpack', 'sourcemap']
108+
'test/unit/index.js': ['webpack', 'sourcemap'],
109109
},
110110
reporters: ['dots', 'coverage'],
111111
port: 9876,
@@ -122,29 +122,29 @@ module.exports = function(config) {
122122
dir: 'coverage',
123123
reporters: [
124124
{type: 'json', subdir: '.', file: 'coverage.json'},
125-
{type: 'html'}
126-
]
125+
{type: 'html'},
126+
],
127127
},
128128

129129
webpack: Object.assign({}, webpackConfig, {
130130
devtool: 'inline-source-map',
131131
node: {
132-
fs: 'empty'
132+
fs: 'empty',
133133
},
134134
module: Object.assign({}, webpackConfig.module, {
135135
// Cover source files when not debugging tests. Otherwise, omit coverage instrumenting to get
136136
// uncluttered source maps.
137137
loaders: webpackConfig.module.loaders.concat([config.singleRun ? {
138138
test: /\.js$/,
139139
include: path.resolve('./packages'),
140-
loader: 'isparta'
141-
} : undefined]).filter(Boolean)
142-
})
140+
loader: 'isparta',
141+
} : undefined]).filter(Boolean),
142+
}),
143143
}),
144144

145145
webpackMiddleware: {
146-
noInfo: true
147-
}
146+
noInfo: true,
147+
},
148148
});
149149

150150
// See https://github.com/karma-runner/karma-sauce-launcher/issues/73
@@ -153,11 +153,11 @@ module.exports = function(config) {
153153
sauceLabs: {
154154
testName: 'Material Components Web Unit Tests - CI',
155155
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
156-
startConnect: false
156+
startConnect: false,
157157
},
158158
// Attempt to de-flake Sauce Labs tests on TravisCI.
159159
transports: ['polling'],
160-
browserDisconnectTolerance: 3
160+
browserDisconnectTolerance: 3,
161161
});
162162
}
163163
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"del-cli": "^0.2.0",
3838
"dom-events": "^0.1.1",
3939
"eslint": "^3.6.1",
40-
"eslint-config-google": "^0.6.0",
40+
"eslint-config-google": "^0.7.1",
4141
"eslint-plugin-tape": "^1.1.0",
4242
"extract-text-webpack-plugin": "^1.0.1",
4343
"ghooks": "^1.3.2",

packages/material-components-web/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ export {
4949
textfield,
5050
menu,
5151
select,
52-
autoInit
52+
autoInit,
5353
};

packages/mdc-auto-init/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default function mdcAutoInit(root = document, warn = CONSOLE_WARN) {
4646
value: component,
4747
writable: false,
4848
enumerable: false,
49-
configurable: true
49+
configurable: true,
5050
});
5151
}
5252
}

packages/mdc-checkbox/constants.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const cssClasses = {
2626
ANIM_CHECKED_UNCHECKED: `${ANIM}-checked-unchecked`,
2727
ANIM_CHECKED_INDETERMINATE: `${ANIM}-checked-indeterminate`,
2828
ANIM_INDETERMINATE_CHECKED: `${ANIM}-indeterminate-checked`,
29-
ANIM_INDETERMINATE_UNCHECKED: `${ANIM}-indeterminate-unchecked`
29+
ANIM_INDETERMINATE_UNCHECKED: `${ANIM}-indeterminate-unchecked`,
3030
};
3131

3232
export const strings = {
@@ -42,9 +42,9 @@ export const strings = {
4242
TRANSITION_STATE_INIT: 'init',
4343
TRANSITION_STATE_CHECKED: 'checked',
4444
TRANSITION_STATE_UNCHECKED: 'unchecked',
45-
TRANSITION_STATE_INDETERMINATE: 'indeterminate'
45+
TRANSITION_STATE_INDETERMINATE: 'indeterminate',
4646
};
4747

4848
export const numbers = {
49-
ANIM_END_LATCH_MS: 100
49+
ANIM_END_LATCH_MS: 100,
5050
};

packages/mdc-checkbox/foundation.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
4242
deregisterChangeHandler: (/* handler: EventListener */) => {},
4343
getNativeControl: () => /* HTMLInputElement */ {},
4444
forceLayout: () => {},
45-
isAttachedToDOM: () => /* boolean */ {}
45+
isAttachedToDOM: () => /* boolean */ {},
4646
};
4747
}
4848

@@ -100,19 +100,19 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
100100
const nativeCb = this.getNativeControl_();
101101
const cbProto = Object.getPrototypeOf(nativeCb);
102102

103-
CB_PROTO_PROPS.forEach(controlState => {
103+
CB_PROTO_PROPS.forEach((controlState) => {
104104
const desc = Object.getOwnPropertyDescriptor(cbProto, controlState);
105105
// We have to check for this descriptor, since some browsers (Safari) don't support its return.
106106
// See: https://bugs.webkit.org/show_bug.cgi?id=49739
107107
if (validDescriptor(desc)) {
108108
Object.defineProperty(nativeCb, controlState, {
109109
get: desc.get,
110-
set: state => {
110+
set: (state) => {
111111
desc.set.call(nativeCb, state);
112112
this.transitionCheckState_();
113113
},
114114
configurable: desc.configurable,
115-
enumerable: desc.enumerable
115+
enumerable: desc.enumerable,
116116
});
117117
}
118118
});
@@ -122,7 +122,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
122122
const nativeCb = this.getNativeControl_();
123123
const cbProto = Object.getPrototypeOf(nativeCb);
124124

125-
CB_PROTO_PROPS.forEach(controlState => {
125+
CB_PROTO_PROPS.forEach((controlState) => {
126126
const desc = Object.getOwnPropertyDescriptor(cbProto, controlState);
127127
if (validDescriptor(desc)) {
128128
Object.defineProperty(nativeCb, controlState, desc);
@@ -164,7 +164,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
164164
const {
165165
TRANSITION_STATE_INDETERMINATE,
166166
TRANSITION_STATE_CHECKED,
167-
TRANSITION_STATE_UNCHECKED
167+
TRANSITION_STATE_UNCHECKED,
168168
} = strings;
169169

170170
if (nativeCb.indeterminate) {
@@ -177,7 +177,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
177177
const {
178178
TRANSITION_STATE_INIT,
179179
TRANSITION_STATE_CHECKED,
180-
TRANSITION_STATE_UNCHECKED
180+
TRANSITION_STATE_UNCHECKED,
181181
} = strings;
182182

183183
const {
@@ -186,7 +186,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
186186
ANIM_CHECKED_UNCHECKED,
187187
ANIM_CHECKED_INDETERMINATE,
188188
ANIM_INDETERMINATE_CHECKED,
189-
ANIM_INDETERMINATE_UNCHECKED
189+
ANIM_INDETERMINATE_UNCHECKED,
190190
} = MDCCheckboxFoundation.cssClasses;
191191

192192
switch (oldState) {
@@ -210,7 +210,7 @@ export default class MDCCheckboxFoundation extends MDCFoundation {
210210
return this.adapter_.getNativeControl() || {
211211
checked: false,
212212
indeterminate: false,
213-
disabled: false
213+
disabled: false,
214214
};
215215
}
216216
}

packages/mdc-checkbox/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ export class MDCCheckbox extends MDCComponent {
3232
getDefaultFoundation() {
3333
const {ANIM_END_EVENT_NAME} = MDCCheckboxFoundation.strings;
3434
return new MDCCheckboxFoundation({
35-
addClass: className => this.root_.classList.add(className),
36-
removeClass: className => this.root_.classList.remove(className),
37-
registerAnimationEndHandler: handler => this.root_.addEventListener(ANIM_END_EVENT_NAME, handler),
38-
deregisterAnimationEndHandler: handler => this.root_.removeEventListener(ANIM_END_EVENT_NAME, handler),
39-
registerChangeHandler: handler => this.nativeCb_.addEventListener('change', handler),
40-
deregisterChangeHandler: handler => this.nativeCb_.removeEventListener('change', handler),
35+
addClass: (className) => this.root_.classList.add(className),
36+
removeClass: (className) => this.root_.classList.remove(className),
37+
registerAnimationEndHandler: (handler) => this.root_.addEventListener(ANIM_END_EVENT_NAME, handler),
38+
deregisterAnimationEndHandler: (handler) => this.root_.removeEventListener(ANIM_END_EVENT_NAME, handler),
39+
registerChangeHandler: (handler) => this.nativeCb_.addEventListener('change', handler),
40+
deregisterChangeHandler: (handler) => this.nativeCb_.removeEventListener('change', handler),
4141
getNativeControl: () => this.nativeCb_,
4242
forceLayout: () => this.root_.offsetWidth,
43-
isAttachedToDOM: () => Boolean(this.root_.parentNode)
43+
isAttachedToDOM: () => Boolean(this.root_.parentNode),
4444
});
4545
}
4646

packages/mdc-drawer/temporary/constants.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ export const cssClasses = {
2020
ROOT,
2121
OPEN: `${ROOT}--open`,
2222
ANIMATING: `${ROOT}--animating`,
23-
RIGHT: `${ROOT}--right`
23+
RIGHT: `${ROOT}--right`,
2424
};
2525

2626
export const strings = {
2727
DRAWER_SELECTOR: `.${ROOT}__drawer`,
2828
OPACITY_VAR_NAME: `--${ROOT}-opacity`,
2929
FOCUSABLE_ELEMENTS: 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), ' +
30-
'button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]'
30+
'button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]',
3131
};

packages/mdc-drawer/temporary/foundation.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ export default class MDCTemporaryDrawerFoundation extends MDCFoundation {
5252
makeElementUntabbable: (/* el: Element */) => {},
5353
isRtl: () => /* boolean */ false,
5454
getDrawerWidth: () => /* number */ 0,
55-
isDrawer: (/* el: Element */) => /* boolean */ false
55+
isDrawer: (/* el: Element */) => /* boolean */ false,
5656
};
5757
}
5858

5959
constructor(adapter) {
6060
super(Object.assign(MDCTemporaryDrawerFoundation.defaultAdapter, adapter));
6161

62-
this.transitionEndHandler_ = ev => {
62+
this.transitionEndHandler_ = (ev) => {
6363
if (this.adapter_.isDrawer(ev.target)) {
6464
this.adapter_.removeClass(MDCTemporaryDrawerFoundation.cssClasses.ANIMATING);
6565
this.adapter_.deregisterTransitionEndHandler(this.transitionEndHandler_);
@@ -69,11 +69,11 @@ export default class MDCTemporaryDrawerFoundation extends MDCFoundation {
6969
this.inert_ = false;
7070

7171
this.componentClickHandler_ = () => this.close();
72-
this.drawerClickHandler_ = evt => evt.stopPropagation();
73-
this.componentTouchStartHandler_ = evt => this.handleTouchStart_(evt);
74-
this.componentTouchMoveHandler_ = evt => this.handleTouchMove_(evt);
75-
this.componentTouchEndHandler_ = evt => this.handleTouchEnd_(evt);
76-
this.documentKeydownHandler_ = evt => {
72+
this.drawerClickHandler_ = (evt) => evt.stopPropagation();
73+
this.componentTouchStartHandler_ = (evt) => this.handleTouchStart_(evt);
74+
this.componentTouchMoveHandler_ = (evt) => this.handleTouchMove_(evt);
75+
this.componentTouchEndHandler_ = (evt) => this.handleTouchEnd_(evt);
76+
this.documentKeydownHandler_ = (evt) => {
7777
if (evt.key && evt.key === 'Escape' || evt.keyCode === 27) {
7878
this.close();
7979
}

packages/mdc-drawer/temporary/index.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ export class MDCTemporaryDrawer extends MDCComponent {
4646
const {FOCUSABLE_ELEMENTS, OPACITY_VAR_NAME} = MDCTemporaryDrawerFoundation.strings;
4747

4848
return new MDCTemporaryDrawerFoundation({
49-
addClass: className => this.root_.classList.add(className),
50-
removeClass: className => this.root_.classList.remove(className),
51-
hasClass: className => this.root_.classList.contains(className),
49+
addClass: (className) => this.root_.classList.add(className),
50+
removeClass: (className) => this.root_.classList.remove(className),
51+
hasClass: (className) => this.root_.classList.contains(className),
5252
hasNecessaryDom: () => Boolean(this.drawer),
5353
registerInteractionHandler: (evt, handler) =>
5454
this.root_.addEventListener(util.remapEvent(evt), handler, util.applyPassive()),
@@ -58,24 +58,24 @@ export class MDCTemporaryDrawer extends MDCComponent {
5858
this.drawer.addEventListener(util.remapEvent(evt), handler),
5959
deregisterDrawerInteractionHandler: (evt, handler) =>
6060
this.drawer.removeEventListener(util.remapEvent(evt), handler),
61-
registerTransitionEndHandler: handler => this.drawer.addEventListener('transitionend', handler),
62-
deregisterTransitionEndHandler: handler => this.drawer.removeEventListener('transitionend', handler),
63-
registerDocumentKeydownHandler: handler => document.addEventListener('keydown', handler),
64-
deregisterDocumentKeydownHandler: handler => document.removeEventListener('keydown', handler),
61+
registerTransitionEndHandler: (handler) => this.drawer.addEventListener('transitionend', handler),
62+
deregisterTransitionEndHandler: (handler) => this.drawer.removeEventListener('transitionend', handler),
63+
registerDocumentKeydownHandler: (handler) => document.addEventListener('keydown', handler),
64+
deregisterDocumentKeydownHandler: (handler) => document.removeEventListener('keydown', handler),
6565
getDrawerWidth: () => this.drawer.offsetWidth,
66-
setTranslateX: value => this.drawer.style.setProperty(
66+
setTranslateX: (value) => this.drawer.style.setProperty(
6767
util.getTransformPropertyName(), value === null ? null : `translateX(${value}px)`),
68-
updateCssVariable: value => {
68+
updateCssVariable: (value) => {
6969
if (util.supportsCssCustomProperties()) {
7070
this.root_.style.setProperty(OPACITY_VAR_NAME, value);
7171
}
7272
},
7373
getFocusableElements: () => this.drawer.querySelectorAll(FOCUSABLE_ELEMENTS),
74-
saveElementTabState: el => util.saveElementTabState(el),
75-
restoreElementTabState: el => util.restoreElementTabState(el),
76-
makeElementUntabbable: el => el.setAttribute('tabindex', -1),
74+
saveElementTabState: (el) => util.saveElementTabState(el),
75+
restoreElementTabState: (el) => util.restoreElementTabState(el),
76+
makeElementUntabbable: (el) => el.setAttribute('tabindex', -1),
7777
isRtl: () => getComputedStyle(this.root_).getPropertyValue('direction') === 'rtl',
78-
isDrawer: el => el === this.drawer
78+
isDrawer: (el) => el === this.drawer,
7979
});
8080
}
8181
}

0 commit comments

Comments
 (0)