Changeset 2069 for FCKeditor/trunk


Ignore:
Timestamp:
06/13/2008 09:12:51 AM (7 years 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:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • FCKeditor/trunk/_whatsnew.html

    r2063 r2069  
    3838                New Features and Improvements:</p> 
    3939        <ul> 
    40                 <li></li> 
     40                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2043">#2043</a>] The debug 
     41                        script is not any more part of the compressed files. If FCKeditor native debugging 
     42                        features (FCKDebug) are required, the _source folder must be present in your installation.</li> 
    4143        </ul> 
    4244        <p> 
  • FCKeditor/trunk/editor/_source/internals/fckdebug.js

    r1565 r2069  
    2222 */ 
    2323 
    24 var FCKDebug = new Object() ; 
     24// Public function defined here must be declared in fckdebug_empty.js. 
    2525 
    26 FCKDebug._GetWindow = function() 
     26var FCKDebug = 
    2727{ 
    28         if ( !this.DebugWindow || this.DebugWindow.closed ) 
    29                 this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ; 
     28        Output : function( message, color, noParse ) 
     29        { 
     30                if ( ! FCKConfig.Debug ) 
     31                        return ; 
    3032 
    31         return this.DebugWindow ; 
    32 } 
     33                try 
     34                { 
     35                        this._GetWindow().Output( message, color ) ; 
     36                } 
     37                catch ( e ) {}   // Ignore errors 
     38        }, 
    3339 
    34 FCKDebug.Output = function( message, color, noParse ) 
    35 { 
    36         if ( ! FCKConfig.Debug ) 
    37                 return ; 
     40        OutputObject : function( anyObject, color ) 
     41        { 
     42                if ( !this.DebugWindow || this.DebugWindow.closed ) 
     43                if ( ! FCKConfig.Debug ) 
     44                        return ; 
    3845 
    39         try 
     46                try 
     47                { 
     48                        this._GetWindow().OutputObject( anyObject, color ) ; 
     49                } 
     50                catch ( e ) {}   // Ignore errors 
     51        }, 
     52 
     53        _GetWindow : function() 
    4054        { 
    41                 this._GetWindow().Output( message, color ) ; 
     55                if ( !this.DebugWindow || this.DebugWindow.closed ) 
     56                        this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ; 
     57 
     58                return this.DebugWindow ; 
    4259        } 
    43         catch ( e ) {}   // Ignore errors 
    44 } 
    45  
    46 FCKDebug.OutputObject = function( anyObject, color ) 
    47 { 
    48         if ( ! FCKConfig.Debug ) 
    49                 return ; 
    50  
    51         try 
    52         { 
    53                 this._GetWindow().OutputObject( anyObject, color ) ; 
    54         } 
    55         catch ( e ) {}   // Ignore errors 
    56 } 
     60} ; 
  • FCKeditor/trunk/editor/fckeditor.html

    r2056 r2069  
    104104LoadScript( '_source/internals/fckconfig.js' ) ; 
    105105 
    106 LoadScript( '_source/internals/fckdebug.js' ) ; 
     106LoadScript( '_source/internals/fckdebug_empty.js' ) ; 
    107107LoadScript( '_source/internals/fckdomtools.js' ) ; 
    108108LoadScript( '_source/internals/fcktools.js' ) ; 
     
    237237 
    238238FCKConfig_PreProcess() ; 
     239 
     240// Load the full debug script. 
     241if ( FCKConfig.Debug ) 
     242        LoadScript( '_source/internals/fckdebug.js' ) ; 
     243 
     244        </script> 
     245        <script type="text/javascript"> 
    239246 
    240247var FCK_InternalCSS                     = FCKConfig.FullBasePath + 'css/fck_internal.css' ;                                     // @Packager.RemoveLine 
  • FCKeditor/trunk/fckpackager.xml

    r1590 r2069  
    7878                <File path="editor/_source/internals/fck_ie.js" /> 
    7979                <File path="editor/_source/internals/fckconfig.js" /> 
    80                 <File path="editor/_source/internals/fckdebug.js" /> 
     80                <File path="editor/_source/internals/fckdebug_empty.js" /> 
    8181                <File path="editor/_source/internals/fckdomtools.js" /> 
    8282                <File path="editor/_source/internals/fcktools.js" /> 
     
    174174                <File path="editor/_source/internals/fck_gecko.js" /> 
    175175                <File path="editor/_source/internals/fckconfig.js" /> 
    176                 <File path="editor/_source/internals/fckdebug.js" /> 
     176                <File path="editor/_source/internals/fckdebug_empty.js" /> 
    177177                <File path="editor/_source/internals/fckdomtools.js" /> 
    178178                <File path="editor/_source/internals/fcktools.js" /> 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy