Ticket #2869: 2869_3.patch

_source/plugins/blockoutline/blockoutline.css

@@ +1 @@
+.cke_block_outline p,
+.cke_block_outline div,
+.cke_block_outline pre,
+.cke_block_outline address,
+.cke_block_outline blockquote,
+.cke_block_outline h1,
+.cke_block_outline h2,
+.cke_block_outline h3,
+.cke_block_outline h4,
+.cke_block_outline h5,
+.cke_block_outline h6
+{
+        background-repeat: no-repeat;
+        border: 1px dotted gray;
+        padding-top: 8px;
+        padding-left: 8px;
+}
+
+.cke_block_outline p
+{
+        background-image: url(images/blockoutline.block_p.png);
+}
+
+.cke_block_outline div
+{
+        background-image: url(images/blockoutline.block_div.png);
+}
+
+.cke_block_outline pre
+{
+        background-image: url(images/blockoutline.block_pre.png);
+}
+
+.cke_block_outline address
+{
+        background-image: url(images/blockoutline.block_address.png);
+}
+
+.cke_block_outline blockquote
+{
+        background-image: url(images/blockoutline.block_blockquote.png);
+}
+
+.cke_block_outline h1
+{
+        background-image: url(images/blockoutline.block_h1.png);
+}
+
+.cke_block_outline h2
+{
+        background-image: url(images/blockoutline.block_h2.png);
+}
+
+.cke_block_outline h3
+{
+        background-image: url(images/blockoutline.block_h3.png);
+}
+
+.cke_block_outline h4
+{
+        background-image: url(images/blockoutline.block_h4.png);
+}
+
+.cke_block_outline h5
+{
+        background-image: url(images/blockoutline.block_h5.png);
+}
+
+.cke_block_outline h6
+{
+        background-image: url(images/blockoutline.block_h6.png);
+}

_source/plugins/blockoutline/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 "blockoutline" plugin. Enable it will make all block level
+ *               elements being decorated with a border and the element name
+ *               displayed on the left-right corner.
+ */
+
+(function()
+{
+        BLOCK_OUTLINE_CLASSNAME = 'cke_block_outline';
+        BLOCK_OUTLINE_CSS_PATH = 'blockoutline.css';
+
+        CKEDITOR.plugins.add( 'blockoutline',
+        {
+                requires : [ 'wysiwygarea' ],
+
+                init : function( editor )
+                {
+                        var pluginPath = this.path;
+                        editor.addCommand( 'showblock' ,
+                        {
+                                exec : function ( editor )
+                                {
+                                        if ( this.state !== CKEDITOR.TRISTATE_DISABLED )
+                                        {
+                                                editor.document.getBody()[
+                                                        this.state === CKEDITOR.TRISTATE_OFF ?
+                                                        'addClass'
+                                                        : 'removeClass' ]
+                                                        ( BLOCK_OUTLINE_CLASSNAME );
+                                                this.toggleState();
+                                        }
+                                }
+                        });
+
+                        editor.ui.addButton( 'BlockOutline', {
+                                                lablel :editor.lang.blockOutline,
+                                                command :'showblock'
+                                        } );
+                        
+                        editor.on( 'contentDom', function(){
+                                
+                                // Avoid using skin system since it's about document internal
+                                // styles, load it manually on startup.
+                                editor.document.appendStyleSheet( CKEDITOR.basePath
+                                        + pluginPath + BLOCK_OUTLINE_CSS_PATH );
+
+                                // startup outline config
+                                if ( CKEDITOR.config.startupOutlineBlocks )
+                                        editor.getCommand( 'showblock' ).exec();
+
+                                // Triggered only on startup
+                                this.removeListener( 'contentDom', arguments.callee );
+                        } );
+                        
+                }
+        });
+        
+})();
+
+CKEDITOR.tools.extend( CKEDITOR.config, {
+        startupOutlineBlocks :false
+} );

_source/core/command.js

@@ -5 +5 @@
 
 CKEDITOR.command = function( editor, commandDefinition )
 {
-        this.state = CKEDITOR.TRISTATE_OFF;
+        this.state = ( 'state' in commandDefinition ) ? commandDefinition.state : CKEDITOR.TRISTATE_OFF;
 
         this.exec = function()
         {
@@ -18 +18 @@
         CKEDITOR.event.call( this );
 };
 
+CKEDITOR.command.prototype =
+{
+        setState : function( newState )
+        {
+                // Do nothing if there is no state change.
+                if ( this.state == newState )
+                        return false;
+
+                // Set the new state.
+                this.state = newState;
+
+                // Fire the "state" event, so other parts of the code can react to the
+                // change.
+                this.fire( 'state' );
+
+                return true;
+        },
+        
+        /*
+         * Toggle the current state of command and refresh.
+         */
+        toggleState : function()
+        {
+                this.setState( this.state === CKEDITOR.TRISTATE_ON ?
+                                CKEDITOR.TRISTATE_OFF
+                                : CKEDITOR.TRISTATE_ON );
+        }
+}
+
 CKEDITOR.event.implementOn( CKEDITOR.command.prototype );

_source/core/config.js

@@ -147 +147 @@
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
 
-        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,sourcearea,table,specialchar,tab,toolbar,wysiwygarea',
+        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,sourcearea,table,specialchar,tab,toolbar,wysiwygarea,blockoutline',
 
         /**
          * The theme to be used to build the UI.

_source/skins/default/toolbar.css

@@ -310 +310 @@
 {
         background-position: 0 -880px;
 }
+.cke_skin_default a.cke_button_showblock .cke_icon
+{
+        background-position: 0 -1136px;
+}
 
 .cke_skin_default a.cke_button_numberedlist .cke_icon
 {