Skip to content

Commit 4adc530

Browse files
authored
Merge pull request rust-lang#1316 from CvX/eslint-fix-no-on-calls-in-components
ESLint: fix "ember/no-on-calls-in-components" error.
2 parents 8cf8dec + 9783b63 commit 4adc530

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ module.exports = {
2929
'allowTemplateLiterals': true,
3030
'avoidEscape': true,
3131
}],
32-
'ember/no-on-calls-in-components': 'off',
3332
},
3433
overrides: [
3534
// node files

app/components/rl-dropdown.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Component from '@ember/component';
2-
import { on } from '@ember/object/evented';
32
import { alias } from '@ember/object/computed';
4-
import { computed, observer } from '@ember/object';
3+
import { computed } from '@ember/object';
54
import $ from 'jquery';
65

76
import RlDropdownContainer from './rl-dropdown-container';
87

98
export default Component.extend({
109
classNames: ['rl-dropdown'],
10+
classNameBindings: ['isExpanded:open'],
1111

1212
dropdownContainer: computed(function() {
1313
return this.nearestOfType(RlDropdownContainer);
@@ -19,14 +19,6 @@ export default Component.extend({
1919

2020
propagateClicks: true,
2121

22-
manageVisibility: on('didInsertElement', observer('isExpanded', function() {
23-
if (this.get('isExpanded')) {
24-
this.$().css('display', 'block');
25-
} else {
26-
this.$().css('display', 'none');
27-
}
28-
})),
29-
3022
click(event) {
3123
let closeOnChildClick = this.get('closeOnChildClick');
3224
let propagateClicks = this.get('propagateClicks');

app/styles/app.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,13 @@ body {
9898
}
9999

100100
.current-user-links {
101-
display: none;
102101
left: auto;
103102
right: 0;
104103
min-width: 200px;
105-
106-
&.open { display: block; }
107104
}
108105
#doc-links {
109-
display: none;
110106
left: auto;
111107
min-width: 150px;
112-
113-
&.open { display: block; }
114108
}
115109
form.search {
116110
@include display-flex;
@@ -279,6 +273,7 @@ button.dropdown, a.dropdown {
279273
}
280274

281275
ul.dropdown {
276+
display: none;
282277
position: absolute;
283278
top: 100%;
284279
left: 0;

0 commit comments

Comments
 (0)