diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index fa8b6c189..bf7c6347e 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,8 @@ - Added pagination to purchase history in commerce. - Added keyword tagging api. - Added keyword tagging to Wiki. + - Upgraded TinyMCE to 2.1.1.1. + - Safari 3 and above now fully supported in admin interface. - improved performance of EMS - upgraded YUI to 2.2.2 and YUI-ext to 1.0.1a - Improved error handling in Spectre when WebGUI hands it bad data. diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index 9383f0b26..691558f6a 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -431,7 +431,7 @@ sub getToolbar { #------------------------------------------------------------------- sub getRichEditor { my $self = shift; - return '' if ($self->getValue('disableRichEditor') || $self->session->env->get("HTTP_USER_AGENT") =~ /Safari/); + return '' if ($self->getValue('disableRichEditor')); my $nameId = shift; #my @toolbarRows = grep{@$_} map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3); my @toolbarRows = map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3); diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm index 7a558bc57..2017cfe5a 100644 --- a/lib/WebGUI/Form/HTMLArea.pm +++ b/lib/WebGUI/Form/HTMLArea.pm @@ -138,7 +138,7 @@ sub toHtml { if (defined $richEdit) { $self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' }); $self->set("extras", $self->get('extras') . ' onblur="fixChars(this.form.'.$self->get("name").')" mce_editable="true" '); - $self->set("resizeable", 0); + $self->set("resizable", 0); return $self->SUPER::toHtml.$richEdit->getRichEditor($self->get('id')); } else { $self->session->errorHandler->warn($i18n->get('rich editor load error','Form_HTMLArea')); diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm index 17f738599..5d6303bc1 100644 --- a/lib/WebGUI/Form/Textarea.pm +++ b/lib/WebGUI/Form/Textarea.pm @@ -62,7 +62,7 @@ Style attributes besides width and height which should be specified using the ab Flag that tells the User Profile system that this is a valid form element in a User Profile -=head4 resizeable +=head4 resizable A boolean indicating whether the text area can be reized by users. Defaults to 1. @@ -86,7 +86,7 @@ sub definition { style=>{ defaultValue => undef, }, - resizeable => { + resizable => { defaultValue => 1, }, profileEnabled=>{ @@ -112,10 +112,10 @@ sub toHtml { my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->get("value")))); my $width = $self->get('width') || 400; my $height = $self->get('height') || 150; - my $style = $self->get("style"); + my $style = "width: ".$width."px; height: ".$height."px; ".$self->get("style"); my $out = ''; + if ($self->get("resizable")) { $out = '
'.$out.'
'; - if ($self->get("resizeable")) { my ($style, $url) = $self->session->quick(qw(style url)); $style->setScript($url->extras("yui/build/yahoo/yahoo-min.js"), {type=>"text/javascript"}); $style->setScript($url->extras("yui/build/event/event-min.js"), {type=>"text/javascript"});