You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/01/05 19:54:11 UTC
svn commit: r1055580 -
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
Author: pedro
Date: Wed Jan 5 18:54:11 2011
New Revision: 1055580
URL: http://svn.apache.org/viewvc?rev=1055580&view=rev
Log:
Hack to IE when updating the status text.
Bug and hack description from http://domscripting.com/blog/display/99 :
"innerHTML can cause some problems, particularly in Internet Explorer. If you use innerHTML to add or update form elements, all sorts of screwiness can occur. Sometimes the data from the newly added elements won’t be included when the form is submitted to the server."
Issue: WICKET-3307
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js (contents, props changed)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js?rev=1055580&r1=1055579&r2=1055580&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js Wed Jan 5 18:54:11 2011
@@ -28,7 +28,7 @@ Wicket.WUPB.prototype = {
this.displayprogress = fileupload && fileupload.value && fileupload.value != '';
}
if(this.displayprogress) {
- Wicket.$(def.statusid).innerHTML='Upload starting...';
+ this.setStatus('Upload starting...');
Wicket.$(def.barid).firstChild.firstChild.style.width='0%';
Wicket.$(def.statusid).style.display='block';
@@ -36,6 +36,16 @@ Wicket.WUPB.prototype = {
}
},
+ setStatus : function(status){
+ var label = document.createElement("label");
+ label.innerHTML = status;
+ var oldLabel = Wicket.$(this.def.statusid).firstChild;
+ if( oldLabel != null){
+ Wicket.$(this.def.statusid).removeChild(oldLabel);
+ }
+ Wicket.$(this.def.statusid).appendChild(label);
+ },
+
start : function(){
if(this.displayprogress) {
this.scheduleUpdate();
@@ -77,12 +87,11 @@ Wicket.WUPB.prototype = {
if ((timeRemaining != "") && (completed_upload_size != 0)) {
- Wicket.$(this.def.barid).firstChild.firstChild.style.width = progressPercent
- + '%';
- Wicket.$(this.def.statusid).innerHTML = progressPercent
- + '% finished, ' + completed_upload_size + ' of '
- + total_upload_size + ' at ' + transferRate + "; "
- + timeRemaining;
+ Wicket.$(this.def.barid).firstChild.firstChild.style.width = progressPercent + '%';
+ this.setStatus( progressPercent
+ + '% finished, ' + completed_upload_size + ' of '
+ + total_upload_size + ' at ' + transferRate + "; "
+ + timeRemaining );
}
Propchange: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 5 18:54:11 2011
@@ -0,0 +1,4 @@
+/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:659248,661657,662360,677853,688992,698612,700502,701879,725634,760368,769440,772653,786424,790850
+/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:806204-1055573
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760352