Changeset 2069

Timestamp:

2008-06-13 09:12:51 (7 months ago)

Author:

fredck

Message:

Fixed #2043 : The debug script is not any more part of the compressed files. If FCKeditor native debugging features (FCKDebug) are required, the _source folder must be present in your installation.

Location:

FCKeditor/trunk

Files:

• editor/fckeditor.html (modified) (2 diffs)
• editor/_source/internals/fckdebug_empty.js (added)
• editor/_source/internals/fckdebug.js (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/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' ) ;
@@ -237 +237 @@
 
 FCKConfig_PreProcess() ;
+
+// Load the full debug script.
+if ( FCKConfig.Debug )
+        LoadScript( '_source/internals/fckdebug.js' ) ;
+
+        </script>
+        <script type="text/javascript">
 
 var FCK_InternalCSS                     = FCKConfig.FullBasePath + 'css/fck_internal.css' ;                                     // @Packager.RemoveLine

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

@@ -22 +22 @@
  */
 
-var FCKDebug = new Object() ;
+// Public function defined here must be declared in fckdebug_empty.js.
 
-FCKDebug._GetWindow = function()
+var FCKDebug =
 {
-        if ( !this.DebugWindow || this.DebugWindow.closed )
-                this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ;
+        Output : function( message, color, noParse )
+        {
+                if ( ! FCKConfig.Debug )
+                        return ;
 
-        return this.DebugWindow ;
-}
+                try
+                {
+                        this._GetWindow().Output( message, color ) ;
+                }
+                catch ( e ) {}   // Ignore errors
+        },
 
-FCKDebug.Output = function( message, color, noParse )
-{
-        if ( ! FCKConfig.Debug )
-                return ;
+        OutputObject : function( anyObject, color )
+        {
+                if ( !this.DebugWindow || this.DebugWindow.closed )
+                if ( ! FCKConfig.Debug )
+                        return ;
 
-        try
+                try
+                {
+                        this._GetWindow().OutputObject( anyObject, color ) ;
+                }
+                catch ( e ) {}   // Ignore errors
+        },
+
+        _GetWindow : function()
         {
-                this._GetWindow().Output( message, color ) ;
+                if ( !this.DebugWindow || this.DebugWindow.closed )
+                        this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ;
+
+                return this.DebugWindow ;
         }
-        catch ( e ) {}   // Ignore errors
-}
-
-FCKDebug.OutputObject = function( anyObject, color )
-{
-        if ( ! FCKConfig.Debug )
-                return ;
-
-        try
-        {
-                this._GetWindow().OutputObject( anyObject, color ) ;
-        }
-        catch ( e ) {}   // Ignore errors
-}
+} ;

FCKeditor/trunk/fckpackager.xml

@@ -78 +78 @@
                 <File path="editor/_source/internals/fck_ie.js" />
                 <File path="editor/_source/internals/fckconfig.js" />
-                <File path="editor/_source/internals/fckdebug.js" />
+                <File path="editor/_source/internals/fckdebug_empty.js" />
                 <File path="editor/_source/internals/fckdomtools.js" />
                 <File path="editor/_source/internals/fcktools.js" />
@@ -174 +174 @@
                 <File path="editor/_source/internals/fck_gecko.js" />
                 <File path="editor/_source/internals/fckconfig.js" />
-                <File path="editor/_source/internals/fckdebug.js" />
+                <File path="editor/_source/internals/fckdebug_empty.js" />
                 <File path="editor/_source/internals/fckdomtools.js" />
                 <File path="editor/_source/internals/fcktools.js" />

FCKeditor/trunk/_whatsnew.html

@@ -38 +38 @@
                 New Features and Improvements:</p>
         <ul>
-                <li></li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2043">#2043</a>] The debug
+                        script is not any more part of the compressed files. If FCKeditor native debugging
+                        features (FCKDebug) are required, the _source folder must be present in your installation.</li>
         </ul>
         <p>