Merge branch 't/16586' into major

ckeditor · Nov 2, 2016 · 8993122 · 8993122
2 parents 5404260 + 7a834e6
commit 8993122
Show file tree

Hide file tree

Showing 108 changed files with 302 additions and 288 deletions.
diff --git a/plugins/about/icons/hidpi/about.png b/plugins/about/icons/hidpi/about.png
diff --git a/plugins/basicstyles/icons/hidpi/bold.png b/plugins/basicstyles/icons/hidpi/bold.png
diff --git a/plugins/basicstyles/icons/hidpi/italic.png b/plugins/basicstyles/icons/hidpi/italic.png
diff --git a/plugins/basicstyles/icons/hidpi/strike.png b/plugins/basicstyles/icons/hidpi/strike.png
diff --git a/plugins/basicstyles/icons/hidpi/subscript.png b/plugins/basicstyles/icons/hidpi/subscript.png
diff --git a/plugins/basicstyles/icons/hidpi/superscript.png b/plugins/basicstyles/icons/hidpi/superscript.png
diff --git a/plugins/basicstyles/icons/hidpi/underline.png b/plugins/basicstyles/icons/hidpi/underline.png
diff --git a/plugins/bidi/icons/hidpi/bidiltr.png b/plugins/bidi/icons/hidpi/bidiltr.png
diff --git a/plugins/bidi/icons/hidpi/bidirtl.png b/plugins/bidi/icons/hidpi/bidirtl.png
diff --git a/plugins/blockquote/icons/hidpi/blockquote.png b/plugins/blockquote/icons/hidpi/blockquote.png
diff --git a/plugins/clipboard/icons/hidpi/copy-rtl.png b/plugins/clipboard/icons/hidpi/copy-rtl.png
diff --git a/plugins/clipboard/icons/hidpi/copy.png b/plugins/clipboard/icons/hidpi/copy.png
diff --git a/plugins/clipboard/icons/hidpi/cut-rtl.png b/plugins/clipboard/icons/hidpi/cut-rtl.png
diff --git a/plugins/clipboard/icons/hidpi/cut.png b/plugins/clipboard/icons/hidpi/cut.png
diff --git a/plugins/clipboard/icons/hidpi/paste-rtl.png b/plugins/clipboard/icons/hidpi/paste-rtl.png
diff --git a/plugins/clipboard/icons/hidpi/paste.png b/plugins/clipboard/icons/hidpi/paste.png
diff --git a/plugins/codesnippet/icons/hidpi/codesnippet.png b/plugins/codesnippet/icons/hidpi/codesnippet.png
diff --git a/plugins/colorbutton/icons/hidpi/bgcolor.png b/plugins/colorbutton/icons/hidpi/bgcolor.png
diff --git a/plugins/colorbutton/icons/hidpi/textcolor.png b/plugins/colorbutton/icons/hidpi/textcolor.png
diff --git a/plugins/copyformatting/icons/copyformatting.png b/plugins/copyformatting/icons/copyformatting.png
diff --git a/plugins/copyformatting/icons/hidpi/copyformatting.png b/plugins/copyformatting/icons/hidpi/copyformatting.png
diff --git a/plugins/div/icons/hidpi/creatediv.png b/plugins/div/icons/hidpi/creatediv.png
diff --git a/plugins/docprops/icons/hidpi/docprops-rtl.png b/plugins/docprops/icons/hidpi/docprops-rtl.png
diff --git a/plugins/docprops/icons/hidpi/docprops.png b/plugins/docprops/icons/hidpi/docprops.png
diff --git a/plugins/find/icons/hidpi/find-rtl.png b/plugins/find/icons/hidpi/find-rtl.png
diff --git a/plugins/find/icons/hidpi/find.png b/plugins/find/icons/hidpi/find.png
diff --git a/plugins/find/icons/hidpi/replace.png b/plugins/find/icons/hidpi/replace.png
diff --git a/plugins/flash/icons/hidpi/flash.png b/plugins/flash/icons/hidpi/flash.png
diff --git a/plugins/forms/icons/hidpi/button.png b/plugins/forms/icons/hidpi/button.png
diff --git a/plugins/forms/icons/hidpi/checkbox.png b/plugins/forms/icons/hidpi/checkbox.png
diff --git a/plugins/forms/icons/hidpi/form.png b/plugins/forms/icons/hidpi/form.png
diff --git a/plugins/forms/icons/hidpi/hiddenfield.png b/plugins/forms/icons/hidpi/hiddenfield.png
diff --git a/plugins/forms/icons/hidpi/imagebutton.png b/plugins/forms/icons/hidpi/imagebutton.png
diff --git a/plugins/forms/icons/hidpi/radio.png b/plugins/forms/icons/hidpi/radio.png
diff --git a/plugins/forms/icons/hidpi/select-rtl.png b/plugins/forms/icons/hidpi/select-rtl.png
diff --git a/plugins/forms/icons/hidpi/select.png b/plugins/forms/icons/hidpi/select.png
diff --git a/plugins/forms/icons/hidpi/textarea-rtl.png b/plugins/forms/icons/hidpi/textarea-rtl.png
diff --git a/plugins/forms/icons/hidpi/textarea.png b/plugins/forms/icons/hidpi/textarea.png
diff --git a/plugins/forms/icons/hidpi/textfield-rtl.png b/plugins/forms/icons/hidpi/textfield-rtl.png
diff --git a/plugins/forms/icons/hidpi/textfield.png b/plugins/forms/icons/hidpi/textfield.png
diff --git a/plugins/horizontalrule/icons/hidpi/horizontalrule.png b/plugins/horizontalrule/icons/hidpi/horizontalrule.png
diff --git a/plugins/iframe/icons/hidpi/iframe.png b/plugins/iframe/icons/hidpi/iframe.png
diff --git a/plugins/image/icons/hidpi/image.png b/plugins/image/icons/hidpi/image.png
diff --git a/plugins/image2/icons/hidpi/image.png b/plugins/image2/icons/hidpi/image.png
diff --git a/plugins/indent/icons/hidpi/indent-rtl.png b/plugins/indent/icons/hidpi/indent-rtl.png
diff --git a/plugins/indent/icons/hidpi/indent.png b/plugins/indent/icons/hidpi/indent.png
diff --git a/plugins/indent/icons/hidpi/outdent-rtl.png b/plugins/indent/icons/hidpi/outdent-rtl.png
diff --git a/plugins/indent/icons/hidpi/outdent.png b/plugins/indent/icons/hidpi/outdent.png
diff --git a/plugins/justify/icons/hidpi/justifyblock.png b/plugins/justify/icons/hidpi/justifyblock.png
diff --git a/plugins/justify/icons/hidpi/justifycenter.png b/plugins/justify/icons/hidpi/justifycenter.png
diff --git a/plugins/justify/icons/hidpi/justifyleft.png b/plugins/justify/icons/hidpi/justifyleft.png
diff --git a/plugins/justify/icons/hidpi/justifyright.png b/plugins/justify/icons/hidpi/justifyright.png
diff --git a/plugins/language/icons/hidpi/language.png b/plugins/language/icons/hidpi/language.png
diff --git a/plugins/link/icons/hidpi/anchor-rtl.png b/plugins/link/icons/hidpi/anchor-rtl.png
diff --git a/plugins/link/icons/hidpi/anchor.png b/plugins/link/icons/hidpi/anchor.png
diff --git a/plugins/link/icons/hidpi/link.png b/plugins/link/icons/hidpi/link.png
diff --git a/plugins/link/icons/hidpi/unlink.png b/plugins/link/icons/hidpi/unlink.png
diff --git a/plugins/link/images/anchor.png b/plugins/link/images/anchor.png
diff --git a/plugins/link/images/hidpi/anchor.png b/plugins/link/images/hidpi/anchor.png
diff --git a/plugins/list/icons/hidpi/bulletedlist-rtl.png b/plugins/list/icons/hidpi/bulletedlist-rtl.png
diff --git a/plugins/list/icons/hidpi/bulletedlist.png b/plugins/list/icons/hidpi/bulletedlist.png
diff --git a/plugins/list/icons/hidpi/numberedlist-rtl.png b/plugins/list/icons/hidpi/numberedlist-rtl.png
diff --git a/plugins/list/icons/hidpi/numberedlist.png b/plugins/list/icons/hidpi/numberedlist.png
diff --git a/plugins/maximize/icons/hidpi/maximize.png b/plugins/maximize/icons/hidpi/maximize.png
diff --git a/plugins/newpage/icons/hidpi/newpage-rtl.png b/plugins/newpage/icons/hidpi/newpage-rtl.png
diff --git a/plugins/newpage/icons/hidpi/newpage.png b/plugins/newpage/icons/hidpi/newpage.png
diff --git a/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png b/plugins/pagebreak/icons/hidpi/pagebreak-rtl.png
diff --git a/plugins/pagebreak/icons/hidpi/pagebreak.png b/plugins/pagebreak/icons/hidpi/pagebreak.png
diff --git a/plugins/pastefromword/icons/hidpi/pastefromword-rtl.png b/plugins/pastefromword/icons/hidpi/pastefromword-rtl.png
diff --git a/plugins/pastefromword/icons/hidpi/pastefromword.png b/plugins/pastefromword/icons/hidpi/pastefromword.png
diff --git a/plugins/pastetext/icons/hidpi/pastetext-rtl.png b/plugins/pastetext/icons/hidpi/pastetext-rtl.png
diff --git a/plugins/pastetext/icons/hidpi/pastetext.png b/plugins/pastetext/icons/hidpi/pastetext.png
diff --git a/plugins/placeholder/icons/hidpi/placeholder.png b/plugins/placeholder/icons/hidpi/placeholder.png
diff --git a/plugins/preview/icons/hidpi/preview-rtl.png b/plugins/preview/icons/hidpi/preview-rtl.png
diff --git a/plugins/preview/icons/hidpi/preview.png b/plugins/preview/icons/hidpi/preview.png
diff --git a/plugins/print/icons/hidpi/print.png b/plugins/print/icons/hidpi/print.png
diff --git a/plugins/removeformat/icons/hidpi/removeformat.png b/plugins/removeformat/icons/hidpi/removeformat.png
diff --git a/plugins/save/icons/hidpi/save.png b/plugins/save/icons/hidpi/save.png
diff --git a/plugins/selectall/icons/hidpi/selectall.png b/plugins/selectall/icons/hidpi/selectall.png
diff --git a/plugins/showblocks/icons/hidpi/showblocks-rtl.png b/plugins/showblocks/icons/hidpi/showblocks-rtl.png
diff --git a/plugins/showblocks/icons/hidpi/showblocks.png b/plugins/showblocks/icons/hidpi/showblocks.png
diff --git a/plugins/smiley/icons/hidpi/smiley.png b/plugins/smiley/icons/hidpi/smiley.png
diff --git a/plugins/sourcearea/icons/hidpi/source-rtl.png b/plugins/sourcearea/icons/hidpi/source-rtl.png
diff --git a/plugins/sourcearea/icons/hidpi/source.png b/plugins/sourcearea/icons/hidpi/source.png
diff --git a/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png b/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png
diff --git a/plugins/sourcedialog/icons/hidpi/sourcedialog.png b/plugins/sourcedialog/icons/hidpi/sourcedialog.png
diff --git a/plugins/specialchar/icons/hidpi/specialchar.png b/plugins/specialchar/icons/hidpi/specialchar.png
diff --git a/plugins/table/icons/hidpi/table.png b/plugins/table/icons/hidpi/table.png
diff --git a/plugins/templates/icons/hidpi/templates-rtl.png b/plugins/templates/icons/hidpi/templates-rtl.png
diff --git a/plugins/templates/icons/hidpi/templates.png b/plugins/templates/icons/hidpi/templates.png
diff --git a/plugins/uicolor/icons/hidpi/uicolor.png b/plugins/uicolor/icons/hidpi/uicolor.png
diff --git a/plugins/undo/icons/hidpi/redo-rtl.png b/plugins/undo/icons/hidpi/redo-rtl.png
diff --git a/plugins/undo/icons/hidpi/redo.png b/plugins/undo/icons/hidpi/redo.png
diff --git a/plugins/undo/icons/hidpi/undo-rtl.png b/plugins/undo/icons/hidpi/undo-rtl.png
diff --git a/plugins/undo/icons/hidpi/undo.png b/plugins/undo/icons/hidpi/undo.png
diff --git a/skins/moono-lisa/dev/icons16.png b/skins/moono-lisa/dev/icons16.png
diff --git a/skins/moono-lisa/dev/icons16.svg b/skins/moono-lisa/dev/icons16.svg
diff --git a/skins/moono-lisa/dev/icons32.png b/skins/moono-lisa/dev/icons32.png
diff --git a/skins/moono-lisa/dev/icons32.svg b/skins/moono-lisa/dev/icons32.svg
diff --git a/skins/moono-lisa/dev/locations.json b/skins/moono-lisa/dev/locations.json
@@ -102,7 +102,8 @@
 		"plugins/link/icons/link.png",
 		"plugins/link/icons/unlink.png",
 		"plugins/link/icons/anchor.png",
-		"plugins/link/icons/anchor-rtl.png"
+		"plugins/link/icons/anchor-rtl.png",
+		"plugins/copyformatting/icons/copyformatting.png"
 	],
 	"7": [
 		[

diff --git a/skins/moono-lisa/images/hidpi/close.png b/skins/moono-lisa/images/hidpi/close.png
diff --git a/skins/moono-lisa/images/hidpi/lock-open.png b/skins/moono-lisa/images/hidpi/lock-open.png
diff --git a/skins/moono-lisa/images/hidpi/lock.png b/skins/moono-lisa/images/hidpi/lock.png
diff --git a/skins/moono-lisa/images/hidpi/refresh.png b/skins/moono-lisa/images/hidpi/refresh.png
diff --git a/skins/moono/dev/locations.json b/skins/moono/dev/locations.json
@@ -102,7 +102,8 @@
 		"plugins/link/icons/link.png",
 		"plugins/link/icons/unlink.png",
 		"plugins/link/icons/anchor.png",
-		"plugins/link/icons/anchor-rtl.png"
+		"plugins/link/icons/anchor-rtl.png",
+		"plugins/copyformatting/icons/copyformatting.png"
 	],
 	"7": [
 		[
@@ -141,4 +142,4 @@
 		"skins/moono/images/lock-open.png",
 		"skins/moono/images/refresh.png"
 	]
-}
+}
diff --git a/skins/moono/icons/copyformatting.png b/skins/moono/icons/copyformatting.png
diff --git a/skins/moono/icons/hidpi/copyformatting.png b/skins/moono/icons/hidpi/copyformatting.png
diff --git a/skins/moono/skin.js b/skins/moono/skin.js
@@ -293,7 +293,7 @@ CKEDITOR.skin.chameleon = ( function() {
 	// The available icons. This list must match the file names (without
 	// extension) available inside the "icons" folder.
 	var icons = ( 'about,anchor-rtl,anchor,bgcolor,bidiltr,bidirtl,blockquote,' +
-		'bold,bulletedlist-rtl,bulletedlist,button,checkbox,copy-rtl,copy,' +
+		'bold,bulletedlist-rtl,bulletedlist,button,checkbox,copy-rtl,copy,copyformatting,' +
 		'creatediv,cut-rtl,cut,docprops-rtl,docprops,find-rtl,find,flash,form,' +
 		'hiddenfield,horizontalrule,icons,iframe,image,imagebutton,indent-rtl,' +
 		'indent,italic,justifyblock,justifycenter,justifyleft,justifyright,' +