Skip to content

Removed named define of AMD module and returning factory on the root #184

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
wallynm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed named define of AMD module and returning factory on the root #184

Show file tree
Hide file tree
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
19 changes: 9 additions & 10 deletions dist/js/bootstrap-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
if (typeof module !== 'undefined' && module.exports) {
module.exports = factory(require('jquery'), require('bootstrap'));
}
// AMD module is defined
else if (typeof define === "function" && define.amd) {
define("bootstrap-dialog", ["jquery", "bootstrap"], function($) {
return factory($);
});
else if (typeof define === 'function' && define.amd) {
define(["jquery", "bootstrap"], function($) {
return root.BootstrapDialog = factory($);
});
} else {
// planted over the root!
root.BootstrapDialog = factory(root.jQuery);
Expand Down Expand Up @@ -100,7 +99,7 @@
BootstrapDialogModal.METHODS_TO_OVERRIDE['v3.3'] = {
/**
* Overrided.
*
*
* @returns {undefined}
*/
setScrollbar: function() {
Expand All @@ -111,7 +110,7 @@
},
/**
* Overrided.
*
*
* @returns {undefined}
*/
resetScrollbar: function() {
Expand All @@ -122,7 +121,7 @@
},
/**
* Overrided.
*
*
* @returns {undefined}
*/
hideModal: function() {
Expand All @@ -143,7 +142,7 @@
constructor: BootstrapDialogModal,
/**
* New function, to get the dialogs that opened by BootstrapDialog.
*
*
* @returns {undefined}
*/
getGlobalOpenedDialogs: function() {
Expand Down Expand Up @@ -286,7 +285,7 @@
},
/**
* To make multiple opened dialogs look better.
*
*
* Will be removed in later version, after Bootstrap Modal >= 3.3.0, updating z-index is unnecessary.
*/
updateZIndex: function() {
Expand Down
Loading