Merge branch 't/11717'

ckeditor · Mar 28, 2014 · 32de5b6 · 32de5b6
2 parents aed915e + 8549092
commit 32de5b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,8 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#11717](http://dev.ckeditor.com/ticket/11717): [Docprops](http://ckeditor.com/addon/docprops) plugin requires the [Colordialog](http://ckeditor.com/addon/colordialog) plugin to work.
+
 ## CKEditor 4.3.4
 
 Fixed Issues:

diff --git a/plugins/docprops/plugin.js b/plugins/docprops/plugin.js
@@ -4,7 +4,7 @@
  */
 
 CKEDITOR.plugins.add( 'docprops', {
-	requires: 'wysiwygarea,dialog',
+	requires: 'wysiwygarea,dialog,colordialog',
 	lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
 	icons: 'docprops,docprops-rtl', // %REMOVE_LINE_CORE%
 	hidpi: true, // %REMOVE_LINE_CORE%