Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only remove attachment upload button after trix has initialized #3464

Merged
merged 5 commits into from
Dec 2, 2024
Merged

Only remove attachment upload button after trix has initialized #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74c0b69
Only remove attachment upload button after trix has initialized
iainbeeston Nov 26, 2024
000f88c
Update app/javascript/js/controllers/fields/trix_field_controller.js
Paul-Bob Dec 2, 2024
8d24e64
Merge branch 'main' into patch-19
Paul-Bob Dec 2, 2024
c8c1d08
fix syntax
Paul-Bob Dec 2, 2024
a8bea49
fix disable_attachments logic
Paul-Bob Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/javascript/js/controllers/fields/trix_field_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ export default class extends Controller {
connect() {
if (this.attachmentsDisabledValue) {
// Remove the attachments button
this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
window.addEventListener('trix-initialize', (event) => {
if (event.target === this.editorTarget) {
this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
}
})
}

window.addEventListener('trix-file-accept', (event) => {
Expand Down
8 changes: 4 additions & 4 deletions lib/avo/fields/trix_field.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ def is_action_text?
private

def disable_attachments?(args)
# If we don't have an attachment_key, we disable attachments. There's no point in having
# attachments if we can't store them.
return false if args[:attachment_key].present?
# Return the value of attachments_disabled if explicitly provided
return args[:attachments_disabled] unless args[:attachments_disabled].nil?

args[:attachments_disabled] == true
# Disable attachments if attachment_key is not present
args[:attachment_key].blank?
end
end
end
Expand Down
Loading