Skip to content

Fix problem with XL size + add custom classes to eModal parameters #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isindicic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix problem with XL size + add custom classes to eModal parameters #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions dist/eModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* loading {boolean}: Set loading progress as message.
* message {string|object}: The body message string or the HTML element. e.g.: $(selector);
* size {string}: sm || lg || xl -> define the modal size.
* classes {string}: Custom class (or classes) to be used. Can be used for custom modal size or something else.
* subtitle {string}: The header subtitle string. This appear in a smaller text.
* title {string}: The header title string.
* useBin {boolean}: Set message as recyclable.
Expand Down Expand Up @@ -62,6 +63,7 @@
labels: LABEL,
loadingHtml: '<h5>Loading...</h5><div class=progress><div class="progress-bar progress-bar-striped active" style="width: 100%"></div></div>',
size: EMPTY,
classes: EMPTY,
title: 'Attention',
autofocus: false
};
Expand All @@ -79,6 +81,7 @@
root.setEModalOptions = setEModalOptions;
root.setModalOptions = setModalOptions;
root.size = SIZE;
root.classes = '';
root.version = '1.2.67';

return root;
Expand Down Expand Up @@ -320,8 +323,20 @@

// Change size
$ref.find(MODAL_DIALOG)
.removeClass('modal-sm modal-lg modal-xl')
.addClass(params.size || defaultSettings.size ? size : null);
.removeClass() // Remove all classes (including custom classes)
.addClass('modal-dialog') // Put back modal-dialog class
;

if(size == 'modal-xl') // In case of XL size ...
$ref.find(MODAL_DIALOG).css('max-width', 'none'); // Remove max-width limitation from bootstrap css
else
$ref.find(MODAL_DIALOG).css('max-width', ''); // otherwise use max-width from bootstrap css

$ref.find(MODAL_DIALOG)
.addClass(params.size || defaultSettings.size ? size : null);
if(params.classes != '')
$ref.find(MODAL_DIALOG).addClass(params.classes);


// Change title
$ref.find('.modal-title')
Expand Down Expand Up @@ -450,6 +465,7 @@
message: data.message || data,
onHide: click,
size: data.size,
classes: data.classes,
title: data.title || title
});

Expand Down Expand Up @@ -494,6 +510,7 @@
deferred: dfd,
message: message,
size: params.size || SIZE.xl,
classes: params.classes || EMPTY ,
title: params.title || title
});
//////////
Expand Down