Show
Ignore:
Timestamp:
2008-06-24 12:06:29 (7 months ago)
Author:
martinkou
Message:

Merged all changes in trunk up to r2121.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • FCKeditor/branches/features/new_samples/editor/filemanager/connectors/cfm/cf_io.cfm

    r1797 r2123  
    266266        <cfargument name="customMsg" required="false" type="String" default=""> 
    267267 
     268        <!--- Minified version of the document.domain automatic fix script (#1919). 
     269        The original script can be found at _dev/domain_fix_template.js ---> 
    268270        <cfoutput> 
    269271<script type="text/javascript"> 
    270 (function() 
    271 { 
    272         var d = document.domain ; 
    273  
    274         while ( true ) 
    275         { 
    276                 // Test if we can access a parent property. 
    277                 try 
    278                 { 
    279                         var test = window.top.opener.document.domain ; 
    280                         break ; 
    281                 } 
    282                 catch( e ) {} 
    283  
    284                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ... 
    285                 d = d.replace( /.*?(?:\.|$)/, '' ) ; 
    286  
    287                 if ( d.length == 0 ) 
    288                         break ;         // It was not able to detect the domain. 
    289  
    290                 try 
    291                 { 
    292                         document.domain = d ; 
    293                 } 
    294                 catch (e) 
    295                 { 
    296                         break ; 
    297                 } 
    298         } 
    299 })() ; 
    300  
    301                         window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" ); 
    302                 </script> 
     272(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;}}})(); 
     273window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" ); 
     274</script> 
    303275        </cfoutput> 
    304276        <cfabort>