fixed #438

amsul · Jul 6, 2014 · dee2e4d · dee2e4d
1 parent 4041628
commit dee2e4d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#476](https://github.com/amsul/pickadate.js/issues/476): Fixed the `main` files in `bower.json`.
 - [#451](https://github.com/amsul/pickadate.js/issues/451): Added French accessibility labels.
 - [#442](https://github.com/amsul/pickadate.js/issues/442): Fixed flickering on webkit browsers.
+- [#438](https://github.com/amsul/pickadate.js/issues/438): Fixed adding an ID to the hidden element to remain unique.
 
 
 ## 3.5.2

diff --git a/_docs/CHANGELOG.md b/_docs/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#476]({%= pkg.bugs %}/476): Fixed the `main` files in `bower.json`.
 - [#451]({%= pkg.bugs %}/451): Added French accessibility labels.
 - [#442]({%= pkg.bugs %}/442): Fixed flickering on webkit browsers.
+- [#438]({%= pkg.bugs %}/438): Fixed adding an ID to the hidden element to remain unique.
 
 
 ## 3.5.2

diff --git a/lib/compressed/picker.js b/lib/compressed/picker.js
diff --git a/lib/picker.js b/lib/picker.js
@@ -710,11 +710,9 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
       */
     function prepareElementHidden() {
 
-        var id,
-            name
+        var name
 
         if ( SETTINGS.hiddenName === true ) {
-            id = ELEMENT.name + '_hidden'
             name = ELEMENT.name
             ELEMENT.name = ''
         }
@@ -723,17 +721,18 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                 typeof SETTINGS.hiddenPrefix == 'string' ? SETTINGS.hiddenPrefix : '',
                 typeof SETTINGS.hiddenSuffix == 'string' ? SETTINGS.hiddenSuffix : '_submit'
             ]
-            name = id = name[0] + ELEMENT.name + name[1]
+            name = name[0] + ELEMENT.name + name[1]
         }
 
         P._hidden = $(
             '<input ' +
             'type=hidden ' +
 
-            // Create the name and ID by using the original
-            // input’s with a prefix and suffix.
+            // Create the name using the original input’s with a prefix and suffix.
             'name="' + name + '"' +
-            'id="' + id + '"' +
+
+            // Create the ID using the original input’s; only if it has one.
+            (ELEMENT.id ? 'id="' + ELEMENT.id + '_hidden"' : '') +
 
             // If the element has a value, set the hidden value as well.
             (