FCKeditor 2.6.6

[freeside.git] / httemplate / elements / fckeditor / editor / filemanager / browser / default / browser.html
diff --git a/httemplate/elements/fckeditor/editor/filemanager/browser/default/browser.html b/httemplate/elements/fckeditor/editor/filemanager/browser/default/browser.html

index 8b776a2..d5e773b 100644 (file)
--- a/httemplate/elements/fckeditor/editor/filemanager/browser/default/browser.html
+++ b/httemplate/elements/fckeditor/editor/filemanager/browser/default/browser.html
@@ -1,7 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\r
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"\r
+   "http://www.w3.org/TR/html4/frameset.dtd">\r
  <!--\r
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net\r
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben\r
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben\r
   *\r
   * == BEGIN LICENSE ==\r
   *\r
@@ -24,9 +25,42 @@
  <html>\r
         <head>\r
                 <title>FCKeditor - Resources Browser</title>\r
+               <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\r
                 <link href="browser.css" type="text/css" rel="stylesheet">\r
                 <script type="text/javascript" src="js/fckxml.js"></script>\r
-               <script language="javascript">\r
+               <script type="text/javascript">\r
+// Automatically detect the correct document.domain (#1919).\r
+(function()\r
+{\r
+       var d = document.domain ;\r
+\r
+       while ( true )\r
+       {\r
+               // Test if we can access a parent property.\r
+               try\r
+               {\r
+                       var test = window.opener.document.domain ;\r
+                       break ;\r
+               }\r
+               catch( e )\r
+               {}\r
+\r
+               // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...\r
+               d = d.replace( /.*?(?:\.|$)/, '' ) ;\r
+\r
+               if ( d.length == 0 )\r
+                       break ;         // It was not able to detect the domain.\r
+\r
+               try\r
+               {\r
+                       document.domain = d ;\r
+               }\r
+               catch (e)\r
+               {\r
+                       break ;\r
+               }\r
+       }\r
+})() ;\r
  \r
  function GetUrlParam( paramName )\r
  {\r
@@ -68,6 +102,9 @@ oConnector.SendCommand = function( command, params, callBackFunction )
  \r
         if ( params ) sUrl += '&' + params ;\r
  \r
+       // Add a random salt to avoid getting a cached version of the command execution\r
+       sUrl += '&uuid=' + new Date().getTime() ;\r
+\r
         var oXML = new FCKXml() ;\r
  \r
         if ( callBackFunction )\r
@@ -134,6 +171,15 @@ oIcons.GetIcon = function( fileName )
         else\r
                 return 'default.icon' ;\r
  }\r
+\r
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )\r
+{\r
+       if (errorNumber == "1")\r
+               window.frames['frmUpload'].OnUploadCompleted( errorNumber, customMsg ) ;\r
+       else\r
+               window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;\r
+}\r
+\r
                 </script>\r
         </head>\r
         <frameset cols="150,*" class="Frame" framespacing="3" bordercolor="#f1f1e3" frameborder="1">\r