Changeset 2123 for FCKeditor/branches

Timestamp:

2008-06-24 12:06:29 (5 months ago)

Author:

martinkou

Message:

Merged all changes in trunk up to r2121.

Location:

FCKeditor/branches/features/new_samples

Files:

• _dev/build_release.bat (modified) (1 diff)
• _dev/css_compression.txt (copied) (copied from FCKeditor/trunk/_dev/css_compression.txt)
• _dev/domain_fix_template.js (modified) (2 diffs)
• editor/dialog/common/fck_dialog_common.js (modified) (1 diff)
• editor/dialog/fck_replace.html (modified) (1 diff)
• editor/fckeditor.html (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/browser/default/js/fckxml.js (modified) (2 diffs)
• editor/filemanager/connectors/asp/basexml.asp (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)
• editor/js/fckadobeair.js (modified) (1 diff)
• editor/lang/it.js (modified) (5 diffs)
• editor/lang/_translationstatus.txt (modified) (1 diff)
• editor/plugins/dragresizetable/fckplugin.js (modified) (4 diffs)
• editor/_source/classes/fckdomrange.js (modified) (1 diff)
• editor/_source/classes/fckeditingarea.js (modified) (1 diff)
• editor/_source/classes/fckenterkey.js (modified) (2 diffs)
• editor/_source/classes/fckiecleanup.js (modified) (1 diff)
• editor/_source/commandclasses/fckfitwindow.js (modified) (1 diff)
• editor/_source/fckeditorapi.js (modified) (2 diffs)
• editor/_source/internals/fckbrowserinfo.js (modified) (3 diffs)
• editor/_source/internals/fckconfig.js (modified) (1 diff)
• editor/_source/internals/fckdebug_empty.js (copied) (copied from FCKeditor/trunk/editor/_source/internals/fckdebug_empty.js)
• editor/_source/internals/fckdebug.js (modified) (1 diff)
• editor/_source/internals/fckdialog.js (modified) (2 diffs)
• editor/_source/internals/fckdocumentprocessor.js (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (4 diffs)
• editor/_source/internals/fck_ie.js (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (2 diffs)
• editor/_source/internals/fckselection_gecko.js (modified) (2 diffs)
• editor/_source/internals/fckselection_ie.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)
• _samples/sample.css (modified) (3 diffs)
• _whatsnew_history.html (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/branches/features/new_samples/_dev/build_release.bat

@@ -26 +26 @@
 
 :: Update this variable for each new release.
-SET RELEASER_VERSION=2.6.1 (SVN)
+SET RELEASER_VERSION=2.6.3 (SVN)
 
 CLS

FCKeditor/branches/features/new_samples/_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/branches/features/new_samples/editor/dialog/common/fck_dialog_common.js

@@ -60 +60 @@
         return ( prefix || '' ) + 'common/fck_dialog_common.css' ;      // @Packager.RemoveLine
         /* @Packager.RemoveLine
-        // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
+        // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
         return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ;
         @Packager.RemoveLine */

FCKeditor/branches/features/new_samples/editor/dialog/fck_replace.html

@@ -60 +60 @@
 GetNextNonEmptyTextNode = function( node, stopNode )
 {
-        var node ;
-        while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 ) ;
+        while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 )
+                1 ;
         return node ;
 }

FCKeditor/branches/features/new_samples/editor/fckeditor.html

@@ -104 +104 @@
 LoadScript( '_source/internals/fckconfig.js' ) ;
 
-LoadScript( '_source/internals/fckdebug.js' ) ;
+LoadScript( '_source/internals/fckdebug_empty.js' ) ;
 LoadScript( '_source/internals/fckdomtools.js' ) ;
 LoadScript( '_source/internals/fcktools.js' ) ;
@@ -238 +238 @@
 FCKConfig_PreProcess() ;
 
-var FCK_InternalCSS                     = FCKConfig.FullBasePath + 'css/fck_internal.css' ;                                     // @Packager.RemoveLine
-var FCK_ShowTableBordersCSS     = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;       // @Packager.RemoveLine
+// Load the full debug script.
+if ( FCKConfig.Debug )
+        LoadScript( '_source/internals/fckdebug.js' ) ;
+
+        </script>
+        <script type="text/javascript">
+
+var FCK_InternalCSS                     = FCKConfig.BasePath + 'css/fck_internal.css' ;                                 // @Packager.RemoveLine
+var FCK_ShowTableBordersCSS     = FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;   // @Packager.RemoveLine
 /* @Packager.RemoveLine
-// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
-var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
-var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
+// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
+var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
+var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
 @Packager.RemoveLine */
 

FCKeditor/branches/features/new_samples/editor/filemanager/browser/default/browser.html

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

FCKeditor/branches/features/new_samples/editor/filemanager/browser/default/frmactualfolder.html

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

FCKeditor/branches/features/new_samples/editor/filemanager/browser/default/js/common.js

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

FCKeditor/branches/features/new_samples/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/branches/features/new_samples/editor/filemanager/connectors/asp/basexml.asp

@@ -31 +31 @@
 
         ' Set the response format.
+        Response.CodePage               = 65001
         Response.CharSet                = "UTF-8"
         Response.ContentType    = "text/xml"

FCKeditor/branches/features/new_samples/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/branches/features/new_samples/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/branches/features/new_samples/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/branches/features/new_samples/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 ) {}
+                $__html_reply__ = '<script type="text/javascript">';
 
-                // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-                d = d.replace( /.*?(?:\\.|$)/, "" ) ;
+                // 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;}}})();";
 
-                if ( d.length == 0 )
-                        break ;         // It was not able to detect the domain.
-
-                try
-                {
-                        document.domain = d ;
-                }
-                catch (e)
-                {
-                        break ;
-                }
-        }
-})() ;
+                $__html_reply__ = $__html_reply__ + '\
         window.parent.OnUploadCompleted(' + #errorNumber + ',"'
                 + string_replace(#fileUrl, -find='"', -replace='\\"') + '","'

FCKeditor/branches/features/new_samples/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/branches/features/new_samples/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 ) . '") ;' ;