diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-04-04 23:55:13 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-04-06 00:23:49 +0200 |
commit | 1096cdefb1c9a3f3c4ca6807e272da6c92e5ed9c (patch) | |
tree | 3be7d730ccdc6783d67321625c2bcc69933a7d99 /sources/plugins | |
parent | 3332bebe4da6dfa0fe3e4b2abddc84b1cc62f8f5 (diff) | |
download | piedsjaloux-ckeditor-component-1096cdefb1c9a3f3c4ca6807e272da6c92e5ed9c.tar.gz piedsjaloux-ckeditor-component-1096cdefb1c9a3f3c4ca6807e272da6c92e5ed9c.tar.zst piedsjaloux-ckeditor-component-1096cdefb1c9a3f3c4ca6807e272da6c92e5ed9c.zip |
Upgrade to 4.5.84.5.8
Diffstat (limited to 'sources/plugins')
-rw-r--r-- | sources/plugins/button/lang/ast.js | 8 | ||||
-rw-r--r-- | sources/plugins/floatpanel/plugin.js | 4 |
2 files changed, 10 insertions, 2 deletions
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 @@ | |||
1 | /** | ||
2 | * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | ||
3 | * For licensing, see LICENSE.md or http://ckeditor.com/license | ||
4 | */ | ||
5 | |||
6 | CKEDITOR.plugins.setLang( 'button', 'ast', { | ||
7 | selectedLabel: '%1 (Seleicionáu)' | ||
8 | } ); | ||
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', { | |||
270 | target.removeStyle( 'width' ); | 270 | target.removeStyle( 'width' ); |
271 | 271 | ||
272 | if ( block.autoSize ) { | 272 | if ( block.autoSize ) { |
273 | var panelDoc = block.element.getDocument(); | 273 | var panelDoc = block.element.getDocument(), |
274 | var width = ( CKEDITOR.env.webkit ? block.element : panelDoc.getBody() ).$.scrollWidth; | 274 | width = ( ( CKEDITOR.env.webkit || CKEDITOR.env.edge ) ? block.element : panelDoc.getBody() ).$.scrollWidth; |
275 | 275 | ||
276 | // Account for extra height needed due to IE quirks box model bug: | 276 | // Account for extra height needed due to IE quirks box model bug: |
277 | // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug | 277 | // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug |