[Jifty-commit] r7530 - in Template-Declare/branches/mixmaster: lib/Template lib/Template/Declare
Jifty commits
jifty-commit at lists.jifty.org
Thu Oct 8 15:17:04 EDT 2009
Author: theory
Date: Thu Oct 8 15:17:03 2009
New Revision: 7530
Modified:
Template-Declare/branches/mixmaster/lib/Template/Declare.pm
Template-Declare/branches/mixmaster/lib/Template/Declare/Tags.pm
Template-Declare/branches/mixmaster/t/mixing.t
Log:
Changed the `set` keyword to `setting` to avoid conflicts with Jifty.
Modified: Template-Declare/branches/mixmaster/lib/Template/Declare.pm
==============================================================================
--- Template-Declare/branches/mixmaster/lib/Template/Declare.pm (original)
+++ Template-Declare/branches/mixmaster/lib/Template/Declare.pm Thu Oct 8 15:17:03 2009
@@ -616,7 +616,7 @@
=head2 mix
mix Some::Clever::Mixin under '/mixin';
- mix Some::Other::Mixin under '/otmix', set { name => 'Larry' };
+ mix Some::Other::Mixin under '/otmix', setting { name => 'Larry' };
mix My::Mixin into My::View, under '/mymix';
Sometimes you want to mix templates from one class into another class;
@@ -625,7 +625,7 @@
template class as C<mixin/foo> and C<mixin/bar>.
The second example mixes in the templates defined in Some::Other::Mixin into
-into the calling class under the "/mymix" path. Furthermore, those mixed-in
+into the calling class under the C</mymix> path. Furthermore, those mixed-in
templates have package variables set for them that are accessible only from
their mixed-in paths. For example, if this template was defined in
Some::Other::Mixin:
@@ -706,9 +706,9 @@
import_templates MyApp::Templates under '/something';
-Like C<mix()>, but without support for the C<into> or C<set> keywords. That
-is, it mixes templates into the calling template class and does not support
-package variables for those mixins. Deprecated in favor of C<mix()>.
+Like C<mix()>, but without support for the C<into> or C<setting> keywords.
+That is, it mixes templates into the calling template class and does not
+support package variables for those mixins. Deprecated in favor of C<mix()>.
=cut
Modified: Template-Declare/branches/mixmaster/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/branches/mixmaster/lib/Template/Declare/Tags.pm (original)
+++ Template-Declare/branches/mixmaster/lib/Template/Declare/Tags.pm Thu Oct 8 15:17:03 2009
@@ -16,7 +16,7 @@
our @EXPORT
= qw( with template private show show_page attr outs
- outs_raw in_isolation $self under set
+ outs_raw in_isolation $self under setting
get_current_attr xml_decl
smart_tag_wrapper current_template create_wrapper );
our @TAG_SUB_LIST;
@@ -892,14 +892,14 @@
sub under ($) { return shift }
-=head2 set
+=head2 setting
-C<set> is a helper function providing semantic sugar for the C<mix> method of
-L<Template::Declare|Template::Declare/"mix">.
+C<setting> is a helper function providing semantic sugar for the C<mix> method
+of L<Template::Declare|Template::Declare/"mix">.
=cut
-sub set ($) { return shift }
+sub setting ($) { return shift }
=begin comment
Modified: Template-Declare/branches/mixmaster/t/mixing.t
==============================================================================
--- Template-Declare/branches/mixmaster/t/mixing.t (original)
+++ Template-Declare/branches/mixmaster/t/mixing.t Thu Oct 8 15:17:03 2009
@@ -38,7 +38,7 @@
};
};
-mix Wifty::UI::mixed_pkg under '/mixed_pkg', set { VARIABLE => 'SET' } ;
+mix Wifty::UI::mixed_pkg under '/mixed_pkg', setting { VARIABLE => 'SET' } ;
mix Wifty::UI::mixed_pkg under '/mixed_pkg2';
mix Wifty::UI::mixed_subclass_pkg under '/mixed_subclass_pkg';
More information about the Jifty-commit
mailing list