From 773a9410c518d5dde2840c3cb8b7802b690b8aaa Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 28 Mar 2018 18:20:11 +0200
Subject: [PATCH] Make sure we are not disabling submit buttons if upload is
 not triggered, to avoid disabled submit buttons after failure.

---
 api/js/etemplate/et2_widget_file.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/api/js/etemplate/et2_widget_file.js b/api/js/etemplate/et2_widget_file.js
index a9ca42f34b..1d4c3f89e7 100644
--- a/api/js/etemplate/et2_widget_file.js
+++ b/api/js/etemplate/et2_widget_file.js
@@ -409,6 +409,15 @@ var et2_file = (function(){ "use strict"; return et2_inputWidget.extend(
 		{
 			if(this.createStatus(event,file))
 			{
+
+				// Disable buttons
+				this.disabled_buttons = jQuery("input[type='submit'], button")
+					.not("[disabled]")
+					.attr("disabled", true)
+					.addClass('et2_button_ro')
+					.removeClass('et2_clickable')
+					.css('cursor', 'default');
+			
 				// Actually start uploading
 				this.resumable.upload();
 			}
@@ -443,13 +452,6 @@ var et2_file = (function(){ "use strict"; return et2_inputWidget.extend(
 		// Hide any previous errors
 		this.hideMessage();
 
-		// Disable buttons
-		this.disabled_buttons = jQuery("input[type='submit'], button")
-				.not("[disabled]")
-				.attr("disabled", true)
-				.addClass('et2_button_ro')
-				.removeClass('et2_clickable')
-				.css('cursor', 'default');
 
 		event.data = this;