nicer regex for trimming whitespace from templates and cancel label fix

diff --git a/lib/Reaction/UI/LayoutSet.pm b/lib/Reaction/UI/LayoutSet.pm
index 792bb70..b3793af 100644 (file)
--- a/lib/Reaction/UI/LayoutSet.pm
+++ b/lib/Reaction/UI/LayoutSet.pm
@@ -80,10 +80,9 @@ class LayoutSet which {
       my ($data, $text) = ($1, $2);
       if ($data =~ /^for layout (\S+)/) {
         my $fname = $1;
-        #remove extra whitespace without killing indentation
-        #remove all empty leading lines. and trailing whitespace
-        ($layouts->{$fname}) =
-          ($text =~ /^(?:\s*\n)*((?:.*?\n)*(?:.*?\S+.*?\n))\s*$/m);
+        $text =~ s/^(?:\s*\r?\n)+//; #remove leading empty lines
+        $text =~ s/[\s\r\n]+$//;     #remove trailing whitespace
+        $layouts->{$fname} = $text;
       } elsif ($data =~ /^extends (\S+)/) {
         my $super_name = $1;
         $self->super($build_args->{view}->create_layout_set($super_name))

diff --git a/lib/Reaction/UI/Widget/Action.pm b/lib/Reaction/UI/Widget/Action.pm
index a54afcb..f55726c 100644 (file)
--- a/lib/Reaction/UI/Widget/Action.pm
+++ b/lib/Reaction/UI/Widget/Action.pm
@@ -25,9 +25,9 @@ class Action is 'Reaction::UI::Widget::Object', which {
   };
 
   implements fragment cancel_button_fragment {
-    if (grep { $_ eq 'cancel' } $_{viewport}->accept_events) {
-      arg 'event_id' => event_id 'cancel';
-      arg 'label' => $_{viewport}->cancel_label;
+    if (grep { $_ eq 'close' } $_{viewport}->accept_events) {
+      arg 'event_id' => event_id 'close';
+      arg 'label' => $_{viewport}->close_label;
       render 'cancel_button';
     }
   };