composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5888 - Correctly handle size option for modals

Browse Source
This commit is contained in:
Molkobain
2023-04-19 20:16:25 +02:00
parent 5aaaaec829
commit b078c0d289
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/public/js/toolbox.js
View File

@@ -109,14 +109,15 @@ CombodoModal._InstantiateModal = function(oModalElem, oOptions) {
// Resize to desired size
switch (typeof oOptions.size) {
case 'string':
oModalElem.find('.modal-dialog')
.removeClass('modal-lg')
.addClass('modal-' + oOptions.size);
if(oOptions.size !== undefined && oOptions.size !== 'auto') {
oModalElem.find('.modal-dialog')
.removeClass('modal-lg')
.addClass('modal-'+oOptions.size);
}
break;
case 'object':
CombodoJSConsole.Error('Could not open modal dialog as portal modals only support "xs", "sm", "md", "lg" sizes. Not specific width/height yet.');
return false;
CombodoJSConsole.Warn('Specifying a specific width / height on a modal dialog is not supported yet in the portal. Only "xs", "sm", "md", "lg" sizes are supported.');
}
// Load content

4
js/pages/backoffice/toolbox.js
View File

@@ -208,7 +208,7 @@ CombodoModal._InstantiateModal = function(oModalElem, oOptions) {
buttons: this._ConvertButtonDefinition(oOptions.buttons)
};
let aSizeMap = {
const aSizeMap = {
'xs': 'extra-small',
's': 'small',
'md': 'medium',
@@ -218,7 +218,7 @@ CombodoModal._InstantiateModal = function(oModalElem, oOptions) {
// Resize to desired size
switch (typeof oOptions.size) {
case 'string':
if(aSizeMap[oOptions.size] !== undefined) {
if(aSizeMap[oOptions.size] !== undefined && aSizeMap[oOptions.size] !== 'auto') {
let sSize = 'ibo-is-' + aSizeMap[oOptions.size];
if (oJQueryOptions.classes['ui-dialog-content'] !== undefined) {
oJQueryOptions.classes['ui-dialog-content'] += ' ' + sSize;