#2629 Fixes duck typing in form validation to check rules and id

Semantic-Org · Jul 16, 2015 · d2c4547 · d2c4547
1 parent db968a4
commit d2c4547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -13,6 +13,7 @@
 - **Form** - Fixed issue with `minLength[1]` validation not behaving same as `minLength > 2` #2636.
 - **Form** - Form fields will now error when a non-string identifier is used
 - **Form** - Added `doesntContain` and `doesntContainExactly` #
+- **Form** - Fixes errors when a field identifier is named `identifier` #2629
 - **Formatting** - Fixed several source files that had `CR LF` (Windows) line endings #2649
 
 **Additional Bugs**

diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js
@@ -341,7 +341,7 @@ $.fn.form = function(parameters) {
               var
                 keys             = Object.keys(parameters),
                 isLegacySettings = (keys.length > 0)
-                  ? (parameters[keys[0]].identifier !== undefined)
+                  ? (parameters[keys[0]].identifier !== undefined && parameters[keys[0]].rules !== undefined)
                   : false
               ;
               if(isLegacySettings) {