summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorning.zhang2012-06-20 06:36:35 (EDT)
committer dgao2012-06-20 06:36:35 (EDT)
commit1eded2855da883048a5467d18e49559c1a0f8a36 (patch)
tree01d7c67335d6c1393ccd77020f782acd9ab260b2
parent4b7c825e15508f3a2682cb1333c0934561ecdf58 (diff)
downloadorg.eclipse.birt-1eded2855da883048a5467d18e49559c1a0f8a36.zip
org.eclipse.birt-1eded2855da883048a5467d18e49559c1a0f8a36.tar.gz
org.eclipse.birt-1eded2855da883048a5467d18e49559c1a0f8a36.tar.bz2
Fixed an issue when previewing reports, which is deployed in the weblogic server, using a webkit based browser.
-rw-r--r--viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/core/BirtCommunicationManager.js4
-rw-r--r--viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/lib/prototype.js4
-rw-r--r--viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/CascadingParameter.js4
-rw-r--r--viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/ProgressBar.js6
4 files changed, 9 insertions, 9 deletions
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/core/BirtCommunicationManager.js b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/core/BirtCommunicationManager.js
index c90d115..ed0ec28 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/core/BirtCommunicationManager.js
+++ b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/core/BirtCommunicationManager.js
@@ -56,9 +56,9 @@ BirtCommunicationManager.prototype =
//workaround for Bugzilla Bug 144598. Add request header "Connection" as "keep-alive"
var myAjax = new Ajax.Request( birtSoapRequest.getURL( ), { method: 'post', postBody: xmlDoc,
+ contentType: 'text/xml; charset=UTF-8',
onSuccess: this.responseHandler, onFailure: this.invalidResponseHandler,
- requestHeaders: ['Content-Type', 'text/xml; charset=UTF-8', 'SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
-
+ requestHeaders: ['SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
birtSoapRequest.reset( );
},
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/lib/prototype.js b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/lib/prototype.js
index e9ccd3c..bea0d41 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/lib/prototype.js
+++ b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/lib/prototype.js
@@ -603,6 +603,7 @@ Ajax.Base.prototype = {
this.options = {
method: 'post',
asynchronous: true,
+ contentType: 'application/x-www-form-urlencoded',
parameters: ''
}
Object.extend(this.options, options || {});
@@ -665,8 +666,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
'X-Prototype-Version', Prototype.Version];
if (this.options.method == 'post') {
- requestHeaders.push('Content-type',
- 'application/x-www-form-urlencoded');
+ requestHeaders.push('Content-type', this.options.contentType);
/* Force "Connection: close" for Mozilla browsers to work around
* a bug where XMLHttpReqeuest sends an incorrect Content-length
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/CascadingParameter.js b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/CascadingParameter.js
index 1f41579..45c7ef3 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/CascadingParameter.js
+++ b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/CascadingParameter.js
@@ -147,9 +147,9 @@ CascadingParameter.prototype =
//workaround for Bugzilla Bug 144598. Add request header "Connection" as "keep-alive"
var myAjax = new Ajax.Request( birtSoapRequest.getURL( ), { method: 'post', postBody: birtSoapRequest.__xml_document,
+ contentType: 'text/xml; charset=utf-8',
onSuccess: this.responseHandler, onFailure: this.invalidResponseHandler,
- requestHeaders: ['Content-type', 'text/xml; charset=utf-8', 'SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
-
+ requestHeaders: ['SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
birtSoapRequest.reset( );
},
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/ProgressBar.js b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/ProgressBar.js
index 3f0b653..fef4d82 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/ProgressBar.js
+++ b/viewer/org.eclipse.birt.report.viewer/birt/webcontent/birt/ajax/taglib/ProgressBar.js
@@ -250,9 +250,9 @@ ProgressBar.prototype =
if ( !birtSoapRequest.getURL( ) ) return;
var myAjax = new Ajax.Request( birtSoapRequest.getURL( ), { method: 'post', postBody: birtSoapRequest.__xml_document,
- onSuccess: this.responseHandler, onFailure: this.invalidResponseHandler,
- requestHeaders: ['Content-type', 'text/xml; charset=utf-8', 'SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
-
+ contentType: 'text/xml; charset=utf-8',
+ onSuccess: this.responseHandler, onFailure: this.invalidResponseHandler,
+ requestHeaders: ['SOAPAction', '""', 'request-type', 'SOAP', 'Connection', 'keep-alive' ] } );
birtSoapRequest.reset( );
}
},