From c654f3d6ab257f0d2aee04141fd97ae1fdd95b54 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Mon, 8 Apr 2019 21:04:55 +0200 Subject: [PATCH] fail silently if already setup JS utilities are setup again --- static/js/utils/form.js | 10 +++++----- static/js/utils/modal.js | 2 +- static/js/utils/showHide.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/static/js/utils/form.js b/static/js/utils/form.js index 7beea537e..baa0eb9e6 100644 --- a/static/js/utils/form.js +++ b/static/js/utils/form.js @@ -28,7 +28,7 @@ var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized'; - var reactiveButtonUtil = function(element) { + var reactiveSubmitButtonUtil = function(element) { var requiredInputs; var submitButton; @@ -38,7 +38,7 @@ } if (element.classList.contains(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS)) { - throw new Error('Reactive Submit Button utility already initialized!'); + return false; } // abort if form has param data-formnorequired @@ -53,7 +53,7 @@ } var submitButtons = Array.from(element.querySelectorAll('[type="submit"]')); - if (!submitButtons) { + if (!submitButtons || !submitButtons.length) { throw new Error('Reactive Submit Button utility couldn\'t find any submit buttons!'); } submitButton = submitButtons.reverse()[0]; @@ -109,7 +109,7 @@ formUtilities.push({ name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME, selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR, - setup: reactiveButtonUtil, + setup: reactiveSubmitButtonUtil, }); /** @@ -152,7 +152,7 @@ } if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) { - throw new Error('Interactive Fieldset utility already initialized!'); + return false; } // param conditionalInput diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js index 7a5c49543..6b5f0fba1 100644 --- a/static/js/utils/modal.js +++ b/static/js/utils/modal.js @@ -48,7 +48,7 @@ } if (element.classList.contains(MODAL_INITIALIZED_CLASS)) { - throw new Error('Modal utility already initialized!'); + return false; } // param modalTrigger diff --git a/static/js/utils/showHide.js b/static/js/utils/showHide.js index cd3a6e4ac..e2b25e200 100644 --- a/static/js/utils/showHide.js +++ b/static/js/utils/showHide.js @@ -40,7 +40,7 @@ } if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) { - throw new Error('ShowHide utility already initialized!'); + return false; } // register click listener