frayerjj-frontend 0.2.7 → 0.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/modal.js +6 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "frayerjj-frontend",
3
- "version": "0.2.7",
3
+ "version": "0.2.9",
4
4
  "description": "My base frontend for various projects",
5
5
  "main": "src/index.js",
6
6
  "type": "module",
package/src/modal.js CHANGED
@@ -81,7 +81,7 @@ export const modal = {
81
81
  alertModal.addEventListener('hidden.bs.modal', ev => {
82
82
  ev.target.remove();
83
83
  });
84
- let bsAlertModal = new bootstrap.Modal(alertModal, { backdrop: 'static' });
84
+ let bsAlertModal = bootstrap.Modal.getOrCreateInstance(alertModal);
85
85
  bsAlertModal.show();
86
86
  },
87
87
 
@@ -105,16 +105,15 @@ export const modal = {
105
105
  confirmModal.querySelector('.btn-outline-danger').addEventListener('click', () => {
106
106
  onCancel();
107
107
  });
108
- let bsConfirmModal = new bootstrap.Modal(confirmModal, { backdrop: 'static' });
108
+ let bsConfirmModal = bootstrap.Modal.getOrCreateInstance(confirmModal);
109
109
  bsConfirmModal.show();
110
110
  },
111
111
 
112
112
  close: () => {
113
113
  message.verbose('Closing Modals');
114
114
  document.querySelectorAll('.modal').forEach(modal => {
115
- let bsModal = bootstrap.Modal.getInstance(modal);
115
+ let bsModal = bootstrap.Modal.getOrCreateInstance(modal);
116
116
  if (bsModal) bsModal.hide();
117
- else new bootstrap.Modal(modal, { backdrop: 'static' }).hide();
118
117
  });
119
118
  },
120
119
 
@@ -146,8 +145,8 @@ export const modal = {
146
145
  ajaxModal.addEventListener('hidden.bs.modal', ev => {
147
146
  ev.target.remove();
148
147
  });
149
- let bsAjaxModal = new bootstrap.Modal(ajaxModal, { backdrop: 'static' });
150
148
  let ajaxModalBody = ajaxModal.querySelector('.modal-body');
149
+ let bsAjaxModal = bootstrap.Modal.getOrCreateInstance(ajaxModal);
151
150
  bsAjaxModal.show();
152
151
  loading.start(ajaxModalBody);
153
152
  message.verbose('Loading AJAX Modal');
@@ -180,7 +179,7 @@ export const modal = {
180
179
  vars: serialize(form),
181
180
  success: () => {
182
181
  message.verbose('AJAX Modal Saved');
183
- bsAjaxModal.hide();
182
+ if (bsAjaxModal) bsAjaxModal.hide();
184
183
  ajaxModal.remove();
185
184
  loading.stop();
186
185
  },
@@ -196,7 +195,7 @@ export const modal = {
196
195
  failure: () => {
197
196
  message.warn('AJAX Modal Load Failed');
198
197
  loading.stop();
199
- bsAjaxModal.hide();
198
+ if (bsAjaxModal) bsAjaxModal.hide();
200
199
  ajaxModal.remove();
201
200
  modal.alert(modal.ajax.error.load.msg, modal.ajax.error.load.title);
202
201
  }