From 0e55521d8ffc4d8c43e10455efa41c4c9204fc27 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Mon, 4 Feb 2019 14:56:18 +0000 Subject: [PATCH 1/2] $.inArray returns the same value as Array.indexOf --- app/assets/javascripts/templateFolderForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js index 18df5294c..a9bf4c50d 100644 --- a/app/assets/javascripts/templateFolderForm.js +++ b/app/assets/javascripts/templateFolderForm.js @@ -147,7 +147,7 @@ ); // use dialog mode for states which contain more than one form control - if ($.inArray(this.currentState, ['move-to-existing-folder', 'add-new-template'])) { + if ($.inArray(this.currentState, ['move-to-existing-folder', 'add-new-template']) !== -1) { mode = 'dialog'; } GOVUK.stickAtBottomWhenScrolling.setMode(mode); From ca6529dcdb523f0a5a73935dab53767cf4e49850 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 4 Feb 2019 15:17:27 +0000 Subject: [PATCH 2/2] Update app/assets/javascripts/templateFolderForm.js Use native `Array.indexOf` instead. Co-Authored-By: tombye --- app/assets/javascripts/templateFolderForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/templateFolderForm.js b/app/assets/javascripts/templateFolderForm.js index a9bf4c50d..1b81776c2 100644 --- a/app/assets/javascripts/templateFolderForm.js +++ b/app/assets/javascripts/templateFolderForm.js @@ -147,7 +147,7 @@ ); // use dialog mode for states which contain more than one form control - if ($.inArray(this.currentState, ['move-to-existing-folder', 'add-new-template']) !== -1) { + if (['move-to-existing-folder', 'add-new-template'].indexOf(this.currentState) !== -1) { mode = 'dialog'; } GOVUK.stickAtBottomWhenScrolling.setMode(mode);