Skip to content

Commit 01fc4c8

Browse files
Revert "fix: Dropdown menu results in internal scroll bar" (#5835)
This reverts commit 4c59354.
1 parent 2072e06 commit 01fc4c8

File tree

4 files changed

+4
-47
lines changed

4 files changed

+4
-47
lines changed

app/components/tables/default.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ import Component from '@ember/component';
44
@classic
55
export default class Tables extends Component {
66

7-
didRender() {
8-
this.rendered?.();
9-
}
107
}

app/controllers/events/view/sessions/list.js

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,11 @@
11
import Controller from '@ember/controller';
2-
import { computed, action } from '@ember/object';
2+
import { action } from '@ember/object';
33
import { mapBy } from '@ember/object/computed';
44
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
5-
import $ from 'jquery';
65

76
export default class extends Controller.extend(EmberTableControllerMixin) {
87
@mapBy('model.feedbacks', 'session.id') ratedSessions;
98

10-
@computed('model.sessions.data')
11-
get sessions() {
12-
const len = this.model.sessions.data.length;
13-
this.model.sessions.data.forEach((item, idx) => {
14-
if (len >= 4 && idx >= len - 2) {
15-
item.set('dir', 'upward');
16-
} else if (len > 2) {
17-
if (idx === len - 1) {
18-
item.set('dir', 'upward');
19-
} else if (idx < 2) {
20-
item.set('dir', 'downward');
21-
} else {
22-
item.set('dir', 'auto');
23-
}
24-
} else {
25-
item.set('dir', 'downward');
26-
}
27-
});
28-
29-
return this.model.sessions.data;
30-
}
31-
329
get columns() {
3310
return [
3411
{
@@ -38,7 +15,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
3815
width : 75,
3916
valuePath : 'state',
4017
isSortable : true,
41-
extraValuePaths : ['id', 'status', 'dir'],
18+
extraValuePaths : ['id', 'status'],
4219
options : {
4320
sessionStateMap: this.model.sessionStateMap
4421
},
@@ -128,22 +105,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
128105
];
129106
}
130107

131-
@action
132-
tableRendered() {
133-
let margin = 0;
134-
const len = this.model.sessions.data.length;
135-
136-
if (len > 0 && len <= 2) {
137-
margin = 150;
138-
} else if (len <= 3) {
139-
margin = 50;
140-
} else {
141-
margin = 0;
142-
}
143-
144-
$('.ember-table table').css('margin-bottom', margin);
145-
}
146-
147108
@action
148109
async deleteSession(session_id) {
149110
this.set('isLoading', true);

app/templates/components/ui-table/cell/events/view/sessions/cell-buttons.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UiDropdown @class="ui floating dropdown button" @direction={{if this.extraRecords this.extraRecords.dir}}>
1+
<UiDropdown @class="ui floating dropdown button">
22
<div class="ui {{this.color}} empty circular label"></div>
33
{{t-var (capitalize this.extraRecords.status)}}
44
<div class="menu">

app/templates/events/view/sessions/list.hbs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="sixteen wide column">
22
<Tables::Default
33
@columns={{this.columns}}
4-
@rows={{this.sessions}}
4+
@rows={{this.model.sessions.data}}
55
@feedbacks={{this.model.feedbacks}}
66
@currentPage={{this.page}}
77
@pageSize={{this.per_page}}
@@ -12,6 +12,5 @@
1212
@filterOptions={{this.filterOptions}}
1313
@widthConstraint="eq-container"
1414
@resizeMode="fluid"
15-
@rendered={{action "tableRendered"}}
1615
@fillMode="equal-column" />
1716
</div>

0 commit comments

Comments
 (0)