Commit 11c19e9a authored by sun's avatar sun

#299108 by toniw: Added setting for TinyMCE's auto-cleanup paste feature.

parent d776dee6
......@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#299108 by toniw: Added setting for TinyMCE's auto-cleanup paste feature.
#293916 by sun: Clarified TinyMCE compatibility in README.txt.
#293425 by sun: Fixed foreach warning during upgrade from TinyMCE module.
#292517 by sun: Fixed SQL error during upgrade from TinyMCE module.
......
......@@ -80,6 +80,7 @@ function wysiwyg_editor_profile_form($form_state, $edit) {
'convert_fonts_to_spans' => TRUE,
'remove_linebreaks' => TRUE,
'apply_source_formatting' => FALSE,
'paste_auto_cleanup_on_paste' => FALSE,
'css_setting' => 'theme',
'css_path' => NULL,
'css_classes' => NULL,
......@@ -345,6 +346,14 @@ function wysiwyg_editor_profile_form($form_state, $edit) {
'#description' => t('This option makes TinyMCE apply source formatting. Set this to true for a cleaner HTML source. Choose false to avoid conflicts with some filters.'),
);
$form['output']['paste_auto_cleanup_on_paste'] = array(
'#type' => 'select',
'#title' => t('Force Word cleanup on standard paste'),
'#default_value' => $edit->settings['paste_auto_cleanup_on_paste'],
'#options' => array(TRUE => t('Enabled'), FALSE => t('Disabled')),
'#description' => t('Enable this option to have the default paste function (CTRL-V or SHIFT-INS) to behave like the "paste from word" plugin function.'),
);
$form['css'] = array(
'#type' => 'fieldset',
'#title' => t('CSS'),
......
......@@ -398,6 +398,7 @@ function wysiwyg_editor_config($profile, $theme) {
$init['convert_fonts_to_spans'] = $settings['convert_fonts_to_spans'] ? $settings['convert_fonts_to_spans'] : TRUE;
$init['remove_linebreaks'] = $settings['remove_linebreaks'] ? $settings['remove_linebreaks'] : TRUE;
$init['apply_source_formatting'] = $settings['apply_source_formatting'] ? $settings['apply_source_formatting'] : FALSE;
$init['paste_auto_cleanup_on_paste'] = $settings['paste_auto_cleanup_on_paste'] ? $settings['paste_auto_cleanup_on_paste'] : FALSE;
$init['theme_advanced_resize_horizontal'] = FALSE;
$init['theme_advanced_resizing_use_cookie'] = FALSE;
......
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