Changeset 701


Ignore:
Timestamp:
08/22/07 18:10:52 (6 years ago)
Author:
martinkou
Message:

Fix for #212 : Added the "Show Block" function.
Fixed "Unknown Command" error in tablecommands plugin and sample06.html.
Fixed lint warning in dragresizetable plugin.

Location:
FCKeditor/trunk
Files:
10 added
17 edited

Legend:

Unmodified
Added
Removed

  • FCKeditor/trunk/_samples/html/sample06.config.js

    r452 r701  
    2727        ['My_Find','My_Replace','-','Placeholder'], 
    2828        ['StyleSimple','FontFormatSimple','FontNameSimple','FontSizeSimple'], 
    29         ['Table','-','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableSplitCell','TableCellProp'], 
     29        ['Table','-','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableCellProp'], 
    3030        ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink'], 
    3131        '/', 

  • FCKeditor/trunk/editor/_source/internals/fckcommands.js

    r691 r701  
    116116                case 'InsertOrderedList' : oCommand = new FCKListCommand( 'insertorderedlist' ) ; break ; 
    117117                case 'InsertUnorderedList' : oCommand = new FCKListCommand( 'insertunorderedlist' ) ; break ; 
     118                case 'ShowBlocks' : oCommand = new FCKShowBlockCommand( 'ShowBlocks' ) ; break ; 
    118119 
    119120                // Generic Undefined command (usually used when a command is under development). 

  • FCKeditor/trunk/editor/_source/internals/fcktoolbaritems.js

    r308 r701  
    110110                case 'Select'                   : oItem = new FCKToolbarButton( 'Select'                , FCKLang.SelectionField, null, null, null, null, 53 ) ; break ; 
    111111                case 'ImageButton'              : oItem = new FCKToolbarButton( 'ImageButton'   , FCKLang.ImageButton, null, null, null, null, 55 ) ; break ; 
     112                case 'ShowBlocks'               : oItem = new FCKToolbarButton( 'ShowBlocks'    , FCKLang.ShowBlocks, null, null, null, true, 72 ) ; break ; 
    112113 
    113114                default: 

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

    r691 r701  
    5353        e.appendChild( documentElement.createTextNode( cssStyles ) ) ; 
    5454        documentElement.getElementsByTagName( "HEAD" )[0].appendChild( e ) ; 
     55        return e ; 
    5556} 
    5657 

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

    r568 r701  
    3838        var s = documentElement.createStyleSheet( "" ) ; 
    3939        s.cssText = cssStyles ; 
     40        return s ; 
    4041} 
    4142 

  • FCKeditor/trunk/editor/fckeditor.html

    r631 r701  
    107107LoadScript( '_source/commandclasses/fcknamedcommand.js' ) ; 
    108108LoadScript( '_source/commandclasses/fck_othercommands.js' ) ; 
     109LoadScript( '_source/commandclasses/fckshowblocks.js' ) ; 
    109110LoadScript( '_source/commandclasses/fckspellcheckcommand_' + sSuffix + '.js' ) ; 
    110111LoadScript( '_source/commandclasses/fcktextcolorcommand.js' ) ; 

  • FCKeditor/trunk/editor/lang/en-au.js

    r672 r701  
    105105 
    106106FitWindow               : "Maximize the editor size", 
     107ShowBlocks              : "Show Blocks", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/lang/en-ca.js

    r672 r701  
    105105 
    106106FitWindow               : "Maximize the editor size", 
     107ShowBlocks              : "Show Blocks", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/lang/en-uk.js

    r672 r701  
    105105 
    106106FitWindow               : "Maximize the editor size", 
     107ShowBlocks              : "Show Blocks", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/lang/en.js

    r672 r701  
    105105 
    106106FitWindow               : "Maximize the editor size", 
     107ShowBlocks              : "Show Blocks", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/lang/zh-cn.js

    r672 r701  
    105105 
    106106FitWindow               : "全屏编辑", 
     107ShowBlocks              : "显示区块", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/lang/zh.js

    r672 r701  
    105105 
    106106FitWindow               : "編輯器最大化", 
     107ShowBlocks              : "顯示區塊", 
    107108 
    108109// Context Menu 

  • FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js

    r696 r701  
    198198                                        cell.width = colArray[j].width ; 
    199199                                else 
    200                                         cell.width = parseInt( cell.width ) + parseInt( colArray[j].width ) ; 
     200                                        cell.width = parseInt( cell.width, 10 ) + parseInt( colArray[j].width, 10 ) ; 
    201201                                if ( tableMap[i][j+1] != cell ) 
    202202                                { 

  • FCKeditor/trunk/editor/plugins/tablecommands/fckplugin.js

    r452 r701  
    3030FCKToolbarItems.RegisterItem( 'TableDeleteCells'        , new FCKToolbarButton( 'TableDeleteCells'      , FCKLang.DeleteCells, null, null, null, null, 59 ) ) ; 
    3131FCKToolbarItems.RegisterItem( 'TableMergeCells'         , new FCKToolbarButton( 'TableMergeCells'       , FCKLang.MergeCells, null, null, null, null, 60 ) ) ; 
    32 FCKToolbarItems.RegisterItem( 'TableSplitCell'          , new FCKToolbarButton( 'TableSplitCell'        , FCKLang.SplitCell, null, null, null, null, 61 ) ) ; 
     32FCKToolbarItems.RegisterItem( 'TableHorizontalSplitCell'                , new FCKToolbarButton( 'TableHorizontalSplitCell'      , FCKLang.SplitCell, null, null, null, null, 61 ) ) ; 
    3333FCKToolbarItems.RegisterItem( 'TableCellProp'           , new FCKToolbarButton( 'TableCellProp' , FCKLang.CellProperties, null, null, null, null, 57 ) ) ; 

  • FCKeditor/trunk/fckconfig.js

    r612 r701  
    109109        ['Style','FontFormat','FontName','FontSize'], 
    110110        ['TextColor','BGColor'], 
    111         ['FitWindow','-','About'] 
     111        ['FitWindow','ShowBlocks','-','About'] 
    112112] ; 
    113113 

  • FCKeditor/trunk/fckpackager.xml

    r652 r701  
    114114                <File path="editor/_source/commandclasses/fcknamedcommand.js" /> 
    115115                <File path="editor/_source/commandclasses/fck_othercommands.js" /> 
     116                <File path="editor/_source/commandclasses/fckshowblocks.js" /> 
    116117                <File path="editor/_source/commandclasses/fckspellcheckcommand_ie.js" /> 
    117118                <File path="editor/_source/commandclasses/fcktextcolorcommand.js" /> 
    … …  
    201202                <File path="editor/_source/commandclasses/fcknamedcommand.js" /> 
    202203                <File path="editor/_source/commandclasses/fck_othercommands.js" /> 
     204                <File path="editor/_source/commandclasses/fckshowblocks.js" /> 
    203205                <File path="editor/_source/commandclasses/fckspellcheckcommand_gecko.js" /> 
    204206                <File path="editor/_source/commandclasses/fcktextcolorcommand.js" /> 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy