Revision

629

Author

jeichorn

Date

2008-06-16 11:34:44 -0700 (Mon, 16 Jun 2008)

Log Message

fix bug #12027 by disabling the workaround code for old buggy versions of opera, version 9.5 works fine

Modified Paths

• trunk/build/package.xml
• trunk/js/HttpClient.js

Diff

--- trunk/build/package.xml	2008-06-16 18:02:34 UTC (rev 628)
+++ trunk/build/package.xml	2008-06-16 18:34:44 UTC (rev 629)
@@ -38,7 +38,7 @@
   <active>yes</active>
  </developer>
  <date>2008-06-16</date>
- <time>11:00:35</time>
+ <time>11:10:42</time>
  <version>
   <release>0.5.6</release>
   <api>0.5.0</api>
@@ -51,7 +51,8 @@
  <notes> * Fix Coding Standard Problems
  * Refactor svn code layout
  * Add support for content-type text/xml #14032
- * Fix combineActions with empty actions #13854</notes>
+ * Fix combineActions with empty actions #13854
+ * Fix Javascript in HTML_AJAX.replace target document doesn&apos;t get executed in Opera. #14144 put opera on the ie codepath not the gecko codepath</notes>
  <contents>
   <dir baseinstalldir="HTML" name="/">
    <file baseinstalldir="HTML" md5sum="a3b0a23ef6b8ddb25f77f94b0de6fca4" name="AJAX/Action.php" role="php">
@@ -283,7 +284,7 @@
    <file baseinstalldir="HTML" md5sum="c773945366e99a24bec77bf50389de9f" name="js/HTML_AJAX_lite.js" role="data">
     <tasks:replace from="@package_version@" to="version" type="package-info" />
    </file>
-   <file baseinstalldir="HTML" md5sum="860f4ae7f074ef2678de827cf53105b7" name="js/HttpClient.js" role="data">
+   <file baseinstalldir="HTML" md5sum="56c2e63cc1d3a2b96b45f840fc9226a2" name="js/HttpClient.js" role="data">
     <tasks:replace from="@package_version@" to="version" type="package-info" />
    </file>
    <file baseinstalldir="HTML" md5sum="9b58cee23d94f3cf2f417bcc9a7b1d7f" name="js/IframeXHR.js" role="data">
@@ -411,7 +412,8 @@
    <notes> * Fix Coding Standard Problems
  * Refactor svn code layout
  * Add support for content-type text/xml #14032
- * Fix combineActions with empty actions #13854</notes>
+ * Fix combineActions with empty actions #13854
+ * Fix Javascript in HTML_AJAX.replace target document doesn&apos;t get executed in Opera. #14144 put opera on the ie codepath not the gecko codepath</notes>
   </release>
  </changelog>
 </package>

--- trunk/js/HttpClient.js	2008-06-16 18:02:34 UTC (rev 628)
+++ trunk/js/HttpClient.js	2008-06-16 18:34:44 UTC (rev 629)
@@ -101,16 +101,11 @@
 			}
 			if (this.request.customHeaders && !this.request.customHeaders['Content-Type']) {
 				var content = this.request.getContentType();
-				//opera is stupid for anything but plain text or xml!!
-				if(window.opera && content != 'application/xml')
-				{
-					this.xmlhttp.setRequestHeader('Content-Type','text/plain; charset=utf-8');
-					this.xmlhttp.setRequestHeader('x-Content-Type', content + '; charset=utf-8');
+				var charsetIndex = content.indexOf('; charset=UTF-8');
+				if (charsetIndex == -1) {
+					content += '; charset=UTF-8';
 				}
-				else
-				{
-					this.xmlhttp.setRequestHeader('Content-Type', content +  '; charset=utf-8');
-				}
+				this.xmlhttp.setRequestHeader('Content-Type', content);
 			}
 
 			if (this.request.isAsync) {