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

Make Rich Edit assets drop blank toolbar rows, shifting subsequent rows up.

Browse source
This commit is contained in:
Drake 2006-11-07 22:25:47 +00:00
parent 375d24bfa9
commit f5832ee280
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -38,6 +38,7 @@
- fix: Post titles containing periods result in urls containing periods - fix: Post titles containing periods result in urls containing periods
- fix: Activity list expands outside of edit workflow screen - fix: Activity list expands outside of edit workflow screen
- fix: Thread layout "flat" doesn't stick - fix: Thread layout "flat" doesn't stick
- fix: Rich Edit omitting rows drops subsequent rows
7.1.4 7.1.4
- Template variables in the main Survey Template were out of date in the - Template variables in the main Survey Template were out of date in the

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

@ -433,12 +433,11 @@ sub getRichEditor {
my $self = shift; my $self = shift;
return '' if ($self->getValue('disableRichEditor') || $self->session->env->get("HTTP_USER_AGENT") =~ /Safari/); return '' if ($self->getValue('disableRichEditor') || $self->session->env->get("HTTP_USER_AGENT") =~ /Safari/);
my $nameId = shift; my $nameId = shift;
my @toolbarRow1 = split("\n",$self->getValue("toolbarRow1")); my @toolbarRows = grep{@$_} map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3);
push(@toolbarRow1,"contextmenu") if ($self->getValue("enableContextMenu")); push(@{$toolbarRows[0]},"contextmenu") if ($self->getValue("enableContextMenu"));
my @toolbarRow2 = split("\n",$self->getValue("toolbarRow2")); my @toolbarButtons = map{@$_} @toolbarRows;
my @toolbarRow3 = split("\n",$self->getValue("toolbarRow3"));
my @toolbarButtons = (@toolbarRow1,@toolbarRow2,@toolbarRow3);
my @plugins; my @plugins;
my $i18n = WebGUI::International->new($self->session, 'Asset_RichEdit'); my $i18n = WebGUI::International->new($self->session, 'Asset_RichEdit');
my %config = ( my %config = (
mode => "exact", mode => "exact",
@ -451,9 +450,8 @@ sub getRichEditor {
cleanup_callback => "tinyMCE_WebGUI_Cleanup", cleanup_callback => "tinyMCE_WebGUI_Cleanup",
urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor", urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor",
theme_advanced_resizing => "true", theme_advanced_resizing => "true",
theme_advanced_buttons1 => join(",",@toolbarRow1), (map { "theme_advanced_buttons".($_+1) => (join ',', @{$toolbarRows[$_]}) }
theme_advanced_buttons2 => join(",",@toolbarRow2), (0..$#toolbarRows)),
theme_advanced_buttons3 => join(",",@toolbarRow3),
ask => $self->getValue("askAboutRichEdit") ? "true" : "false", ask => $self->getValue("askAboutRichEdit") ? "true" : "false",
preformatted => $self->getValue("preformatted") ? "true" : "false", preformatted => $self->getValue("preformatted") ? "true" : "false",
force_br_newlines => $self->getValue("useBr") ? "true" : "false", force_br_newlines => $self->getValue("useBr") ? "true" : "false",