diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-05-04 13:27:27 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-05-04 13:27:27 +0100 |
| commit | 45ed5d1da4c96dfa127d64310f69874a59da5921 (patch) | |
| tree | 948ff7d41aba10570647ec84721f8701317bd401 /resources/views | |
| parent | 313cf4187f9ffd42e2de8c4dc152465587da0d16 (diff) | |
| download | webtrees-45ed5d1da4c96dfa127d64310f69874a59da5921.tar.gz webtrees-45ed5d1da4c96dfa127d64310f69874a59da5921.tar.bz2 webtrees-45ed5d1da4c96dfa127d64310f69874a59da5921.zip | |
De-duplicate some repeated javascript code and remove some jQuery
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/modals/create-location.phtml | 32 | ||||
| -rw-r--r-- | resources/views/modals/create-media-object.phtml | 32 | ||||
| -rw-r--r-- | resources/views/modals/create-note-object.phtml | 32 | ||||
| -rw-r--r-- | resources/views/modals/create-repository.phtml | 37 | ||||
| -rw-r--r-- | resources/views/modals/create-source.phtml | 32 | ||||
| -rw-r--r-- | resources/views/modals/create-submission.phtml | 32 | ||||
| -rw-r--r-- | resources/views/modals/create-submitter.phtml | 32 |
7 files changed, 7 insertions, 222 deletions
diff --git a/resources/views/modals/create-location.phtml b/resources/views/modals/create-location.phtml index 020a9c64c1..73b6d2e1ef 100644 --- a/resources/views/modals/create-location.phtml +++ b/resources/views/modals/create-location.phtml @@ -23,35 +23,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-media-object.phtml b/resources/views/modals/create-media-object.phtml index be63b2a1de..5d0f3c5a53 100644 --- a/resources/views/modals/create-media-object.phtml +++ b/resources/views/modals/create-media-object.phtml @@ -26,35 +26,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-note-object.phtml b/resources/views/modals/create-note-object.phtml index 86458b0f1b..669b6b2d3f 100644 --- a/resources/views/modals/create-note-object.phtml +++ b/resources/views/modals/create-note-object.phtml @@ -23,35 +23,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-repository.phtml b/resources/views/modals/create-repository.phtml index ef77bb5541..7dadd4b42c 100644 --- a/resources/views/modals/create-repository.phtml +++ b/resources/views/modals/create-repository.phtml @@ -25,40 +25,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - select.tomselect.clearOptions(); - select.tomselect.addOption({ value: data.value, text: data.text }); - select.tomselect.refreshOptions(); - select.tomselect.clear(); - select.tomselect.addItem(data.value); - select.tomselect.refreshItems(); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-source.phtml b/resources/views/modals/create-source.phtml index 23ef772ff2..a3e6ebc679 100644 --- a/resources/views/modals/create-source.phtml +++ b/resources/views/modals/create-source.phtml @@ -23,35 +23,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-submission.phtml b/resources/views/modals/create-submission.phtml index a62b95fcc9..1f46cdb869 100644 --- a/resources/views/modals/create-submission.phtml +++ b/resources/views/modals/create-submission.phtml @@ -23,35 +23,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> diff --git a/resources/views/modals/create-submitter.phtml b/resources/views/modals/create-submitter.phtml index a8260e5499..e1ca357c95 100644 --- a/resources/views/modals/create-submitter.phtml +++ b/resources/views/modals/create-submitter.phtml @@ -23,35 +23,5 @@ use Fisharebest\Webtrees\Tree; </form> <script> - // Submit the modal form using AJAX - document.getElementById('wt-modal-form').addEventListener('submit', function (event) { - event.preventDefault(); - let form = event.target; - let modal_content = document.querySelector('#wt-ajax-modal .modal-content'); - let select = document.getElementById(modal_content.dataset.wtSelectId); - - $.ajax({ - url: form.action, - type: form.method, - data: new FormData(form), - async: false, - cache: false, - contentType: false, - processData: false, - success: function (data) { - if (select) { - // If this modal was activated by the "new" button in a select - // edit control, then insert the result and select it. - webtrees.resetTomSelect(select.tomselect, data.value, data.text); - - $('#wt-ajax-modal').modal('hide'); - } else { - modal_content.innerHTML = data.html; - } - }, - failure: function (data) { - modal_content.innerHTML = data.html; - }, - }); - }); + document.getElementById('wt-modal-form').addEventListener('submit', webtrees.createRecordModalSubmit); </script> |
