From b303f16d61f0b2a546c55101ccbf86a5cba52b1b Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 6 Apr 2022 14:45:09 +0200 Subject: [PATCH] Fix broken file widget's accept option caused by Resumable overriding it on initiation --- api/js/etemplate/et2_widget_file.js | 4 ++-- api/js/etemplate/et2_widget_file.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/js/etemplate/et2_widget_file.js b/api/js/etemplate/et2_widget_file.js index 4edd555b4b..b4ccb79978 100644 --- a/api/js/etemplate/et2_widget_file.js +++ b/api/js/etemplate/et2_widget_file.js @@ -114,8 +114,6 @@ var et2_file = /** @class */ (function (_super) { jQuery(span).removeClass('et2_file_spanActive'); } }); - if (this.options.accept) - this.input.attr('accept', this.options.accept); var self = this; // trigger native input upload file if (!this.options.readonly) @@ -132,6 +130,8 @@ var et2_file = /** @class */ (function (_super) { else { // This may be a problem submitting via ajax } + if (this.options.accept) + this.input.attr('accept', this.options.accept); if (this.options.progress) { var widget = this.getRoot().getWidgetById(this.options.progress); if (widget) { diff --git a/api/js/etemplate/et2_widget_file.ts b/api/js/etemplate/et2_widget_file.ts index 1cfbbb433a..5f94355762 100644 --- a/api/js/etemplate/et2_widget_file.ts +++ b/api/js/etemplate/et2_widget_file.ts @@ -198,7 +198,6 @@ export class et2_file extends et2_inputWidget jQuery(span).removeClass('et2_file_spanActive'); } }); - if (this.options.accept) this.input.attr('accept', this.options.accept); let self = this; // trigger native input upload file if (!this.options.readonly) this.span.click(function(){self.input.click()}); @@ -216,6 +215,8 @@ export class et2_file extends et2_inputWidget { // This may be a problem submitting via ajax } + if (this.options.accept) this.input.attr('accept', this.options.accept); + if(this.options.progress) { let widget = this.getRoot().getWidgetById(this.options.progress);