Changeset 2059

Timestamp:

2008-06-12 11:52:09 (22 months ago)

Author:

fredck

Message:

Fixed #2115 : Fixed JavaScript (permission denied) error in Firefox when file has been uploaded.

Location:

FCKeditor/trunk

Files:

• _dev/domain_fix_template.js (modified) (2 diffs)
• 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/connectors/asp/io.asp (modified) (1 diff)
• editor/filemanager/connectors/cfm/cf5_upload.cfm (modified) (1 diff)
• editor/filemanager/connectors/cfm/cf_io.cfm (modified) (1 diff)
• editor/filemanager/connectors/lasso/upload.lasso (modified) (1 diff)
• editor/filemanager/connectors/perl/commands.pl (modified) (1 diff)
• editor/filemanager/connectors/php/io.php (modified) (1 diff)
• editor/filemanager/connectors/py/fckoutput.py (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/_dev/domain_fix_template.js

@@ -26 +26 @@
 // ### Minified Script (must be updated on changes in the original below).
 
-(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
+(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 
 // ### Original Script.
@@ -39 +39 @@
                 try
                 {
-                        var test = window.top.opener.document.domain ;
+                        var test = window.parent.document.domain ;
                         break ;
                 }

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

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

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

@@ -41 +41 @@
                         break ;
                 }
-                catch( e ) {}
+                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

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

FCKeditor/trunk/editor/filemanager/connectors/asp/io.asp

@@ -225 +225 @@
         Response.Clear
         Response.Write "<script type=""text/javascript"">"
-        Response.Write "(function()"
-        Response.Write "{"
-        Response.Write "var d = document.domain ;"
-
-        Response.Write " while ( true )"
-        Response.Write "        {"
-        ' Test if we can access a parent property.
-        Response.Write "                try"
-        Response.Write "                {"
-        Response.Write "                        var test = window.top.opener.document.domain ;"
-        Response.Write "                        break ;"
-        Response.Write "                }"
-        Response.Write "                catch( e ) {}"
-
-        ' Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-        Response.Write "                d = d.replace( /.*?(?:\.|$)/, '' ) ;"
-
-        Response.Write "                if ( d.length == 0 )"
-        ' It was not able to detect the domain.
-        Response.Write "                        break ;"
-        Response.Write ""
-        Response.Write "                try"
-        Response.Write "                {"
-        Response.Write "                        document.domain = d ;"
-        Response.Write "                }"
-        Response.Write "                catch (e)"
-        Response.Write "                {"
-        Response.Write "                        break ;"
-        Response.Write "                }"
-        Response.Write "        }"
-        Response.Write "})() ;"
+        ' Minified version of the document.domain automatic fix script (#1919). 
+        ' The original script can be found at _dev/domain_fix_template.js
+        Response.Write "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();"
 
         Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"

FCKeditor/trunk/editor/filemanager/connectors/cfm/cf5_upload.cfm

@@ -48 +48 @@
         {
                 WriteOutput('<script type="text/javascript">');
-                WriteOutput("(function()"&
-"{"&
-"       var d = document.domain ;"&
-""&
-"       while ( true )"&
-"       {"&
-                // Test if we can access a parent property.
-"               try"&
-"               {"&
-"                       var test = window.top.opener.document.domain ;"&
-"                       break ;"&
-"               }"&
-"               catch( e ) {}"&
-""&
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-"               d = d.replace( /.*?(?:\.|$)/, '' ) ;"&
-""&
-"               if ( d.length == 0 )"&
-                        // It was not able to detect the domain.
-"                       break ;"&
-""&
-"               try"&
-"               {"&
-"                       document.domain = d ;"&
-"               }"&
-"               catch (e)"&
-"               {"&
-"                       break ;"&
-"               }"&
-"       }"&
-"})() ;");
-
+                // Minified version of the document.domain automatic fix script (#1919). 
+                // The original script can be found at _dev/domain_fix_template.js
+                WriteOutput("(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();");
                 WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
                 WriteOutput('</script>');

FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_io.cfm

@@ -266 +266 @@
         <cfargument name="customMsg" required="false" type="String" default="">
 
+        <!--- Minified version of the document.domain automatic fix script (#1919). 
+        The original script can be found at _dev/domain_fix_template.js --->
         <cfoutput>
 <script type="text/javascript">
-(function()
-{
-        var d = document.domain ;
-
-        while ( true )
-        {
-                // Test if we can access a parent property.
-                try
-                {
-                        var test = window.top.opener.document.domain ;
-                        break ;
-                }
-                catch( e ) {}
-
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
-                if ( d.length == 0 )
-                        break ;         // It was not able to detect the domain.
-
-                try
-                {
-                        document.domain = d ;
-                }
-                catch (e)
-                {
-                        break ;
-                }
-        }
-})() ;
-
-                        window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
-                </script>
+(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
+window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
+</script>
         </cfoutput>
         <cfabort>

FCKeditor/trunk/editor/filemanager/connectors/lasso/upload.lasso

@@ -75 +75 @@
                 -description='Sets the HTML response for the FCKEditor Quick Upload feature.'
         );
-                $__html_reply__ = '\
-<script type="text/javascript">
-(function()
-{
-        var d = document.domain ;
-
-        while ( true )
-        {
-                // Test if we can access a parent property.
-                try
-                {
-                        var test = window.top.opener.document.domain ;
-                        break ;
-                }
-                catch( e ) {}
-
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                d = d.replace( /.*?(?:\\.|$)/, "" ) ;
-
-                if ( d.length == 0 )
-                        break ;         // It was not able to detect the domain.
-
-                try
-                {
-                        document.domain = d ;
-                }
-                catch (e)
-                {
-                        break ;
-                }
-        }
-})() ;
+                
+                $__html_reply__ = '<script type="text/javascript">';
+                
+                // Minified version of the document.domain automatic fix script (#1919). 
+                // The original script can be found at _dev/domain_fix_template.js
+                // Note: in Lasso replace \ with \\
+                $__html_reply__ = $__html_reply__ + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();";
+                
+                $__html_reply__ = $__html_reply__ + '\
         window.parent.OnUploadCompleted(' + #errorNumber + ',"'
                 + string_replace(#fileUrl, -find='"', -replace='\\"') + '","'

FCKeditor/trunk/editor/filemanager/connectors/perl/commands.pl

@@ -170 +170 @@
         local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;
 
+        # Minified version of the document.domain automatic fix script (#1919). 
+        # The original script can be found at _dev/domain_fix_template.js
+        # Note: in Perl replace \ with \\ and $ with \$
         print <<EOF;
 Content-type: text/html
 
 <script type="text/javascript">
-// Automatically detect the correct document.domain (#1919).
-(function()
-{
-        var d = document.domain ;
-
-        while ( true )
-        {
-                // Test if we can access a parent property.
-                try
-                {
-                        var test = window.top.opener.document.domain ;
-                        break ;
-                }
-                catch( e ) {}
-
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                d = d.replace( /.*?(?:\\.|\$)/, '' ) ;
-
-                if ( d.length == 0 )
-                        break ;         // It was not able to detect the domain.
-
-                try
-                {
-                        document.domain = d ;
-                }
-                catch (e)
-                {
-                        break ;
-                }
-        }
-})() ;
+(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|\$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 
 EOF

FCKeditor/trunk/editor/filemanager/connectors/php/io.php

@@ -280 +280 @@
 function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
 {
+        // Minified version of the document.domain automatic fix script (#1919).
+        // The original script can be found at _dev/domain_fix_template.js
         echo <<<EOF
 <script type="text/javascript">
-(function()
-{
-        var d = document.domain ;
-
-        while ( true )
-        {
-                // Test if we can access a parent property.
-                try
-                {
-                        var test = window.top.opener.document.domain ;
-                        break ;
-                }
-                catch( e ) {}
-
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
-                if ( d.length == 0 )
-                        break ;         // It was not able to detect the domain.
-
-                try
-                {
-                        document.domain = d ;
-                }
-                catch (e)
-                {
-                        break ;
-                }
-        }
-})() ;
-
+(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 EOF;
+
         $rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
         echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;

FCKeditor/trunk/editor/filemanager/connectors/py/fckoutput.py

@@ -102 +102 @@
                 self.setHttpHeaders("text/html")
                 "This is the function that sends the results of the uploading process"
-                return """<script type="text/javascript">
-                        (function()
-                        {
-                                var d = document.domain ;
-
-                                while ( true )
-                                {
-                                        // Test if we can access a parent property.
-                                        try
-                                        {
-                                                var test = window.top.opener.document.domain ;
-                                                break ;
-                                        }
-                                        catch( e ) {}
-
-                                        // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                                        d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
-                                        if ( d.length == 0 )
-                                                break ;         // It was not able to detect the domain.
-
-                                        try
-                                        {
-                                                document.domain = d ;
-                                        }
-                                        catch (e)
-                                        {
-                                                break ;
-                                        }
-                                }
-                        })() ;
+                
+                "Minified version of the document.domain automatic fix script (#1919)."
+                "The original script can be found at _dev/domain_fix_template.js"
+                return """<script type="text/javascript">                       
+                        (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 
                         window.parent.OnUploadCompleted(%(errorNumber)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s");

FCKeditor/trunk/_whatsnew.html

@@ -130 +130 @@
                         placeholder was not being properly displayed in the compressed distribution version
                         and nightly builds.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2115">#2115</a>] Fixed 
+                        JavaScript (permission denied) error in Firefox when file has been uploaded.</li>
         </ul>
         <h3>