Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / js / ckeditor / build-config.js

diff --git a/js/ckeditor/build-config.js b/js/ckeditor/build-config.js
index 140602a..0e3b826 100644 (file)
--- a/js/ckeditor/build-config.js
+++ b/js/ckeditor/build-config.js
@@ -13,10 +13,10 @@
  * (1) http://ckeditor.com/builder\r
  *     Visit online builder to build CKEditor from scratch.\r
  *\r
- * (2) http://ckeditor.com/builder/78e5ac87b58ee46f1359aeb63013f54d\r
+ * (2) http://ckeditor.com/builder/43e1bb7eecc49e498b91b6045b267c42\r
  *     Visit online builder to build CKEditor, starting with the same setup as before.\r
  *\r
- * (3) http://ckeditor.com/builder/download/78e5ac87b58ee46f1359aeb63013f54d\r
+ * (3) http://ckeditor.com/builder/download/43e1bb7eecc49e498b91b6045b267c42\r
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.\r
  *\r
  * NOTE:\r
@@ -26,7 +26,7 @@
 \r
 var CKBUILDER_CONFIG = {\r
        skin: 'moono-lisa',\r
-       preset: 'basic',\r
+       preset: 'standard',\r
        ignore: [
                '.DS_Store',
                '.bender',
@@ -56,13 +56,13 @@ var CKBUILDER_CONFIG = {
                'enterkey' : 1,
                'entities' : 1,
                'floatingspace' : 1,
+               'horizontalrule' : 1,
                'indentlist' : 1,
                'link' : 1,
                'list' : 1,
                'removeformat' : 1,
-               'resize' : 1,
-               'toolbar' : 1,
-               'wysiwygarea' : 1
+               'sourcedialog' : 1,
+               'toolbar' : 1
        },
        languages : {
                'de' : 1,