From f3ce03a71d3dd1c7dcbe474197fb1588949735db Mon Sep 17 00:00:00 2001 From: lsces Date: Sun, 10 Jun 2012 19:03:48 +0100 Subject: Update to CKEditor version 3.6.3 --- .../plugins/showblocks/images/block_address.png | Bin 288 -> 171 bytes .../plugins/showblocks/images/block_blockquote.png | Bin 293 -> 181 bytes _source/plugins/showblocks/images/block_div.png | Bin 229 -> 136 bytes _source/plugins/showblocks/images/block_h1.png | Bin 218 -> 127 bytes _source/plugins/showblocks/images/block_h2.png | Bin 220 -> 134 bytes _source/plugins/showblocks/images/block_h3.png | Bin 219 -> 131 bytes _source/plugins/showblocks/images/block_h4.png | Bin 229 -> 133 bytes _source/plugins/showblocks/images/block_h5.png | Bin 236 -> 133 bytes _source/plugins/showblocks/images/block_h6.png | Bin 216 -> 129 bytes _source/plugins/showblocks/images/block_p.png | Bin 205 -> 119 bytes _source/plugins/showblocks/images/block_pre.png | Bin 223 -> 136 bytes _source/plugins/showblocks/plugin.js | 22 +++++++++++++-------- 12 files changed, 14 insertions(+), 8 deletions(-) (limited to '_source/plugins/showblocks') diff --git a/_source/plugins/showblocks/images/block_address.png b/_source/plugins/showblocks/images/block_address.png index 8bbae6e..1ee67aa 100644 Binary files a/_source/plugins/showblocks/images/block_address.png and b/_source/plugins/showblocks/images/block_address.png differ diff --git a/_source/plugins/showblocks/images/block_blockquote.png b/_source/plugins/showblocks/images/block_blockquote.png index cf065ba..cae3aec 100644 Binary files a/_source/plugins/showblocks/images/block_blockquote.png and b/_source/plugins/showblocks/images/block_blockquote.png differ diff --git a/_source/plugins/showblocks/images/block_div.png b/_source/plugins/showblocks/images/block_div.png index a2806b1..c71f397 100644 Binary files a/_source/plugins/showblocks/images/block_div.png and b/_source/plugins/showblocks/images/block_div.png differ diff --git a/_source/plugins/showblocks/images/block_h1.png b/_source/plugins/showblocks/images/block_h1.png index d43fbdb..3a64347 100644 Binary files a/_source/plugins/showblocks/images/block_h1.png and b/_source/plugins/showblocks/images/block_h1.png differ diff --git a/_source/plugins/showblocks/images/block_h2.png b/_source/plugins/showblocks/images/block_h2.png index 27b5475..8062ebe 100644 Binary files a/_source/plugins/showblocks/images/block_h2.png and b/_source/plugins/showblocks/images/block_h2.png differ diff --git a/_source/plugins/showblocks/images/block_h3.png b/_source/plugins/showblocks/images/block_h3.png index 3c3034f..5b6a403 100644 Binary files a/_source/plugins/showblocks/images/block_h3.png and b/_source/plugins/showblocks/images/block_h3.png differ diff --git a/_source/plugins/showblocks/images/block_h4.png b/_source/plugins/showblocks/images/block_h4.png index ab3f64d..6c7f795 100644 Binary files a/_source/plugins/showblocks/images/block_h4.png and b/_source/plugins/showblocks/images/block_h4.png differ diff --git a/_source/plugins/showblocks/images/block_h5.png b/_source/plugins/showblocks/images/block_h5.png index 93477d0..e153de0 100644 Binary files a/_source/plugins/showblocks/images/block_h5.png and b/_source/plugins/showblocks/images/block_h5.png differ diff --git a/_source/plugins/showblocks/images/block_h6.png b/_source/plugins/showblocks/images/block_h6.png index 11ea1c2..c8d993a 100644 Binary files a/_source/plugins/showblocks/images/block_h6.png and b/_source/plugins/showblocks/images/block_h6.png differ diff --git a/_source/plugins/showblocks/images/block_p.png b/_source/plugins/showblocks/images/block_p.png index d055c51..4e6035d 100644 Binary files a/_source/plugins/showblocks/images/block_p.png and b/_source/plugins/showblocks/images/block_p.png differ diff --git a/_source/plugins/showblocks/images/block_pre.png b/_source/plugins/showblocks/images/block_pre.png index be8ad26..d11a0ff 100644 Binary files a/_source/plugins/showblocks/images/block_pre.png and b/_source/plugins/showblocks/images/block_pre.png differ diff --git a/_source/plugins/showblocks/plugin.js b/_source/plugins/showblocks/plugin.js index 552cbe4..de95124 100644 --- a/_source/plugins/showblocks/plugin.js +++ b/_source/plugins/showblocks/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -24,9 +24,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license '.%2 h6'+ '{'+ 'background-repeat: no-repeat;'+ + 'background-position: top %3;'+ 'border: 1px dotted gray;'+ 'padding-top: 8px;'+ - 'padding-left: 8px;'+ + 'padding-%3: 8px;'+ '}'+ '.%2 p'+ @@ -84,10 +85,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license '%1h6.png);'+ '}'; - var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g; + var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g, backgroundPositionRegex = /%3/g; var commandDefinition = { + readOnly : 1, preserveState : true, editorFocus : false, @@ -99,8 +101,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license refresh : function( editor ) { - var funcName = ( this.state == CKEDITOR.TRISTATE_ON ) ? 'addClass' : 'removeClass'; - editor.document.getBody()[ funcName ]( 'cke_show_blocks' ); + if ( editor.document ) + { + var funcName = ( this.state == CKEDITOR.TRISTATE_ON ) ? 'addClass' : 'removeClass'; + editor.document.getBody()[ funcName ]( 'cke_show_blocks' ); + } } }; @@ -118,7 +123,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.addCss( cssTemplate .replace( cssTemplateRegex, 'background-image: url(' + CKEDITOR.getUrl( this.path ) + 'images/block_' ) - .replace( cssClassRegex, 'cke_show_blocks ' ) ); + .replace( cssClassRegex, 'cke_show_blocks ' ) + .replace( backgroundPositionRegex, editor.lang.dir == 'rtl' ? 'right' : 'left' ) ); editor.ui.addButton( 'ShowBlocks', { @@ -145,10 +151,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license /** * Whether to automaticaly enable the "show block" command when the editor - * loads. + * loads. (StartupShowBlocks in FCKeditor) + * @name CKEDITOR.config.startupOutlineBlocks * @type Boolean * @default false * @example * config.startupOutlineBlocks = true; */ -CKEDITOR.config.startupOutlineBlocks = false; -- cgit v1.3