oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix [ 1216061 ] 2 rich editors - 1 field

Browse source
This commit is contained in:
Matthew Wilson 2005-06-13 19:44:20 +00:00
parent e236ea22a0
commit b263d76b15
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/changelog/6.x.x.txt
View file

@ -15,7 +15,7 @@
- fix [ 1214399 ] Admin Bar Unusable - fix [ 1214399 ] Admin Bar Unusable
- fix [ 1196086 ] certain DOCTYPEs break the admin slidebar - fix [ 1196086 ] certain DOCTYPEs break the admin slidebar
- fix [ 1189186 ] 6.6 CVS Admin menu is invisible on failsafe templater - fix [ 1189186 ] 6.6 CVS Admin menu is invisible on failsafe templater
- fix [ 1215228 ] getToolbar uses get("url") instead of getUrl - fix [ 1215228 ] getToolbar uses get("url") instead of getUrl [mwilson]
- fix [ 1187040 ] getNextChildRank doesn't handle rank 999999 - fix [ 1187040 ] getNextChildRank doesn't handle rank 999999
- fix [ 1179021 ] cannot set default value of 0 in several form elements - fix [ 1179021 ] cannot set default value of 0 in several form elements
- fix [ 1172993 ] Product asset issues - fix [ 1172993 ] Product asset issues
@ -28,9 +28,10 @@
- fix [ 1216062 ] http proxy not proxing images - fix [ 1216062 ] http proxy not proxing images
- fix [ 1216066 ] url caching broken - fix [ 1216066 ] url caching broken
- fix [ 1218475 ] cannot set "who to view" in style templates - fix [ 1218475 ] cannot set "who to view" in style templates
- fix [ 1219745 ] setSize doesn't work with Images - fix [ 1219745 ] setSize doesn't work with Images [mwilson]
- fix [ 1206045 ] Max Image Size don't work - fix [ 1206045 ] Max Image Size don't work [mwilson]
- fix [ 1219805 ] storage.pm renameFile refers to getNode - fix [ 1219805 ] storage.pm renameFile refers to getNode [mwilson]
- fix [ 1216061 ] 2 rich editors - 1 field [mwilson]
6.6.1 6.6.1

5
lib/WebGUI/Asset/RichEdit.pm
View file

@ -401,7 +401,7 @@ sub getName {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub getRichEditor { sub getRichEditor {
my $self = shift; my $self = shift;
my $calledAsWebMethod = shift; my $nameId = shift;
my @toolbarRow1 = split("\n",$self->getValue("toolbarRow1")); my @toolbarRow1 = split("\n",$self->getValue("toolbarRow1"));
push(@toolbarRow1,"contextmenu") if ($self->getValue("enableContextMenu")); push(@toolbarRow1,"contextmenu") if ($self->getValue("enableContextMenu"));
my @toolbarRow2 = split("\n",$self->getValue("toolbarRow2")); my @toolbarRow2 = split("\n",$self->getValue("toolbarRow2"));
@ -409,7 +409,8 @@ sub getRichEditor {
my @toolbarButtons = (@toolbarRow1,@toolbarRow2,@toolbarRow3); my @toolbarButtons = (@toolbarRow1,@toolbarRow2,@toolbarRow3);
my @plugins; my @plugins;
my %config = ( my %config = (
mode => "specific_textareas", mode => "exact",
elements => $nameId,
theme => "advanced", theme => "advanced",
document_base_url => "/", document_base_url => "/",
auto_reset_designmode => "true", auto_reset_designmode => "true",

2
lib/WebGUI/Form.pm
View file

@ -1189,7 +1189,7 @@ sub HTMLArea {
defaultValue=>$params->{defaultValue} defaultValue=>$params->{defaultValue}
}); });
WebGUI::Style::setScript($session{config}{extrasURL}.'/textFix.js',{ type=>'text/javascript' }); WebGUI::Style::setScript($session{config}{extrasURL}.'/textFix.js',{ type=>'text/javascript' });
$output .= WebGUI::Asset::RichEdit->new($richEditId)->getRichEditor; $output .= WebGUI::Asset::RichEdit->new($richEditId)->getRichEditor($params->{name});
return $output; return $output;
} }