From: matthewt Date: Fri, 9 Nov 2007 14:40:08 +0000 (+0000) Subject: switch over to sub style from AUTOLOAD style (Widget transition) X-Git-Tag: v0.002000~465^2~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=27ebb6867622f4bf23121fc682d51b67a8efa290;hp=2e3dcc8dc99e79c1b41dcc28061f1f54d36672a2;p=catagits%2FReaction.git switch over to sub style from AUTOLOAD style (Widget transition) --- diff --git a/lib/ComponentUI/View/Site/Widget/Layout.pm b/lib/ComponentUI/View/Site/Widget/Layout.pm index 36276a2..ad1953b 100644 --- a/lib/ComponentUI/View/Site/Widget/Layout.pm +++ b/lib/ComponentUI/View/Site/Widget/Layout.pm @@ -9,7 +9,7 @@ class Layout which { fragment menu [ string { "DUMMY" } ]; fragment sidebar [ string { "Sidebar Shit" } ]; fragment header [ string { "DUMMY" } ]; - fragment main_content [ viewport over func('viewport', 'inner')]; + fragment main_content [ viewport => over func('viewport', 'inner')]; }; diff --git a/lib/Reaction/UI/Widget/ActionForm.pm b/lib/Reaction/UI/Widget/ActionForm.pm index 9b8e060..7da47eb 100644 --- a/lib/Reaction/UI/Widget/ActionForm.pm +++ b/lib/Reaction/UI/Widget/ActionForm.pm @@ -5,7 +5,7 @@ use Reaction::UI::WidgetClass; class ActionForm, which { fragment widget [ qw/header field_list buttons footer/ ]; - fragment field_list [field over func('viewport','ordered_fields')]; + fragment field_list [field => over func('viewport','ordered_fields')]; fragment field [ 'viewport' ]; #move button logic here diff --git a/lib/Reaction/UI/Widget/DisplayField/Collection.pm b/lib/Reaction/UI/Widget/DisplayField/Collection.pm index e8d72bd..bcac990 100644 --- a/lib/Reaction/UI/Widget/DisplayField/Collection.pm +++ b/lib/Reaction/UI/Widget/DisplayField/Collection.pm @@ -5,7 +5,7 @@ use Reaction::UI::WidgetClass; class Collection, which { fragment widget [ qw/label list/ ]; fragment label [ string { $_{viewport}->label } ]; - fragment list [ item over func('viewport', 'value_names') ]; + fragment list [ item => over func('viewport', 'value_names') ]; fragment item [ string { $_ } ]; }; diff --git a/lib/Reaction/UI/Widget/DisplayField/List.pm b/lib/Reaction/UI/Widget/DisplayField/List.pm index e0f24d5..f53b704 100644 --- a/lib/Reaction/UI/Widget/DisplayField/List.pm +++ b/lib/Reaction/UI/Widget/DisplayField/List.pm @@ -5,7 +5,7 @@ use Reaction::UI::WidgetClass; class List, which { fragment widget [ qw/label list item/ ]; fragment label [ string { $_{viewport}->label } ]; - fragment list [ item over func('viewport', 'value_names') ]; + fragment list [ item => over func('viewport', 'value_names') ]; fragment item [ string { $_ } ]; }; diff --git a/lib/Reaction/UI/Widget/Field/ChooseMany.pm b/lib/Reaction/UI/Widget/Field/ChooseMany.pm index 23c8855..8520068 100644 --- a/lib/Reaction/UI/Widget/Field/ChooseMany.pm +++ b/lib/Reaction/UI/Widget/Field/ChooseMany.pm @@ -6,11 +6,11 @@ class ChooseMany is 'Reaction::UI::Widget::Field', which { fragment field [qw/available_values action_buttons selected_values current_values/]; - fragment current_values [ hidden_value over func('viewport', 'current_value_choices') ]; + fragment current_values [ hidden_value => over func('viewport', 'current_value_choices') ]; fragment hidden_value [ string { $_->{value} } ]; - fragment available_values [ option over func('viewport', 'available_value_choices') ]; - fragment selected_values [ option over func('viewport', 'current_value_choices') ]; + fragment available_values [ option => over func('viewport', 'available_value_choices') ]; + fragment selected_values [ option => over func('viewport', 'current_value_choices') ]; fragment option [string {"DUMMY"}], { v_value => sub {$_->{value}}, v_name => sub {$_->{name}} }; fragment action_buttons [ string {"DUMMY"} ]; diff --git a/lib/Reaction/UI/Widget/Field/ChooseOne.pm b/lib/Reaction/UI/Widget/Field/ChooseOne.pm index c1abf37..c127cef 100644 --- a/lib/Reaction/UI/Widget/Field/ChooseOne.pm +++ b/lib/Reaction/UI/Widget/Field/ChooseOne.pm @@ -4,7 +4,7 @@ use Reaction::UI::WidgetClass; class ChooseOne is 'Reaction::UI::Widget::Field', which { - fragment field [ option over func('viewport', 'value_choices') ], + fragment field [ option => over func('viewport', 'value_choices') ], { is_required => sub{ $_{viewport}->attribute->required } }; fragment option [string {"DUMMY"}], diff --git a/lib/Reaction/UI/Widget/Field/HiddenArray.pm b/lib/Reaction/UI/Widget/Field/HiddenArray.pm index 835d1c1..a7d4a2d 100644 --- a/lib/Reaction/UI/Widget/Field/HiddenArray.pm +++ b/lib/Reaction/UI/Widget/Field/HiddenArray.pm @@ -4,7 +4,7 @@ use Reaction::UI::WidgetClass; class HiddenArray is 'Reaction::UI::Widget::Field', which { - fragment field [ item over func('viewport', 'value') ]; + fragment field [ item => over func('viewport', 'value') ]; fragment item [ string { $_ } ]; }; diff --git a/lib/Reaction/UI/Widget/GridView.pm b/lib/Reaction/UI/Widget/GridView.pm index ab21202..1f73adb 100644 --- a/lib/Reaction/UI/Widget/GridView.pm +++ b/lib/Reaction/UI/Widget/GridView.pm @@ -6,16 +6,16 @@ class GridView, which { fragment widget [ qw/header body footer/ ]; fragment header [ 'header_row' ]; - fragment header_row [ header_cell over func('viewport', 'field_order'), + fragment header_row [ header_cell => over func('viewport', 'field_order'), { labels => func(viewport => 'field_labels') } ]; fragment header_cell [ string { $_{labels}->{$_} } ], { field_name => $_ }; fragment footer [ 'footer_row' ]; - fragment footer_row [ footer_cell over func('viewport', 'field_order'), + fragment footer_row [ footer_cell => over func('viewport', 'field_order'), { labels => func(viewport => 'field_labels') } ]; fragment footer_cell [ string { $_{labels}->{$_} } ], { field_name => $_ }; - fragment body [ viewport over func('viewport','entities')]; + fragment body [ viewport => over func('viewport','entities')]; }; diff --git a/lib/Reaction/UI/Widget/GridView/Entity.pm b/lib/Reaction/UI/Widget/GridView/Entity.pm index 573d758..1530bf5 100644 --- a/lib/Reaction/UI/Widget/GridView/Entity.pm +++ b/lib/Reaction/UI/Widget/GridView/Entity.pm @@ -4,10 +4,10 @@ use Reaction::UI::WidgetClass; class Entity, which { #this could be flattened if i could do: - # fragment widget [field over sub{ $_{self}->viewport->fields } ]; + # fragment widget [field => over sub{ $_{self}->viewport->fields } ]; #to be honest, I think that the key viewport should be available by default in %_ fragment widget [ 'field_list' ]; - fragment field_list [ field over func('viewport', 'fields') ]; + fragment field_list [ field => over func('viewport', 'fields') ]; fragment field [ 'viewport' ]; }; diff --git a/lib/Reaction/UI/Widget/GridView/Entity/WithActions.pm b/lib/Reaction/UI/Widget/GridView/Entity/WithActions.pm index ab63975..66db4b9 100644 --- a/lib/Reaction/UI/Widget/GridView/Entity/WithActions.pm +++ b/lib/Reaction/UI/Widget/GridView/Entity/WithActions.pm @@ -5,10 +5,10 @@ use Reaction::UI::WidgetClass; #should I use inheritance here?? class WithActions, which { fragment widget [ qw(field_list actions) ]; - fragment field_list [ field over func('viewport', 'fields') ]; + fragment field_list [ field => over func('viewport', 'fields') ]; fragment field [ 'viewport' ]; - fragment actions [ action over func(viewport => 'actions')]; + fragment actions [ action => over func(viewport => 'actions')]; fragment action [ 'viewport' ]; }; diff --git a/lib/Reaction/UI/Widget/ListView.pm b/lib/Reaction/UI/Widget/ListView.pm index 41041e7..47e65a5 100644 --- a/lib/Reaction/UI/Widget/ListView.pm +++ b/lib/Reaction/UI/Widget/ListView.pm @@ -38,11 +38,11 @@ class ListView is 'Reaction::UI::Widget::GridView', which { fragment last_page [ string{ "Last" } ], { uri => sub{ $_{self}->connect_uri( {page => $_{last_page} } ) } }; - fragment page_list [ page over $_{page_list} ]; + fragment page_list [ page => over $_{page_list} ]; fragment page [ string{ $_ } ], { uri => sub{ $_{self}->connect_uri( {page => $_ } ) } }; - fragment actions [ action over func(viewport => 'actions') ]; + fragment actions [ action => over func(viewport => 'actions') ]; fragment action [ 'viewport' ]; fragment header_cell [ string { $_{labels}->{$_} } ], diff --git a/lib/Reaction/UI/Widget/ObjectView.pm b/lib/Reaction/UI/Widget/ObjectView.pm index 29657ad..6da4c34 100644 --- a/lib/Reaction/UI/Widget/ObjectView.pm +++ b/lib/Reaction/UI/Widget/ObjectView.pm @@ -4,7 +4,7 @@ use Reaction::UI::WidgetClass; class ObjectView, which { fragment widget [ 'field_list' ]; - fragment field_list [ field over func('viewport', 'ordered_fields') ]; + fragment field_list [ field => over func('viewport', 'ordered_fields') ]; fragment field [ 'viewport' ]; }; diff --git a/lib/Reaction/UI/Widget/Value/Collection.pm b/lib/Reaction/UI/Widget/Value/Collection.pm index a91aa74..e87d881 100644 --- a/lib/Reaction/UI/Widget/Value/Collection.pm +++ b/lib/Reaction/UI/Widget/Value/Collection.pm @@ -4,7 +4,7 @@ use Reaction::UI::WidgetClass; class Collection, which { fragment widget [ qw/list/ ]; - fragment list [ item over func('viewport', 'value_names') ]; + fragment list [ item => over func('viewport', 'value_names') ]; fragment item [ string {""} ], { value => $_ }; }; diff --git a/lib/Reaction/UI/Widget/Value/List.pm b/lib/Reaction/UI/Widget/Value/List.pm index 32c45c1..89598d8 100644 --- a/lib/Reaction/UI/Widget/Value/List.pm +++ b/lib/Reaction/UI/Widget/Value/List.pm @@ -4,7 +4,7 @@ use Reaction::UI::WidgetClass; class List, which { fragment widget [ qw/list/ ]; - fragment list [ item over func('viewport', 'value_names') ]; + fragment list [ item => over func('viewport', 'value_names') ]; fragment item [ string {""} ], { value => $_ }; };