Skip to content

Update bootstrapDialog for Bootstrap version 4.0. #281

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
avan06 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update bootstrapDialog for Bootstrap version 4.0. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b840b3e
Update bootstrapDialog for Bootstrap version 4.0.
avan06 Jul 22, 2016
5fc9579
Merge remote-tracking branch
avan06 Nov 18, 2016
7a6ce48
Merge branch 'master' of github.com:nakupanda/bootstrap3-dialog
avan06 Aug 24, 2017
fc5a30b
FIXME for BootstrapV4.X
avan06 Jun 14, 2018
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
32 changes: 28 additions & 4 deletions dist/js/bootstrap-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
* BootstrapDialogModal === Modified Modal.
* ================================================ */
var Modal = $.fn.modal.Constructor;
var BootstrapDialogModal = function (element, options) {
Modal.call(this, element, options);
var BootstrapDialogModal = function(element, options) {
if (/4\.\d+/.test($.fn.modal.Constructor.VERSION)) { //FIXME for BootstrapV4
return new Modal(element, options);
} else {
Modal.call(this, element, options);
}
};
BootstrapDialogModal.getModalVersion = function () {
var version = null;
Expand All @@ -50,6 +54,8 @@
version = 'v3.2';
} else if (/3\.3\.[1,2]/.test($.fn.modal.Constructor.VERSION)) {
version = 'v3.3'; // v3.3.1, v3.3.2
} else if (/4\.\d+/.test($.fn.modal.Constructor.VERSION)) { //FIXME for BootstrapV4
version = 'v4.0';
} else {
version = 'v3.3.4';
}
Expand Down Expand Up @@ -139,6 +145,7 @@
}
};
BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.3.4'] = $.extend({}, BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.3']);
BootstrapDialogModal.METHODS_TO_OVERRIDE['v4.0'] = $.extend({}, BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.3']); //FIXME for BootstrapV4
BootstrapDialogModal.prototype = {
constructor: BootstrapDialogModal,
/**
Expand Down Expand Up @@ -341,7 +348,7 @@
}
});
var $modal = this.getModal();
var $backdrop = $modal.data('bs.modal').$backdrop;
var $backdrop = this.getModalBackdrop($modal); //FIXME for BootstrapV4
$modal.css('z-index', zIndexModal + (dialogCount - 1) * 20);
$backdrop.css('z-index', zIndexBackdrop + (dialogCount - 1) * 20);
}
Expand All @@ -363,6 +370,17 @@
};
BootstrapDialog.METHODS_TO_OVERRIDE['v3.3'] = {};
BootstrapDialog.METHODS_TO_OVERRIDE['v3.3.4'] = $.extend({}, BootstrapDialog.METHODS_TO_OVERRIDE['v3.1']);
BootstrapDialog.METHODS_TO_OVERRIDE['v4.0'] = { //FIXME for BootstrapV4
getModalBackdrop: function ($modal) {
return $($modal.data('bs.modal')._backdrop);
},
handleModalBackdropEvent: BootstrapDialog.METHODS_TO_OVERRIDE['v3.1']['handleModalBackdropEvent'],
updateZIndex: BootstrapDialog.METHODS_TO_OVERRIDE['v3.1']['updateZIndex'],
open: BootstrapDialog.METHODS_TO_OVERRIDE['v3.1']['open'],
getModalForBootstrapDialogModal : function () {
return this.getModal().get(0);
}
};
BootstrapDialog.prototype = {
constructor: BootstrapDialog,
initOptions: function (options) {
Expand Down Expand Up @@ -407,6 +425,12 @@

return this;
},
getModalBackdrop: function ($modal) { //FIXME for BootstrapV4
return $modal.data('bs.modal').$backdrop;
},
getModalForBootstrapDialogModal: function () { //FIXME for BootstrapV4
return this.getModal();
},
createModalDialog: function () {
return $('<div class="modal-dialog"></div>');
},
Expand Down Expand Up @@ -1147,7 +1171,7 @@
this.getModalFooter().append(this.createFooterContent());
this.getModalHeader().append(this.createHeaderContent());
this.getModalBody().append(this.createBodyContent());
this.getModal().data('bs.modal', new BootstrapDialogModal(this.getModal(), {
this.getModal().data('bs.modal', new BootstrapDialogModal(this.getModalForBootstrapDialogModal(), { //FIXME for BootstrapV4
backdrop: 'static',
keyboard: false,
show: false
Expand Down
Loading