Explicitly test that bootstrap and bootstrap.Modal are defined

projectblacklight · Apr 27, 2022 · eab5a9c · eab5a9c
1 parent 6955a36
commit eab5a9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/javascripts/blacklight/blacklight.js b/app/assets/javascripts/blacklight/blacklight.js
@@ -441,15 +441,15 @@ Blacklight.modal.checkCloseModal = function (event) {
 };
 
 Blacklight.modal.hide = function (el) {
-  if (bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('hide');
   }
 };
 
 Blacklight.modal.show = function (el) {
-  if (bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('show');

diff --git a/app/javascript/blacklight/modal.js b/app/javascript/blacklight/modal.js
@@ -206,15 +206,15 @@ Blacklight.modal.checkCloseModal = function(event) {
 }
 
 Blacklight.modal.hide = function(el) {
-  if (bootstrap && bootstrap.Modal && bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('hide');
   }
 }
 
 Blacklight.modal.show = function(el) {
-  if (bootstrap && bootstrap.Modal && bootstrap.Modal.VERSION >= "5") {
+  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
     bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
   } else {
     $(el || Blacklight.modal.modalSelector).modal('show');