Author: andrei_exadel Date: 2008-03-24 07:37:16 -0400 (Mon, 24 Mar 2008) New Revision: 7106 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: RF-2686 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss =================================================================== --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-24 11:24:10 UTC (rev 7105) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-24 11:37:16 UTC (rev 7106) @@ -7,7 +7,7 @@ <f:verbatim><![CDATA[ -.upload_list_overflow{overflow : auto; overflow-x : hidden;} +.upload_list_overflow{overflow : hidden;} .upload_name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;} .upload_del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;} .upload_scroll{ width : 10px; text-align : center;} Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-24 11:24:10 UTC (rev 7105) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-24 11:37:16 UTC (rev 7106) @@ -73,12 +73,12 @@ [ new E('td',{'className':function (context) { return 'upload_font upload_name upload_table_td ' + Richfaces.evalMacro("className", context);}}, [ - new E('div',{'className':'upload_name_padding','style':function (context) {return 'overflow-x : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}}, + new E('div',{'className':'upload_name_padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}}, [ new ET(function (context) { return Richfaces.evalMacro("fileName", context)}) ]), new E('div',{ }), - new E('div',{'className':'upload_name_padding','style':function (context) {return 'overflow-x : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}}, + new E('div',{'className':'upload_name_padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}}, [ new ET(function (context) { return Richfaces.evalMacro("label", context)}) ]) @@ -440,7 +440,12 @@ }, initFileEntryWidth: function () { - var w = this.element.getWidth() - 115; + var w; + if (this.element.getWidth() != 0) { + w = this.element.getWidth() - 115; + } else { + w = this.element.style.width - 115; + } this.fileEntryWidth = w; var progressW = this._progressBar.style.width; if (progressW == "") { progressW = 200; }