Skip to content

Commit a483825

Browse files
authored
Merge pull request #767 from lcreid/dont-define-actiontext-helper
Dont define actiontext helper
2 parents 89e5b02 + c13ad56 commit a483825

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# yarn lockfile v1
33

44

5-
lastUpdateCheck 1761241670837
5+
lastUpdateCheck 1761521327441

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,8 +1732,8 @@ Generated HTML:
17321732
<input class="form-control" id="address_street" name="address[street]" type="text" value="Foo">
17331733
</div>
17341734
<div class="mb-3">
1735-
<label class="form-label" for="address_city">City</label>
1736-
<input class="form-control" id="address_city" name="address[city]" type="text">
1735+
<label class="form-label required" for="address_city">City</label>
1736+
<input class="form-control" id="address_city" name="address[city]" required="required" type="text">
17371737
</div>
17381738
<div class="mb-3">
17391739
<label class="form-label" for="address_state">State</label>
139 Bytes
Loading

lib/bootstrap_form/form_builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class FormBuilder < ActionView::Helpers::FormBuilder
3232
include BootstrapForm::Inputs::PhoneField
3333
include BootstrapForm::Inputs::RadioButton
3434
include BootstrapForm::Inputs::RangeField
35-
include BootstrapForm::Inputs::RichTextArea
35+
include BootstrapForm::Inputs::RichTextArea if Gem.loaded_specs["actiontext"]
3636
include BootstrapForm::Inputs::SearchField
3737
include BootstrapForm::Inputs::Select
3838
include BootstrapForm::Inputs::Submit

0 commit comments

Comments
 (0)