merging 6.7.8 changes

This commit is contained in:
JT Smith 2005-11-22 20:28:44 +00:00
parent 4fefef959a
commit 5976238b44
2 changed files with 19 additions and 0 deletions

View file

@ -129,6 +129,13 @@ sub toHtml {
WebGUI::Style::setScript($session{config}{extrasURL}.'/textFix.js',{ type=>'text/javascript' });
$self->{extras} .= ' onblur="fixChars(this.form.'.$self->{name}.')" mce_editable="true" ';
return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->{richEditId})->getRichEditor($self->{id});
my $richEdit = WebGUI::Asset::RichEdit->new($self->{richEditId});
if ($defined) {
return $self->SUPER::toHtml.$richEdit->getRichEditor($self->{id});
} else {
return WebGUI::International::get('rich editor load error','Form_HTMLArea');
}
}

View file

@ -0,0 +1,12 @@
package WebGUI::i18n::English::Form_HTMLArea; ##Be sure to change the package name to match the filename
our $I18N = { ##hashref of hashes
'rich editor load error' => {
message => q|Can't instanciate rich editor.|,
lastUpdated => 0,
context => q|Error message letting the user know that loading the rich editor has failed for some reason.|
},
};
1;