From b72402876d799ad22c887827784f388b2f05ab0f Mon Sep 17 00:00:00 2001 From: Nick Hammond Date: Fri, 30 Jan 2015 16:42:00 -0600 Subject: [PATCH] Ensure that the validate function returns the full list of validations to properly focus --- js/foundation/foundation.abide.js | 1 - spec/abide/abide.js | 14 ++++++++++++++ spec/abide/basic.html | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/js/foundation/foundation.abide.js b/js/foundation/foundation.abide.js index 517e97a2d..58997faf6 100644 --- a/js/foundation/foundation.abide.js +++ b/js/foundation/foundation.abide.js @@ -242,7 +242,6 @@ } validations.push(el_validations[0]); } - validations = [validations.every(function (valid) {return valid;})]; return validations; }, diff --git a/spec/abide/abide.js b/spec/abide/abide.js index 56adc1ad7..05564ad48 100644 --- a/spec/abide/abide.js +++ b/spec/abide/abide.js @@ -102,6 +102,20 @@ describe('abide:', function() { expect($('input[name="user_name"]')).not.toHaveData('invalid'); }); + it('should not focus hidden fields that are not required', function() { + $(document).foundation(); + hidden_element = 'input[name="utf8"]'; + first_element = 'input[name="user_name"]'; + + spyOnEvent(hidden_element, 'focus'); + spyOnEvent(first_element, 'focus'); + + $('form').submit(); + + expect('focus').not.toHaveBeenTriggeredOn(hidden_element); + expect('focus').toHaveBeenTriggeredOn(first_element); + }); + }); describe('advanced validation', function() { diff --git a/spec/abide/basic.html b/spec/abide/basic.html index 5000841ff..8b360e7ad 100644 --- a/spec/abide/basic.html +++ b/spec/abide/basic.html @@ -1,4 +1,5 @@
+
-- 2.47.2