This commit is contained in:
Yuri Kuznetsov
2025-11-02 11:16:23 +02:00
5 changed files with 29 additions and 10 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<div>
{{#if isFirst}}
{{#unless rowActionsDisabled}}
<div class="pull-right item-menu-container fix-overflow">{{{../itemMenu}}}</div>
<div class="pull-right item-menu-container fix-position">{{{../itemMenu}}}</div>
{{/unless}}
{{/if}}
<div class="form-group">
+8
View File
@@ -691,6 +691,14 @@ class App {
if (!className) {
const module = this.metadata.get(`scopes.${name}.module`);
if (!/^[A-Za-z0-9]+$/.test(name)) {
console.error(`Bad controller name ${name}.`);
this.baseController.error404();
return;
}
className = Utils.composeClassName(module, name, 'controllers');
}
+7 -2
View File
@@ -763,7 +763,7 @@
}
console.warn(`Could not obtain ${id}.`);
});
}, errorCallback);
return;
}
@@ -792,9 +792,10 @@
* @private
* @param {string} url
* @param {function} callback
* @param {function|null} [errorCallback]
* @return {Promise}
*/
_addScript(url, callback) {
_addScript(url, callback, errorCallback = null) {
const script = document.createElement('script');
script.src = url;
@@ -802,6 +803,10 @@
script.addEventListener('error', e => {
console.error(`Could not load script '${url}'.`, e);
if (errorCallback) {
errorCallback();
}
});
document.head.appendChild(script);
+11 -5
View File
@@ -112,8 +112,14 @@ function uiAppInit() {
const $dashletBody = $(target).closest('.dashlet-body');
if ($dashletBody.length) {
const $body = $dashletBody;
const fixPosition = e.target.parentElement.classList.contains('fix-position');
if ($dashletBody.length || fixPosition) {
let $body = $dashletBody;
if (fixPosition) {
$body = $(window);
}
$(target).removeClass('dropup');
@@ -152,10 +158,10 @@ function uiAppInit() {
right: 'auto',
});
return;
//return;
}
if (e.target.parentElement.classList.contains('fix-overflow')) {
/*if (e.target.parentElement.classList.contains('fix-overflow')) {
$(target).removeClass('dropup');
const isRight = e.target.classList.contains('pull-right');
@@ -187,7 +193,7 @@ function uiAppInit() {
left: left,
right: 'auto',
});
}
}*/
});
}
+2 -2
View File
@@ -204,11 +204,11 @@ ul.dropdown-menu {
margin-right: var(--2px);
}
.fix-overflow {
/*.fix-position {
.btn-group {
position: unset;
}
}
}*/
.dropdown-menu {
.quick-search-list-item {