Skip to content
Permalink
Browse files

Merge branch 't/14569' into major

  • Loading branch information...
mlewand committed Sep 16, 2016
2 parents 10377f5 + 163cebd commit f5bad7c6c152c8c75d93046a68496423335c2b0f
Showing 432 changed files with 4,589 additions and 87 deletions.
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

New Features:

* [#14569](http://dev.ckeditor.com/ticket/14569): Added new CKEditor skin.
* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin.
* [#13794](http://dev.ckeditor.com/ticket/13794): [Upload Image](http://ckeditor.com/addon/uploadimage) Use `uploaded.width/height` if set.
* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper that would identify the widget type.
@@ -42,7 +42,7 @@ else {
*
* CKEDITOR.skinName = 'myskin,/customstuff/myskin/';
*
* @cfg {String} [skinName='moono']
* @cfg {String} [skinName='moono-lisa']
* @member CKEDITOR
*/
CKEDITOR.skinName = 'moono';
CKEDITOR.skinName = 'moono-lisa';
@@ -6,7 +6,7 @@
/* exported CKBUILDER_CONFIG */

var CKBUILDER_CONFIG = {
skin: 'moono',
skin: 'moono-lisa',
ignore: [
'bender.js',
'.bender',
BIN -118 Bytes (86%) plugins/about/icons/about.png
Binary file not shown.
Binary file not shown.
BIN -233 Bytes (71%) plugins/basicstyles/icons/bold.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -298 Bytes (61%) plugins/bidi/icons/bidiltr.png
Binary file not shown.
BIN -294 Bytes (62%) plugins/bidi/icons/bidirtl.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -178 Bytes (74%) plugins/clipboard/icons/copy.png
Binary file not shown.
Binary file not shown.
BIN -255 Bytes (75%) plugins/clipboard/icons/cut.png
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -260 Bytes (64%) plugins/clipboard/icons/paste.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -2106,9 +2106,10 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
}

function showCover( editor ) {
var win = CKEDITOR.document.getWindow();
var config = editor.config,
backgroundColorStyle = config.dialog_backgroundCoverColor || 'white',
var win = CKEDITOR.document.getWindow(),
config = editor.config,
skinName = ( CKEDITOR.skinName || editor.config.skin ),
backgroundColorStyle = config.dialog_backgroundCoverColor || ( skinName == 'moono-lisa' ? 'black' : 'white' ),
backgroundCoverOpacity = config.dialog_backgroundCoverOpacity,
baseFloatZIndex = config.baseFloatZIndex,
coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, backgroundCoverOpacity, baseFloatZIndex ),
BIN -293 Bytes (66%) plugins/div/icons/creatediv.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -588,6 +588,7 @@
},
{
type: 'fieldset',
className: 'cke_dialog_find_fieldset',
label: CKEDITOR.tools.htmlEncode( lang.findOptions ),
style: 'margin-top:29px',
children: [ {
BIN -284 Bytes (71%) plugins/find/icons/find-rtl.png
Diff not rendered.
BIN -284 Bytes (71%) plugins/find/icons/find.png
Diff not rendered.
Diff not rendered.
BIN -1012 Bytes (58%) plugins/find/icons/hidpi/find.png
Diff not rendered.
Diff not rendered.
BIN -399 Bytes (58%) plugins/find/icons/replace.png
Diff not rendered.
@@ -327,6 +327,7 @@
type: 'hbox',
widths: [ '280px', '110px' ],
align: 'right',
className: 'cke_dialog_flash_url',
children: [ {
id: 'src',
type: 'text',
BIN -405 Bytes (61%) plugins/flash/icons/flash.png
Diff not rendered.
Diff not rendered.
@@ -1,4 +1,4 @@
/**
/**
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
@@ -210,6 +210,7 @@ CKEDITOR.dialog.add( 'select', function( editor ) {
},
{
type: 'hbox',
className: 'cke_dialog_forms_select_order_txtsize',
widths: [ '175px', '170px' ],
children: [ {
id: 'txtSize',
@@ -248,6 +249,7 @@ CKEDITOR.dialog.add( 'select', function( editor ) {
{
type: 'hbox',
widths: [ '115px', '115px', '100px' ],
className: 'cke_dialog_forms_select_order',
children: [ {
type: 'vbox',
children: [ {
BIN -35 Bytes (93%) plugins/forms/icons/button.png
Diff not rendered.
BIN -212 Bytes (72%) plugins/forms/icons/checkbox.png
Diff not rendered.
BIN -210 Bytes (64%) plugins/forms/icons/form.png
Diff not rendered.
BIN +374 Bytes (260%) plugins/forms/icons/hiddenfield.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -667 Bytes (51%) plugins/forms/icons/hidpi/form.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -219 Bytes (75%) plugins/forms/icons/radio.png
Diff not rendered.
BIN -162 Bytes (74%) plugins/forms/icons/select-rtl.png
Diff not rendered.
BIN -165 Bytes (73%) plugins/forms/icons/select.png
Diff not rendered.
Diff not rendered.
BIN -153 Bytes (77%) plugins/forms/icons/textarea.png
Diff not rendered.
Diff not rendered.
BIN -169 Bytes (71%) plugins/forms/icons/textfield.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -173 Bytes (83%) plugins/iframe/icons/iframe.png
Diff not rendered.
@@ -1,4 +1,4 @@
/**
/**
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
@@ -270,7 +270,7 @@

return {
title: editor.lang.image[ dialogType == 'image' ? 'title' : 'titleButton' ],
minWidth: 420,
minWidth: ( CKEDITOR.skinName || editor.config.skin ) == 'moono-lisa' ? 500 : 420,
minHeight: 360,
onShow: function() {
this.imageElement = false;
@@ -490,6 +490,7 @@
type: 'hbox',
widths: [ '280px', '110px' ],
align: 'right',
className: 'cke_dialog_image_url',
children: [ {
id: 'txtUrl',
type: 'text',
@@ -692,6 +693,7 @@
{
id: 'ratioLock',
type: 'html',
className: 'cke_dialog_image_ratiolock',
style: 'margin-top:30px;width:40px;height:40px;',
onLoad: function() {
// Activate Reset button
@@ -1014,6 +1016,7 @@
{
type: 'button',
id: 'browse',
className: 'cke_dialog_image_browse',
filebrowser: {
action: 'Browse',
target: 'Link:txtUrl',
Diff not rendered.
BIN -258 Bytes (66%) plugins/image/icons/image.png
Diff not rendered.
Diff not rendered.
BIN -258 Bytes (66%) plugins/image2/icons/image.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -222 Bytes (69%) plugins/indent/icons/indent.png
Diff not rendered.
Diff not rendered.
BIN -286 Bytes (59%) plugins/indent/icons/outdent.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -109,7 +109,7 @@

return {
title: linkLang.title,
minWidth: 350,
minWidth: ( CKEDITOR.skinName || editor.config.skin ) == 'moono-lisa' ? 450 : 350,
minHeight: 240,
contents: [ {
id: 'info',
BIN -241 Bytes (68%) plugins/link/icons/anchor-rtl.png
Diff not rendered.
BIN -240 Bytes (68%) plugins/link/icons/anchor.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -664 Bytes (59%) plugins/link/icons/hidpi/link.png
Diff not rendered.
Diff not rendered.
BIN -123 Bytes (81%) plugins/link/icons/link.png
Diff not rendered.
BIN -120 Bytes (85%) plugins/link/icons/unlink.png
Diff not rendered.
BIN +186 Bytes (130%) plugins/link/images/anchor.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.