Ticket #1614: 1614_2.patch

File 1614_2.patch, 11.9 KB (added by Martin Kou, 12 years ago)
  • _whatsnew.html

     
    4444        <p>
    4545                Fixed Bugs:</p>
    4646        <ul>
    47                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2248">#2248</a>] Calling FCK.InsertHtml( 'nbsp;') was inserting a plain space instead of a non breaking space
     47                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2248">#2248</a>] Calling
     48                        FCK.InsertHtml( 'nbsp;') was inserting a plain space instead of a non breaking space
    4849                        character.</li>
     50                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1614">#1614</a>] Unified
     51                        FCKConfig.FullBasePath with FCKConfig.BasePath.</li>
    4952        </ul>
    5053        <p>
    5154        </p>
  • editor/_source/internals/fck_ie.js

     
    2929{
    3030        if ( !FCK._BehaviorsStyle )
    3131        {
    32                 var sBasePath = FCKConfig.FullBasePath ;
     32                var sBasePath = FCKConfig.BasePath ;
    3333                var sTableBehavior = '' ;
    3434                var sStyle ;
    3535
    36                 // The behaviors should be pointed using the FullBasePath to avoid security
     36                // The behaviors should be pointed using the BasePath to avoid security
    3737                // errors when using a different BaseHref.
    3838                sStyle = '<style type="text/css" _fcktemp="true">' ;
    3939
  • editor/_source/internals/fckconfig.js

     
    4242                sFullProtocol += 'localhost/' ;
    4343
    4444        FCKConfig.BasePath = sFullProtocol + FCKConfig.BasePath.substring( 0, FCKConfig.BasePath.lastIndexOf( '/' ) + 1) ;
    45         FCKConfig.FullBasePath = FCKConfig.BasePath ;
    4645}
    4746else
    48 {
    49         FCKConfig.BasePath = document.location.pathname.substring( 0, document.location.pathname.lastIndexOf( '/' ) + 1) ;
    50         FCKConfig.FullBasePath = document.location.protocol + '//' + document.location.host + FCKConfig.BasePath ;
    51 }
     47        FCKConfig.BasePath = document.location.protocol + '//' + document.location.host +
     48                document.location.pathname.substring( 0, document.location.pathname.lastIndexOf( '/' ) + 1) ;
    5249
     50FCKConfig.FullBasePath = FCKConfig.BasePath ;
     51
    5352FCKConfig.EditorPath = FCKConfig.BasePath.replace( /editor\/$/, '' ) ;
    5453
    5554// There is a bug in Gecko. If the editor is hidden on startup, an error is
  • editor/_source/internals/fckdialog.js

     
    105105                        // Setup the IFRAME that will hold the dialog.
    106106                        var dialog = topDocument.createElement( 'iframe' ) ;
    107107                        FCKTools.ResetStyles( dialog ) ;
    108                         dialog.src = FCKConfig.FullBasePath + 'fckdialog.html' ;
     108                        dialog.src = FCKConfig.BasePath + 'fckdialog.html' ;
    109109
    110110                        // Dummy URL for testing whether the code in fckdialog.js alone leaks memory.
    111111                        // dialog.src = 'about:blank';
  • editor/_source/internals/fckdocumentprocessor.js

     
    4545{
    4646        var oImg = FCKTools.GetElementDocument( realElement ).createElement( 'IMG' ) ;
    4747        oImg.className = fakeClass ;
    48         oImg.src = FCKConfig.FullBasePath + 'images/spacer.gif' ;
     48        oImg.src = FCKConfig.BasePath + 'images/spacer.gif' ;
    4949        oImg.setAttribute( '_fckfakelement', 'true', 0 ) ;
    5050        oImg.setAttribute( '_fckrealelement', FCKTempBin.AddElement( realElement ), 0 ) ;
    5151        return oImg ;
  • editor/fckeditor.html

     
    244244        </script>
    245245        <script type="text/javascript">
    246246
    247 var FCK_InternalCSS                     = FCKConfig.FullBasePath + 'css/fck_internal.css' ;                                     // @Packager.RemoveLine
    248 var FCK_ShowTableBordersCSS     = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;       // @Packager.RemoveLine
     247var FCK_InternalCSS                     = FCKConfig.BasePath + 'css/fck_internal.css' ;                                 // @Packager.RemoveLine
     248var FCK_ShowTableBordersCSS     = FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;   // @Packager.RemoveLine
    249249/* @Packager.RemoveLine
    250250// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
    251 var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
    252 var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
     251var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
     252var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
    253253@Packager.RemoveLine */
    254254
    255255// Popup the debug window if debug mode is set to true. It guarantees that the
  • editor/js/fckadobeair.js

     
    167167                FCK.StartEditor = function()
    168168                {
    169169                        // Force pointing to the CSS files instead of using the inline CSS cached styles.
    170                         window.FCK_InternalCSS                  = FCKConfig.FullBasePath + 'css/fck_internal.css' ;
    171                         window.FCK_ShowTableBordersCSS  = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;
     170                        window.FCK_InternalCSS                  = FCKConfig.BasePath + 'css/fck_internal.css' ;
     171                        window.FCK_ShowTableBordersCSS  = FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;
    172172
    173173                        _Original_FCK_StartEditor.apply( this, arguments ) ;
    174174                }
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy