Changeset 411

Timestamp:

2007-07-06 06:57:34 (17 months ago)

Author:

martinkou

Message:

Fixed #100 : Implemented the 'FCKConfig.EditorAreaStyles' configuration entry.
Improved the replace dialog to scroll into view the matched text in the document.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_replace.html (modified) (1 diff)
• editor/_source/classes/fcktoolbarfontformatcombo.js (modified) (1 diff)
• editor/_source/classes/fcktoolbarstylecombo.js (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fcktools_gecko.js (modified) (1 diff)
• editor/_source/internals/fcktools_ie.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (1 diff)
• fckconfig.js (modified) (2 diffs)

FCKeditor/trunk/editor/dialog/fck_replace.html

@@ -294 +294 @@
                 range.MoveToBookmark2( matchBookmark ) ;
                 range.Select() ;
+                var focus = range._Range.endContainer ;
+                while ( focus && focus.nodeType != 1 )
+                        focus = focus.parentNode ;
+                if ( focus )
+                focus.scrollIntoView( false ) ;
                 return true;
         }

FCKeditor/trunk/editor/_source/classes/fcktoolbarfontformatcombo.js

@@ -50 +50 @@
         // Add the Editor Area CSS to the panel to create a realistic preview.
         FCKTools.AppendStyleSheet( oTargetDoc, FCKConfig.ToolbarComboPreviewCSS ) ;
+        FCKTools.AppendStyleString( oTargetDoc, FCKConfig.EditorAreaStyles ) ;
 
         // Add ID and Class to the body

FCKeditor/trunk/editor/_source/classes/fcktoolbarstylecombo.js

@@ -46 +46 @@
         // Add the Editor Area CSS to the panel so the style classes are previewed correctly.
         FCKTools.AppendStyleSheet( oTargetDoc, FCKConfig.ToolbarComboPreviewCSS ) ;
+        FCKTools.AppendStyleString( oTargetDoc, FCKConfig.EditorAreaStyles ) ;
         oTargetDoc.body.className += ' ForceBaseFont' ;
 

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -743 +743 @@
         var sTags = '' ;
         var aCSSs = FCKConfig.EditorAreaCSS ;
+        var sStyles = FCKConfig.EditorAreaStyles ;
 
         for ( var i = 0 ; i < aCSSs.length ; i++ )
                 sTags += '<link href="' + aCSSs[i] + '" rel="stylesheet" type="text/css" />' ;
+
+        if ( sStyles && sStyles.length > 0 )
+                sTags += "<style>" + sStyles + "</style>" ;
 
         return sTags ;

FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js

@@ -45 +45 @@
         documentElement.getElementsByTagName("HEAD")[0].appendChild( e ) ;
         return e ;
+}
+
+// Appends a CSS style string to a document.
+FCKTools._AppendStyleString = function( documentElement, cssStyles )
+{
+        var e = documentElement.createElement( "STYLE" ) ;
+        e.innerHTML = cssStyles ;
+        documentElement.getElementsByTagName( "HEAD" )[0].appendChild( e ) ;
 }
 

FCKeditor/trunk/editor/_source/internals/fcktools_ie.js

@@ -31 +31 @@
 {
         return documentElement.createStyleSheet( cssFileUrl ).owningElement ;
+}
+
+// Appends a CSS style string to a document.
+FCKTools._AppendStyleSheet = function( documentElement, cssStyles )
+{
+        var s = documentElement.createStyleSheet( "" ) ;
+        s.cssText = cssStyles ;
 }
 

FCKeditor/trunk/editor/_source/internals/fcktools.js

@@ -50 +50 @@
                 return aStyleSheeArray ;
         }
+}
+
+FCKTools.AppendStyleString = function ( documentElement, cssStyles )
+{
+        this._AppendStyleString( documentElement, cssStyles ) ;
 }
 

FCKeditor/trunk/fckconfig.js

@@ -31 +31 @@
 
 FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ;
+FCKConfig.EditorAreaStyles = '' ;
 FCKConfig.ToolbarComboPreviewCSS = '' ;
 
@@ -39 +40 @@
 FCKConfig.FullPage = false ;
 
-FCKConfig.Debug = true ;
+FCKConfig.Debug = false ;
 FCKConfig.AllowQueryStringDebug = true ;