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

- Safari 3 and above now fully supported in admin interface.

Browse source
This commit is contained in:
JT Smith 2007-07-07 21:55:20 +00:00
parent e04443c6ee
commit 6ce94b078d
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,8 @@
- Added pagination to purchase history in commerce. - Added pagination to purchase history in commerce.
- Added keyword tagging api. - Added keyword tagging api.
- Added keyword tagging to Wiki. - 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 - improved performance of EMS
- upgraded YUI to 2.2.2 and YUI-ext to 1.0.1a - upgraded YUI to 2.2.2 and YUI-ext to 1.0.1a
- Improved error handling in Spectre when WebGUI hands it bad data. - Improved error handling in Spectre when WebGUI hands it bad data.

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

@ -431,7 +431,7 @@ sub getToolbar {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub getRichEditor { 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'));
my $nameId = shift; my $nameId = shift;
#my @toolbarRows = grep{@$_} map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3); #my @toolbarRows = grep{@$_} map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3);
my @toolbarRows = map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3); my @toolbarRows = map{[split "\n", $self->getValue("toolbarRow$_")]} (1..3);

2
lib/WebGUI/Form/HTMLArea.pm
View file

@ -138,7 +138,7 @@ sub toHtml {
if (defined $richEdit) { if (defined $richEdit) {
$self->session->style->setScript($self->session->url->extras('textFix.js'),{ type=>'text/javascript' }); $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("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')); return $self->SUPER::toHtml.$richEdit->getRichEditor($self->get('id'));
} else { } else {
$self->session->errorHandler->warn($i18n->get('rich editor load error','Form_HTMLArea')); $self->session->errorHandler->warn($i18n->get('rich editor load error','Form_HTMLArea'));

8
lib/WebGUI/Form/Textarea.pm
View file

@ -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 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. A boolean indicating whether the text area can be reized by users. Defaults to 1.
@ -86,7 +86,7 @@ sub definition {
style=>{ style=>{
defaultValue => undef, defaultValue => undef,
}, },
resizeable => { resizable => {
defaultValue => 1, defaultValue => 1,
}, },
profileEnabled=>{ profileEnabled=>{
@ -112,10 +112,10 @@ sub toHtml {
my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->get("value")))); my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->get("value"))));
my $width = $self->get('width') || 400; my $width = $self->get('width') || 400;
my $height = $self->get('height') || 150; my $height = $self->get('height') || 150;
my $style = $self->get("style"); my $style = "width: ".$width."px; height: ".$height."px; ".$self->get("style");
my $out = '<textarea id="'.$self->get('id').'" name="'.$self->get("name").'" style="'.$style.'" '.$self->get("extras").'>'.$value.'</textarea>'; my $out = '<textarea id="'.$self->get('id').'" name="'.$self->get("name").'" style="'.$style.'" '.$self->get("extras").'>'.$value.'</textarea>';
if ($self->get("resizable")) {
$out = '<div style="border: 0px; width: '.$width.'px; height: '.$height.'px;" class="yresizable-pinned" id="'.$self->get('id').'_wrapper">'.$out.'</div>'; $out = '<div style="border: 0px; width: '.$width.'px; height: '.$height.'px;" class="yresizable-pinned" id="'.$self->get('id').'_wrapper">'.$out.'</div>';
if ($self->get("resizeable")) {
my ($style, $url) = $self->session->quick(qw(style url)); 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/yahoo/yahoo-min.js"), {type=>"text/javascript"});
$style->setScript($url->extras("yui/build/event/event-min.js"), {type=>"text/javascript"}); $style->setScript($url->extras("yui/build/event/event-min.js"), {type=>"text/javascript"});