Skip to content

Commit b440c1e

Browse files
authored
UI/Mainbar: 31492, move entire li-tag instead of button only on resize (ILIAS-eLearning#3711)
1 parent 1e88585 commit b440c1e

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/UI/templates/js/MainControls/dist/mainbar.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,9 @@ var renderer = function($) {
877877
if(model_state.any_tools_visible()) { max_buttons--;}
878878
for(i = max_buttons; i < root_entries_length; i++) {
879879
btn = parts.triggerer.withHtmlId(dom_references[root_entries[i].id].triggerer);
880+
list = btn.getElement().parent();
880881
btn.getElement().appendTo(more_slate.getElement().children('.il-maincontrols-slate-content'));
882+
list.remove();
881883
}
882884
},
883885
render: function (model_state) {
@@ -887,7 +889,13 @@ var renderer = function($) {
887889
more_button = parts.triggerer.withHtmlId(dom_references[more_entry.id].triggerer),
888890
more_slate = parts.slate.withHtmlId(dom_references[more_entry.id].slate);
889891
//reset
890-
more_slate.getElement().find('.btn-bulky, .link-bulky').insertBefore(more_button.getElement());
892+
btns = more_slate.getElement().find('.btn-bulky, .link-bulky');
893+
for(var i = 0; i < btns.length; i = i + 1) {
894+
li = document.createElement('li');
895+
li.appendChild(btns[i]);
896+
li.setAttribute('role', 'none');
897+
$(li).insertBefore(more_button.getElement().parent());
898+
}
891899

892900
if(model_state.more_available) {
893901
actions.moveToplevelTriggerersToMore(model_state);

src/UI/templates/js/MainControls/src/mainbar.renderer.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ var renderer = function($) {
210210

211211
for(i = max_buttons; i < root_entries_length; i++) {
212212
btn = parts.triggerer.withHtmlId(dom_references[root_entries[i].id].triggerer);
213+
list = btn.getElement().parent();
213214
btn.getElement().appendTo(more_slate.getElement().children('.il-maincontrols-slate-content'));
215+
list.remove();
214216
}
215217
},
216218
render: function (model_state) {
@@ -220,7 +222,13 @@ var renderer = function($) {
220222
more_button = parts.triggerer.withHtmlId(dom_references[more_entry.id].triggerer),
221223
more_slate = parts.slate.withHtmlId(dom_references[more_entry.id].slate);
222224
//reset
223-
more_slate.getElement().find('.btn-bulky, .link-bulky').insertBefore(more_button.getElement());
225+
btns = more_slate.getElement().find('.btn-bulky, .link-bulky');
226+
for(var i = 0; i < btns.length; i = i + 1) {
227+
li = document.createElement('li');
228+
li.appendChild(btns[i]);
229+
li.setAttribute('role', 'none');
230+
$(li).insertBefore(more_button.getElement().parent());
231+
}
224232

225233
if(model_state.more_available) {
226234
actions.moveToplevelTriggerersToMore(model_state);

0 commit comments

Comments
 (0)