Changeset 2108

Timestamp:

2008-06-23 12:00:43 (5 months ago)

Author:

martinkou

Message:

Fixed #2296 : Fixed permission denied error on clicking on files in the file browser.

Location:

FCKeditor/trunk

Files:

• editor/filemanager/browser/default/browser.html (modified) (1 diff)
• editor/filemanager/browser/default/frmactualfolder.html (modified) (1 diff)
• editor/filemanager/browser/default/js/common.js (modified) (1 diff)
• editor/filemanager/browser/default/js/fckxml.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/browser/default/browser.html

@@ -44 +44 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/trunk/editor/filemanager/browser/default/frmactualfolder.html

@@ -42 +42 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/trunk/editor/filemanager/browser/default/js/common.js

@@ -37 +37 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/trunk/editor/filemanager/browser/default/js/fckxml.js

@@ -62 +62 @@
                         if ( oXmlHttp.readyState == 4 )
                         {
-                                if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) || oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null )
+                                var oXml ;
+                                try
+                                {
+                                        // this is the same test for an FF2 bug as in fckxml_gecko.js
+                                        // but we've moved the responseXML assignment into the try{}
+                                        // so we don't even have to check the return status codes.
+                                        var test = oXmlHttp.responseXML.firstChild ;
+                                        oXml = oXmlHttp.responseXML ;
+                                }
+                                catch ( e )
+                                {
+                                        try
+                                        {
+                                                oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+                                        }
+                                        catch ( e ) {}
+                                }
+
+                                if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
                                 {
                                         alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
@@ -71 +89 @@
                                 }
 
-                                oFCKXml.DOMDocument = oXmlHttp.responseXML ;
+                                oFCKXml.DOMDocument = oXml ;
                                 asyncFunctionPointer( oFCKXml ) ;
                         }

FCKeditor/trunk/_whatsnew.html

@@ -75 +75 @@
                         key will now have the default browser behavior if TabSpaces=0. It will move the
                         focus out of the editor (expect on Safari).</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2296">#2296</a>] Fixed permission denied error
+                        on clicking on files in the file browser.</li>
         </ul>
         <p>