Commit 92da632d authored by sun's avatar sun

#282717 by sun: Fixed FCKeditor default settings while FCKeditor maintainers get up and running.

parent f178028c
......@@ -6,6 +6,8 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#282717 by sun: Fixed FCKeditor default settings while FCKeditor maintainers get
up and running.
#319363 by sun: Changed JS settings namespace 'wysiwygEditor' to 'wysiwyg'.
#319363 by sun: Code clean-up; fixed missing namespace change in tinymce-3.js.
#273408 by quicksketch: Added blockquote button for TinyMCE 3.
......
......@@ -83,21 +83,21 @@ function wysiwyg_fckeditor_settings($editor, $config, $theme) {
$init = array(
'BasePath' => base_path() . $editor['editor path'] .'/',
'SkinPath' => base_path() . $editor['editor path'] .'/editor/skins/default/',
'Width' => '100%',
'Height' => 420,
'DefaultLanguage' => 'en',
'AutoDetectLanguage' => TRUE,
'Height' => 420,
'ToolbarStartExpanded' => TRUE,
'Width' => '100%',
'EnterMode' => 'p',
'ShiftEnterMode' => 'br',
'FontFormats' => strtr($config['block_formats'], array(',' => ';')),
'FormatSource' => $config['apply_source_formatting'],
'FormatOutput' => $config['preformatted'],
'LinkBrowser' => FALSE,
'ImageBrowser' => FALSE,
'FlashBrowser' => FALSE,
'LinkUpload' => FALSE,
'ImageBrowser' => FALSE,
'ImageUpload' => FALSE,
'FlashBrowser' => FALSE,
'FlashUpload' => FALSE,
);
......
......@@ -6,9 +6,7 @@
* See Drupal.wysiwyg.editor.attach.none() for a full desciption of this hook.
*/
Drupal.wysiwyg.editor.attach.fckeditor = function(context, params, settings) {
// @todo Convert string into variable name w/o overwriting string?
// workaround: build object via editors[this.id] = new ...
var FCKinstance = new FCKeditor(params.field);
var FCKinstance = new FCKeditor(params.field, settings[params.theme]['Width'], settings[params.theme]['Height']);
// Configure settings for this theme.
FCKinstance.BasePath = settings[params.theme].BasePath;
for (var setting in settings[params.theme]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment