8000 Improved Bootstrap form theme for hidden fields · HeahDude/symfony@ba5d7f9 · GitHub
[go: up one dir, main page]

Skip to content

Commit ba5d7f9

Browse files
javiereguiluzfabpot
authored andcommitted
Improved Bootstrap form theme for hidden fields
1 parent 3a027ba commit ba5d7f9

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{# Widgets #}
44

55
{% block form_widget_simple -%}
6-
{% if type is not defined or 'file' != type %}
6+
{% if type is not defined or type not in ['file', 'hidden'] %}
77
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
88
{% endif %}
99
{{- parent() -}}

src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"symfony/asset": "~2.7",
2424
"symfony/finder": "~2.3",
25-
"symfony/form": "~2.7,>=2.7.8",
25+
"symfony/form": "~2.7.10|~2.8.3",
2626
"symfony/http-kernel": "~2.3",
2727
"symfony/intl": "~2.3",
2828
"symfony/routing": "~2.2",

src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public function testSingleChoiceExpanded()
664664
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
665665
]
666666
]
667-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
667+
/following-sibling::input[@type="hidden"][@id="name__token"]
668668
]
669669
'
670670
);
@@ -701,7 +701,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
701701
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
702702
]
703703
]
704-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
704+
/following-sibling::input[@type="hidden"][@id="name__token"]
705705
]
706706
'
707707
);
@@ -740,7 +740,7 @@ public function testSingleChoiceExpandedAttributes()
740740
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
741741
]
742742
]
743-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
743+
/following-sibling::input[@type="hidden"][@id="name__token"]
744744
]
745745
'
746746
);
@@ -786,7 +786,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
786786
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
787787
]
788788
]
789-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
789+
/following-sibling::input[@type="hidden"][@id="name__token"]
790790
]
791791
'
792792
);
@@ -822,7 +822,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
822822
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
823823
]
824824
]
825-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
825+
/following-sibling::input[@type="hidden"][@id="name__token"]
826826
]
827827
'
828828
);
@@ -868,7 +868,7 @@ public function testMultipleChoiceExpanded()
868868
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
869869
]
870870
]
871-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
871+
/following-sibling::input[@type="hidden"][@id="name__token"]
872872
]
873873
'
874874
);
@@ -915,7 +915,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
915915
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
916916
]
917917
]
918-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
918+
/following-sibling::input[@type="hidden"][@id="name__token"]
919919
]
920920
'
921921
);
@@ -964,7 +964,7 @@ public function testMultipleChoiceExpandedAttributes()
964964
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
965965
]
966966
]
967-
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
967+
/following-sibling::input[@type="hidden"][@id="name__token"]
968968
]
969969
'
970970
);
@@ -1466,7 +1466,7 @@ public function testHidden()
14661466
'/input
14671467
[@type="hidden"]
14681468
[@name="name"]
1469-
[@class="my&class form-control"]
1469+
[@class="my&class"]
14701470
[@value="foo&bar"]
14711471
'
14721472
);

0 commit comments

Comments
 (0)
0