Ticket #2043: 2043_2.patch

_whatsnew.html

@@ -46 +46 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2215">#2215</a>] Following
                         the above new feature, the ReplaceTextarea method will now copy the textarea.tabIndex
                         value if available.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2043">#2043</a>] The debug
+                        script is not anymore part of the compressed files. If FCKeditor native debugging
+                        features (FCKDebug) is required, the _source folder must be present in your installation.</li>
 
                 
         </ul>

editor/_source/internals/fckdebug.js

@@ -21 +21 @@
  * Debug window control and operations.
  */
 
-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 ;
-
-        try
+        OutputObject : function( anyObject, color )
         {
-                this._GetWindow().Output( message, color ) ;
-        }
-        catch ( e ) {}   // Ignore errors
-}
+                if ( !this.DebugWindow || this.DebugWindow.closed )
+                if ( ! FCKConfig.Debug )
+                        return ;
 
-FCKDebug.OutputObject = function( anyObject, color )
-{
-        if ( ! FCKConfig.Debug )
-                return ;
+                try
+                {
+                        this._GetWindow().OutputObject( anyObject, color ) ;
+                }
+                catch ( e ) {}   // Ignore errors
+        },
 
-        try
+        _GetWindow : function()
         {
-                this._GetWindow().OutputObject( anyObject, 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
-}
+} ;
+ No newline at end of file

editor/_source/internals/fckdebug_empty.js

@@ +1 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Debug window control and operations (empty for the compressed files - #2043).
+ */
+
+var FCKDebug = 
+{
+        Output : function()
+        {},
+
+        OutputObject : function()
+        {}
+} ;
+ No newline at end of file

editor/fckeditor.html

@@ -103 +103 @@
 LoadScript( '_source/internals/fck_' + sSuffix + '.js' ) ;
 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' ) ;
 LoadScript( '_source/internals/fcktools_' + sSuffix + '.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
 var FCK_ShowTableBordersCSS     = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;       // @Packager.RemoveLine
 /* @Packager.RemoveLine

fckpackager.xml

@@ -77 +77 @@
                 <File path="editor/_source/internals/fck.js" />
                 <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" />
                 <File path="editor/_source/internals/fcktools_ie.js" />
@@ -173 +173 @@
                 <File path="editor/_source/internals/fck.js" />
                 <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" />
                 <File path="editor/_source/internals/fcktools_gecko.js" />