summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2016-03-24 10:22:34 +0100
committerFabio Bas <ctrlaltca@gmail.com>2016-03-24 10:22:34 +0100
commitaf129adce0014fc7c71e335804fef4148a057290 (patch)
tree738ef94d671389078924576c589a81e90aaa51b8
parent506aa35bd753d3560df8031cff136a1a90d4db76 (diff)
Fix #540
-rw-r--r--HISTORY1
-rwxr-xr-xframework/Web/Javascripts/source/prado/activefileupload/activefileupload.js2
2 files changed, 3 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index 845ccedb..ca492cd6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8,6 +8,7 @@ BUG: Fix callback loading for dynamically created JuiControls (ctrlaltca)
BUG: Fix ClientSide.RequestTimeOut on active controls (ctrlaltca)
BUG: Fix error reporting for not-existing property set on TJuiControl (ctrlaltca)
BUG: TJuiDialog: avoid "cannot call methods on dialog prior to initialization" error (ctrlaltca)
+BUG: Issue #540 - Fix TActiveFileUpload on IE11 (ctrlaltca)
ENH: Issue #569 - Improved TJavascriptLogger / browser console logging of errors (ctrlaltca)
ENH: Applied some misc optimizations to class serialization (ctrlaltca)
ENH: Intercept fatal errors using register_shutdown_function (ctrlaltca)
diff --git a/framework/Web/Javascripts/source/prado/activefileupload/activefileupload.js b/framework/Web/Javascripts/source/prado/activefileupload/activefileupload.js
index 15998278..04c02ac9 100755
--- a/framework/Web/Javascripts/source/prado/activefileupload/activefileupload.js
+++ b/framework/Web/Javascripts/source/prado/activefileupload/activefileupload.js
@@ -20,6 +20,8 @@ Prado.WebUI.TActiveFileUpload = jQuery.klass(Prado.WebUI.Control,
},
fileChanged : function(){
+ // ie11 fix
+ if(this.input.value=='') return;
// show the upload indicator, and hide the complete and error indicators (if they areSn't already).
this.flag.value = '1';
this.complete.style.display = 'none';