aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2006-12-29 08:53:14 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2006-12-29 08:53:14 +0000
commit035c3d4deff0433324c61643cd1c60e2f1e1783a (patch)
tree82e796aa727c769ba55ddbf5a4c0c2c1f0b14b3b
parent57b772916340bcce0fea96d041284795f2c9bde6 (diff)
downloadvaadin-framework-035c3d4deff0433324c61643cd1c60e2f1e1783a.tar.gz
vaadin-framework-035c3d4deff0433324c61643cd1c60e2f1e1783a.zip
fixed rendering upload form for opera
svn changeset:183/svn branch:toolkit
-rw-r--r--WebContent/themes/default/theme.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/WebContent/themes/default/theme.js b/WebContent/themes/default/theme.js
index df8fbc34dd..e9a8c40f3f 100644
--- a/WebContent/themes/default/theme.js
+++ b/WebContent/themes/default/theme.js
@@ -2084,11 +2084,10 @@ DefaultTheme.prototype.renderUpload = function(renderer,uidl,target,layoutInfo)
// Nasty, but without this the browsers fail
// to create any elements into window.
// TODO import CSS file to get right background-color for IE
- var code="<HTML><BODY STYLE=\" overflow: hidden; border: none; margin: 0px; padding: 0px;background-color: transparent;\"><\/BODY><\/HTML>";
+ var code="<HTML><HEAD><STYLE TYPE=\"text/css\">html,body {overflow: hidden; border: none; margin: 0px; padding: 0px;background: transparent;}</STYLE></HEAD><BODY><\/BODY><\/HTML>";
ifr.document.open();
ifr.document.write(code);
ifr.document.close();
-
// Ok. Now we are ready render the actual upload form and
// inputs.
@@ -2096,10 +2095,10 @@ DefaultTheme.prototype.renderUpload = function(renderer,uidl,target,layoutInfo)
form.setAttribute("action",client.ajaxAdapterServletUrl);
form.setAttribute("method", "post");
form.setAttribute("enctype", "multipart/form-data");
- if (document.all) {
+ if (document.all && !window.opera) {
form = ifr.document.createElement('<form action="'+client.ajaxAdapterServletUrl+'" method="post" enctype="multipart/form-data">');
}
- var upload = theme.createInputElementTo(form, "file");
+ var upload = theme.createInputElementTo(form, "file");
upload.id = varNode.getAttribute("id");
upload.name = varNode.getAttribute("id");
var submit = theme.createInputElementTo(form, "submit");
@@ -2120,7 +2119,7 @@ DefaultTheme.prototype.renderUpload = function(renderer,uidl,target,layoutInfo)
ifr.document.body.appendChild(form);
// Attach event listeners for processing the chencges after upload.
- if (document.all) {
+ if (document.all && !window.opera) {
iframe.onreadystatechange = function() {
if (iframe.readyState == "complete") {
iframe.onreadystatechange = null;