Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 4363)
+++ /CKEditor/trunk/CHANGES.html (revision 4364)
@@ -84,4 +84,5 @@
#4512 : Fixed styles plugin incorrectly adding semicolons to style text.
#3855 : Fixed loading unminified _source files when ckeditor_source.js is used.
+ #3717 : Dialog settings defaults can now be overridden in-page through the CKEDITOR.config object.
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 4363)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 4364)
@@ -1440,4 +1440,7 @@
margins = skinData[ editor.skinName ].margins || [ 0, 0, 0, 0 ];
+ if ( typeof magnetDistance == 'undefined' )
+ magnetDistance = 20;
+
function mouseMoveHandler( evt )
{
@@ -1663,5 +1666,5 @@
'; z-index: ', editor.config.baseFloatZIndex,
'; top: 0px; left: 0px; ',
- 'background-color: ', editor.config.dialog_backgroundCoverColor,
+ 'background-color: ', editor.config.dialog_backgroundCoverColor || 'white',
'" id="cke_dialog_background_cover">'
];
@@ -1755,5 +1758,8 @@
scrollFunc();
}
- element.setOpacity( editor.config.dialog_backgroundCoverOpacity );
+
+ var opacity = editor.config.dialog_backgroundCoverOpacity;
+ element.setOpacity( typeof opacity != 'undefined' ? opacity : 0.5 );
+
element.appendTo( CKEDITOR.document.getBody() );
};
@@ -2736,14 +2742,15 @@
* The color of the dialog background cover. It should be a valid CSS color
* string.
+ * @name CKEDITOR.config.dialog_backgroundCoverColor
* @type String
- * @default white
+ * @default 'white'
* @example
* config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
*/
-CKEDITOR.config.dialog_backgroundCoverColor = 'white';
/**
* The opacity of the dialog background cover. It should be a number within the
* range [0.0, 1.0].
+ * @name CKEDITOR.config.dialog_backgroundCoverOpacity
* @type Number
* @default 0.5
@@ -2751,9 +2758,9 @@
* config.dialog_backgroundCoverOpacity = 0.7;
*/
-CKEDITOR.config.dialog_backgroundCoverOpacity = 0.5;
/**
* The distance of magnetic borders used in moving and resizing dialogs,
* measured in pixels.
+ * @name CKEDITOR.config.dialog_magnetDistance
* @type Number
* @default 20
@@ -2761,3 +2768,2 @@
* config.dialog_magnetDistance = 30;
*/
-CKEDITOR.config.dialog_magnetDistance = 20;