From 1096cdefb1c9a3f3c4ca6807e272da6c92e5ed9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 4 Apr 2016 23:55:13 +0200 Subject: Upgrade to 4.5.8 --- sources/plugins/button/lang/ast.js | 8 ++++++++ sources/plugins/floatpanel/plugin.js | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 sources/plugins/button/lang/ast.js (limited to 'sources/plugins') diff --git a/sources/plugins/button/lang/ast.js b/sources/plugins/button/lang/ast.js new file mode 100644 index 0000000..5ab7bf6 --- /dev/null +++ b/sources/plugins/button/lang/ast.js @@ -0,0 +1,8 @@ +/** + * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. + * For licensing, see LICENSE.md or http://ckeditor.com/license + */ + +CKEDITOR.plugins.setLang( 'button', 'ast', { + selectedLabel: '%1 (Seleicionáu)' +} ); diff --git a/sources/plugins/floatpanel/plugin.js b/sources/plugins/floatpanel/plugin.js index 0de3e5e..c104037 100644 --- a/sources/plugins/floatpanel/plugin.js +++ b/sources/plugins/floatpanel/plugin.js @@ -270,8 +270,8 @@ CKEDITOR.plugins.add( 'floatpanel', { target.removeStyle( 'width' ); if ( block.autoSize ) { - var panelDoc = block.element.getDocument(); - var width = ( CKEDITOR.env.webkit ? block.element : panelDoc.getBody() ).$.scrollWidth; + var panelDoc = block.element.getDocument(), + width = ( ( CKEDITOR.env.webkit || CKEDITOR.env.edge ) ? block.element : panelDoc.getBody() ).$.scrollWidth; // Account for extra height needed due to IE quirks box model bug: // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug -- cgit v1.2.3