Changeset 1921

Timestamp:

04/14/08 05:46:18 (5 years ago)

Author:

martinkou

Message:

Fixed #1426 : Fixed the error loading fckstyles.xml in servers which cannot return the correct content type header for .xml files.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/classes/fckxml_gecko.js (modified) (1 diff)
• editor/_source/classes/fckxml_ie.js (modified) (1 diff)

FCKeditor/trunk/_whatsnew.html

@@ -42 +42 @@
         <p>
                 Fixed Bugs:</p>
+        <ul>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/768">#768</a>] It is no longer possible
                         for an image to have its width and height defined with both HTML attributes and inline CSS
                         styles in IE.</li>
-        <ul>
-                <li></li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1426">#1426</a>] Fixed the error loading
+                        fckstyles.xml in servers which cannot return the correct content type header for .xml files.</li>
         </ul>
         <h3>

FCKeditor/trunk/editor/_source/classes/fckxml_gecko.js

@@ -33 +33 @@
                 oXmlHttp.send( null ) ;
 
-                if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
+                if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) )
+                {
                         oXml = oXmlHttp.responseXML ;
-                else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 )
-                        oXml = oXmlHttp.responseXML ;
+                        // #1426: Fallback if responseXML isn't set for some
+                        // reason (e.g. improperly configured web server)
+                        if ( !oXml )
+                                oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+                }
                 else
                         oXml = null ;

FCKeditor/trunk/editor/_source/classes/fckxml_ie.js

@@ -41 +41 @@
                 oXmlHttp.send( null ) ;
 
-                if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
+                if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) )
+                {
                         this.DOMDocument = oXmlHttp.responseXML ;
-                else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 )
-                {
-                        this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ;
-                        this.DOMDocument.async = false ;
-                        this.DOMDocument.resolveExternals = false ;
-                        this.DOMDocument.loadXML( oXmlHttp.responseText ) ;
+
+                        // #1426: Fallback if responseXML isn't set for some
+                        // reason (e.g. improperly configured web server)
+                        if ( !this.DOMDocument )
+                        {
+                                this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ;
+                                this.DOMDocument.async = false ;
+                                this.DOMDocument.resolveExternals = false ;
+                                this.DOMDocument.loadXML( oXmlHttp.responseText ) ;
+                        }
                 }
                 else