From 5a9f9f486efb2112570304619fec171e1b7ffe16 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 24 Aug 2009 22:03:22 +0000 Subject: [PATCH] Make "ask user about using rich edit" work on IE6. Fixes #10808 (I hope). --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/RichEdit.pm | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 2eabdbc83..1ba7ca548 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.7.19 + - fixed #10808: Ask user about using rich edit option causes error in IE6 - fixed #10822: spectre pid sucks - fixed #10817: Datatable not internationalized - fixed #10816: Minor Capitalization Issue diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index 6b0ca4064..9c4946d05 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -477,10 +477,11 @@ sub getRichEditor { my @toolbarRows = map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3); my @toolbarButtons = map{ @{$_} } @toolbarRows; my $i18n = WebGUI::International->new($self->session, 'Asset_RichEdit'); + my $ask = $self->getValue("askAboutRichEdit"); my %config = ( - mode => "exact", + mode => $ask ? "none" : "exact", elements => $nameId, - theme => "advanced", + theme => "advanced", relative_urls => JSON::false(), remove_script_host => JSON::true(), auto_reset_designmode => JSON::true(), @@ -503,10 +504,9 @@ sub getRichEditor { valid_elements => $self->getValue("validElements"), wg_userIsVisitor => $self->session->user->isVisitor ? JSON::true() : JSON::false(), ); - my $ask = $self->getValue("askAboutRichEdit"); - if ($ask) { - $config{oninit} = 'turnOffTinyMCE_'.$nameId; - } +# if ($ask) { +# $config{oninit} = 'turnOffTinyMCE_'.$nameId; +# } foreach my $button (@toolbarButtons) { if ($button eq "spellchecker" && $self->session->config->get('availableDictionaries')) { push(@plugins,"-wgspellchecker"); @@ -572,13 +572,15 @@ sub getRichEditor { $config{height} = $self->getValue("editorHeight") if ($self->getValue("editorHeight") > 0); $config{plugins} = join(",",@plugins); - $self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce.js'),{type=>"text/javascript"}); + $self->session->style->setScript($self->session->url->extras('yui/build/yahoo/yahoo-min.js'),{type=>"text/javascript"}); + $self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{type=>"text/javascript"}); + $self->session->style->setScript($self->session->url->extras('tinymce/jscripts/tiny_mce/tiny_mce_src.js'),{type=>"text/javascript"}); $self->session->style->setScript($self->session->url->extras("tinymce-webgui/callbacks.js"),{type=>"text/javascript"}); my $out = ''; if ($ask) { $out = q||.$i18n->get('Toggle editor').q||; } - $out .= q|