[Jifty-commit] r4415 - in jifty/trunk: lib/Jifty/Web
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Nov 11 00:47:38 EST 2007
Author: jesse
Date: Sun Nov 11 00:47:37 2007
New Revision: 4415
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Web/PageRegion.pm
Log:
r71589 at pinglin: jesse | 2007-11-09 12:51:51 -0500
* Get rid of another place where we had a custom accessor that meant 'arguments' - for great consistency
Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm (original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm Sun Nov 11 00:47:37 2007
@@ -36,7 +36,7 @@
The path to the fragment that this page region contains. Defaults to
C</__jifty/empty>, which, as its name implies, is empty.
-=item defaults (optional)
+=item arguments (optional) (formerly 'defaults')
Specifies an optional set of parameter defaults. These should all be
simple scalars, as they might be passed across HTTP if AJAX is used.
@@ -82,6 +82,9 @@
@_
);
+
+ $args{'arguments'} ||= delete $args{'defaults'};
+
# Name is required
if (not defined $args{name}) {
warn "Name is required for page regions.";
@@ -89,16 +92,16 @@
}
# References don't go over HTTP very well
- if (grep {ref $_} values %{$args{defaults}}) {
- warn "Reference '$args{defaults}{$_}' passed as default for '$_' to region '$args{name}'"
- for grep {ref $args{defaults}{$_}} keys %{$args{defaults}};
+ if (grep {ref $_} values %{$args{arguments}}) {
+ warn "Reference '$args{arguments}{$_}' passed as default for '$_' to region '$args{name}'"
+ for grep {ref $args{arguments}{$_}} keys %{$args{arguments}};
return;
}
$self->name($args{name});
$self->qualified_name(Jifty->web->qualified_region($self));
$self->default_path($args{path});
- $self->default_arguments($args{defaults});
+ $self->default_arguments($args{arguments});
$self->force_arguments($args{force_arguments});
$self->force_path($args{force_path});
$self->arguments({});
More information about the Jifty-commit
mailing list