Ticket #4341: 4341_2.patch

_source/plugins/showborders/assets/showtableborders.htc

@@ +1 @@
+<public:component lightweight="true">
+
+<public:attach event="oncontentready" onevent="ShowBorders()" />
+<public:attach event="onpropertychange" onevent="OnPropertyChange()" />
+
+<script language="javascript">
+
+var oClassRegex = /\s*cke_no_border/ ;
+
+function ShowBorders()
+{
+        if ( this.border == 0 )
+        {
+                if ( !oClassRegex.test( this.className ) )
+                        this.className += ' cke_no_border' ;
+        }
+        else
+        {
+                if ( oClassRegex.test( this.className ) )
+                {
+                        this.className = this.className.replace( oClassRegex, '' ) ;
+                        if ( this.className.length == 0 )
+                                this.removeAttribute( 'className', 0 ) ;
+                }
+        }
+}
+
+function OnPropertyChange()
+{
+        if ( event.propertyName == 'border' || event.propertyName == 'className' )
+                ShowBorders.call(this) ;
+}
+
+</script>
+
+</public:component>

_source/core/config.js

@@ -198 +198 @@
          * @type String
          * @example
          */
-        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,showborders,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * List of additional plugins to be loaded. This is a tool setting which
@@ -282 +282 @@
          * @example
          * config.baseFloatZIndex = 2000
          */
-        baseFloatZIndex : 10000
+        baseFloatZIndex : 10000,
 
+        /**
+         * Whether to automaticaly enable the "show borders" command when the editor
+         * loads.
+         * @type Boolean
+         * @default false
+         * @example
+         * config.startupShowBorders = false;
+         */
+        startupShowBorders : true
 };
 
 // PACKAGER_RENAME( CKEDITOR.config )

_source/plugins/showborders/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview The "show border" plugin. The command display visible outline
+ * border line around all table elements if table doesn't have a none-zero 'border' attribute specified.
+ */
+
+(function()
+{
+        var cssStyleText,
+                cssTemplate =
+                // TODO: For IE6, we don't have child selector support, where nested table style could be incorrect.
+                ( CKEDITOR.env.ie6Compat ?
+                  [
+                        '.%1 table%2,',
+                         '.%1 table%2 td, .%1 table%2 th,',
+                         '{',
+                                'border : #d3d3d3 1px dotted',
+                         '}'
+                  ] :
+                  [
+                         '.%1 table%2,',
+                         '.%1 table%2 > tr > td, .%1 table%2 > tr > th,',
+                         '.%1 table%2 > tbody > tr > td, .%1 table%2 > tbody > tr > th,',
+                         '.%1 table%2 > thead > tr > td, .%1 table%2 > thead > tr > th,',
+                         '.%1 table%2 > tfoot > tr > td, .%1 table%2 > tfoot > tr > th',
+                         '{',
+                                'border : #d3d3d3 1px dotted',
+                         '}'
+                  ] ).join( '' );
+
+        if( CKEDITOR.env.ie )
+        {
+                // For IE we use a HTC behavior on table to mimic the desired selector.
+                cssStyleText =
+                [
+                        cssTemplate.replace( /%2/g, '.cke_no_border' )
+                ];
+        }
+        else
+        {
+                cssStyleText =
+                [
+                        // For tables with the "border" attribute set to "0" , IE7 doesn't support
+                        // attribute selector on 'border' particularly (weirld).
+                        cssTemplate.replace( /%2/g, '[border="0"]' ),
+                        // For tables with no "border" attribute set, IE8 doesn't support CSS3
+                        // pseudo selector: not(...)
+                        cssTemplate.replace( /%2/g, ':not([border])' )
+                ];
+        }
+
+        var commandDefinition =
+        {
+                preserveState : true,
+                editorFocus : false,
+
+                exec : function ( editor )
+                {
+                        this.toggleState();
+                        this.refresh( editor );
+                },
+
+                refresh : function( editor )
+                {
+                        var funcName = ( this.state == CKEDITOR.TRISTATE_ON ) ? 'addClass' : 'removeClass';
+                        editor.document.getBody()[ funcName ]( 'cke_show_borders' );
+                }
+        };
+
+        CKEDITOR.plugins.add( 'showborders',
+        {
+                requires : [ 'wysiwygarea' ],
+                modes : { 'wysiwyg' : 1 },
+
+                init : function( editor )
+                {
+                        if( CKEDITOR.env.ie )
+                                cssStyleText.push( 'table', '{ behavior: ' + 'url(' + this.path + 'assets/showtableborders.htc)' + '; }' );
+
+                        var command = editor.addCommand( 'showborders', commandDefinition );
+                        command.canUndo = false;
+
+                        if ( editor.config.startupShowBorders )
+                                command.setState( CKEDITOR.TRISTATE_ON );
+
+                        editor.addCss( cssStyleText.join( '\n' ).
+                                                        replace( /%1/g, 'cke_show_borders ' ) );
+                        
+                        // Refresh the command on setData.
+                        editor.on( 'mode', function()
+                                {
+                                        if ( command.state != CKEDITOR.TRISTATE_DISABLED )
+                                                command.refresh( editor );
+                                }, null, null, 100 );
+
+                        // Refresh the command on wysiwyg frame reloads.
+                        editor.on( 'contentDom', function()
+                                {
+                                        if ( command.state != CKEDITOR.TRISTATE_DISABLED )
+                                                command.refresh( editor );
+                                });
+                }
+        });
+} )();
+