Skip to content

Commit 67b5ece

Browse files
committed
Merged branch 4.6
2 parents 5414019 + d6dd814 commit 67b5ece

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ibexa/admin-ui",
3-
"license": "GPL-2.0-only",
3+
"license": "(GPL-2.0-only or proprietary)",
44
"type": "project",
55
"description": "Ibexa Admin Ui",
66
"replace": {

src/bundle/Resources/public/js/scripts/quick.action.manager.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1-
(function (global) {
1+
(function (global, doc) {
22
const ACTION_BTN_VERTICAL_SPACING = 4.3;
3+
const isIframe = global.self !== global.top;
34
let actionButtonConfigs = [];
45

6+
const handleQuickActionMenuVisibility = () => {
7+
if (!isIframe) {
8+
const quickActionMenu = doc.querySelector('.ibexa-quick-action-menu');
9+
10+
if (quickActionMenu) {
11+
quickActionMenu.classList.remove('ibexa-quick-action-menu--hidden');
12+
}
13+
}
14+
};
15+
16+
doc.addEventListener('DOMContentLoaded', handleQuickActionMenuVisibility, false);
17+
518
const registerButton = (config) => {
619
if (!config || !config.container || actionButtonConfigs.some((btn) => btn.id === config.id)) {
720
return;
@@ -49,4 +62,4 @@
4962
unregisterButton,
5063
recalculateButtonsLayout,
5164
};
52-
})(window);
65+
})(window, window.document);
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.ibexa-quick-action-menu {
2+
&--hidden {
3+
display: none;
4+
}
5+
}

src/bundle/Resources/public/scss/ibexa.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
@use 'main-container';
9797
@use 'main-menu';
9898
@use 'main-menu-popup';
99+
@use 'quick-action-menu';
99100
@use 'edit-header';
100101
@use 'context-menu';
101102
@use 'anchor-navigation';

src/bundle/Resources/views/themes/admin/ui/layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
})|e('html_attr') }}"></div>
217217
<div class="ibexa-modal-wrapper"></div>
218218

219-
<div class="ibexa-quick-action-menu">
219+
<div class="ibexa-quick-action-menu ibexa-quick-action-menu--hidden">
220220
{% if not is_back_to_top_disabled|default(false) %}
221221
{% block back_to_top %}
222222
<div class="ibexa-back-to-top">

0 commit comments

Comments
 (0)