Ticket #1622: 1622_FCKeditor.patch

editor/_source/internals/fcktools_gecko.js

@@ -40 +40 @@
 // Appends a CSS file to a document.
 FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
 {
-        var e = documentElement.createElement( 'LINK' ) ;
-        e.rel   = 'stylesheet' ;
-        e.type  = 'text/css' ;
-        e.href  = cssFileUrl ;
-        documentElement.getElementsByTagName("HEAD")[0].appendChild( e ) ;
-        return e ;
+        var cssText = FCKCSSManager.GetCachedCSS( cssFileUrl ) ;
+
+        if ( cssText == null )
+        {
+                var e = documentElement.createElement( 'LINK' ) ;
+                e.rel   = 'stylesheet' ;
+                e.type  = 'text/css' ;
+                e.href  = cssFileUrl ;
+                documentElement.getElementsByTagName( "HEAD" )[0].appendChild( e ) ;
+                return e ;
+        }
+        else
+        {
+                return FCKTools._AppendStyleString( documentElement, cssText ) ;
+        }
 }
 
 // Appends a CSS style string to a document.

editor/_source/internals/fcktools_ie.js

@@ -29 +29 @@
 // Appends one or more CSS files to a document.
 FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
 {
-        return documentElement.createStyleSheet( cssFileUrl ).owningElement ;
+        var cssText = FCKCSSManager.GetCachedCSS( cssFileUrl );
+
+        if ( cssText )
+        {
+                return FCKTools._AppendStyleString( documentElement, cssText ) ;
+        }
+        else
+        {
+                return documentElement.createStyleSheet( cssFileUrl ).owningElement ;
+        }
 }
 
 // Appends a CSS style string to a document.

editor/fckeditor.html

@@ -83 +83 @@
 
 function LoadCss( url )
 {
-        document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" />' ) ;
+        FCKCSSManager.PrintCSSInclude( url ) ;
 }
 
 // Main editor scripts.
@@ -186 +186 @@
 LoadScript( '_source/classes/fckmenublockpanel.js' ) ;
 LoadScript( '_source/classes/fckcontextmenu.js' ) ;
 LoadScript( '_source/internals/fck_contextmenu.js' ) ;
+LoadScript( '_source/internals/fckcssmanager.js' ) ;
 LoadScript( '_source/classes/fckplugin.js' ) ;
 LoadScript( '_source/internals/fckplugins.js' ) ;
 

fckpackager.xml

@@ -160 +160 @@
 
                 <File path="editor/_source/classes/fckplugin.js" />
                 <File path="editor/_source/internals/fckplugins.js" />
+
+                <File path="editor/_source/internals/fckcssmanager.js" />
+                <File path="editor/skins/silver/fck_editor.css" />
+                <File path="editor/css/fck_editorarea.css" />
+                <File path="editor/css/fck_internal.css" />
         </PackageFile>
 
         <PackageFile path="editor/js/fckeditorcode_gecko.js">
@@ -255 +260 @@
 
                 <File path="editor/_source/classes/fckplugin.js" />
                 <File path="editor/_source/internals/fckplugins.js" />
+
+                <File path="editor/_source/internals/fckcssmanager.js" />
+                <File path="editor/skins/silver/fck_editor.css" />
+                <File path="editor/css/fck_showtableborders_gecko.css" />
+                <File path="editor/css/fck_editorarea.css" />
+                <File path="editor/css/fck_internal.css" />
         </PackageFile>
 
 </Package>