Skip to content

Commit 8b1d937

Browse files
committed
Auto merge of #1833 - kzys:fix-dropdown, r=locks
Fix ESLint issues During #1832, I've realized that the indentation on `app/mixins/rl-dropdown-component.js` is off.
2 parents b4a6c66 + f953451 commit 8b1d937

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

.eslintrc.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ module.exports = {
1111
},
1212
rules: {
1313
'prettier/prettier': 'error',
14-
15-
'arrow-parens': 'off',
16-
'brace-style': 'off',
17-
camelcase: 'off',
18-
'comma-dangle': 'off',
19-
'dot-notation': 'off',
20-
'operator-linebreak': 'off',
21-
2214
'ember/no-observers': 'warn',
2315
'ember/no-new-mixins': 'warn',
2416
'ember/require-return-from-computed': 'warn',

app/mixins/rl-dropdown-component.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export default Mixin.create({
6060

6161
if (this.dropdownExpanded) {
6262
/* Add clickout handler with 1ms delay, to allow opening the dropdown
63-
* by clicking e.g. a checkbox and binding to dropdownExpanded, without
64-
* having the handler close the dropdown immediately. */
63+
* by clicking e.g. a checkbox and binding to dropdownExpanded, without
64+
* having the handler close the dropdown immediately. */
6565
later(() => {
6666
$document.bind(clickEventName, { component }, component.boundClickoutHandler);
6767
$document.bind(focusEventName, { component }, component.boundClickoutHandler);
@@ -96,13 +96,13 @@ export default Mixin.create({
9696
let $target = $(event.target);
9797

9898
/* There is an issue when the click triggered a dom change in the
99-
* dropdown that unloaded the target element. The ancestry of the target
100-
* can no longer be determined. We can check if html is still an ancestor
101-
* to determine if this has happened. The safe option then seems to be to
102-
* not close the dropdown, as occasionaly not closing the dropdown when it
103-
* should have closed, seems to be less bad for usability than occasionaly
104-
* closing the dropdown when it should not have closed.
105-
*/
99+
* dropdown that unloaded the target element. The ancestry of the target
100+
* can no longer be determined. We can check if html is still an ancestor
101+
* to determine if this has happened. The safe option then seems to be to
102+
* not close the dropdown, as occasionaly not closing the dropdown when it
103+
* should have closed, seems to be less bad for usability than occasionaly
104+
* closing the dropdown when it should not have closed.
105+
*/
106106
if (
107107
component.get('dropdownExpanded') &&
108108
$target.closest('html').length &&

0 commit comments

Comments
 (0)