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

Remove inline JS from the Date and DateTime forms by putting the user's firstDayOfWeek preference

Browse source 
into the getWebuiProps.
This commit is contained in:
Colin Kuskie 2009-06-23 19:25:50 +00:00
parent 036e6eb3a0
commit 91029e8140
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,9 @@
- Updated auth to allow sending back of non-text/html mime types. - Updated auth to allow sending back of non-text/html mime types.
- fixed #10564: edit branch progress bar goes kablooey - fixed #10564: edit branch progress bar goes kablooey
- fixed #10565: Survey: add question doing double-create - fixed #10565: Survey: add question doing double-create
- fixed Photo resizing bugs with the Story asset. - fixed: Photo resizing bugs with the Story asset.
- Enabled better month and year navigation in the YUI date picker. (Tom Beharrell) - Enabled better month and year navigation in the YUI date picker. (Tom Beharrell)
- fixed: Add the user's first day of week data to getWebguiProperties and get rid of some inline javascript in the Data and DateTime forms.
7.7.11 7.7.11
- Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi) - Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi)

21
lib/WebGUI/Form/Date.pm
View file

@ -234,18 +234,19 @@ sub toHtml {
$self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' });
my $firstDow = $self->session->user->profileField("firstDayOfWeek"); #my $firstDow = $self->session->user->profileField("firstDayOfWeek");
$self->session->style->setRawHeadTags("<script type=\"text/javascript\">var webguiFirstDayOfWeek = $firstDow</script>"); #$self->session->style->setRawHeadTags("<script type=\"text/javascript\">var webguiFirstDayOfWeek = $firstDow</script>");
$self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' });
return WebGUI::Form::Text->new($self->session, my $field = WebGUI::Form::Text->new($self->session,
name=>$self->get("name"), name => $self->get("name"),
value=>$value, value => $value,
size=>$self->get("size"), size => $self->get("size"),
extras=>$self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this);"', extras => $self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this);"',
id=>$self->get('id'), id => $self->get('id'),
maxlength=>$self->get("maxlength") maxlength => $self->get("maxlength"),
)->toHtml; );
return $field->toHtml;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

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

@ -236,8 +236,6 @@ sub toHtml {
$self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' });
my $firstDow = $self->session->user->profileField("firstDayOfWeek");
$self->session->style->setRawHeadTags("<script type=\"text/javascript\">window.webguiFirstDayOfWeek = $firstDow</script>");
$self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' }); $self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' });
return WebGUI::Form::Text->new($self->session, return WebGUI::Form::Text->new($self->session,

20
lib/WebGUI/Session/Style.pm
View file

@ -210,22 +210,23 @@ $session->asset's ancestors.
=cut =cut
sub process { sub process {
my $self = shift; my $self = shift;
my $session = $self->session;
my %var; my %var;
$var{'body.content'} = shift; $var{'body.content'} = shift;
my $templateId = shift; my $templateId = shift;
if ($self->{_makePrintable} && $self->session->asset) { if ($self->{_makePrintable} && $self->session->asset) {
$templateId = $self->{_printableStyleId} || $self->session->asset->get("printableStyleTemplateId"); $templateId = $self->{_printableStyleId} || $session->asset->get("printableStyleTemplateId");
my $currAsset = $self->session->asset; my $currAsset = $session->asset;
my $rootAssetId = WebGUI::Asset->getRoot($self->session)->getId; my $rootAssetId = WebGUI::Asset->getRoot($session)->getId;
TEMPLATE: until ($templateId) { TEMPLATE: until ($templateId) {
# some assets don't have this property. But at least one ancestor should.... # some assets don't have this property. But at least one ancestor should....
$currAsset = $currAsset->getParent; $currAsset = $currAsset->getParent;
$templateId = $currAsset->get("printableStyleTemplateId"); $templateId = $currAsset->get("printableStyleTemplateId");
last TEMPLATE if $currAsset->getId eq $rootAssetId; last TEMPLATE if $currAsset->getId eq $rootAssetId;
} }
} elsif ($self->session->scratch->get("personalStyleId") ne "") { } elsif ($session->scratch->get("personalStyleId") ne "") {
$templateId = $self->session->scratch->get("personalStyleId"); $templateId = $session->scratch->get("personalStyleId");
} elsif ($self->{_useEmptyStyle}) { } elsif ($self->{_useEmptyStyle}) {
$templateId = 'PBtmpl0000000000000132'; $templateId = 'PBtmpl0000000000000132';
} }
@ -237,8 +238,9 @@ $var{'head.tags'} = '
<script type="text/javascript"> <script type="text/javascript">
function getWebguiProperty (propName) { function getWebguiProperty (propName) {
var props = new Array(); var props = new Array();
props["extrasURL"] = "'.$self->session->url->extras().'"; props["extrasURL"] = "' . $session->url->extras().'";
props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'"; props["pageURL"] = "' . $session->url->page(undef, undef, 1).'";
props["firstDayOfWeek"] = "'. $session->user->get('firstDayOfWeek').'";
return props[propName]; return props[propName];
} }
</script> </script>