[Jifty-commit] r2426 - in jifty/branches/template-declare: .

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Dec 26 23:31:42 EST 2006


Author: jesse
Date: Tue Dec 26 23:31:42 2006
New Revision: 2426

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm
   jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
   jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm

Log:
 r46506 at pinglin:  jesse | 2006-12-26 23:31:40 -0500
  * Updated to use the latest template declare, now with escaping by default


Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Base.pm	Tue Dec 26 23:31:42 2006
@@ -59,7 +59,7 @@
 
 sub render_header {
     my ($title) = @_;
-    outs('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+    outs_raw('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
             . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' );
     with( title => $title ), show('/_elements/header');
     div {
@@ -102,7 +102,7 @@
             if ( Jifty->config->framework('AdminMode') ) {
                 with( class => "warning admin_mode" ), div {
                     outs( _('Alert') . ': ' );
-                    outs(
+                    outs_raw(
                         Jifty->web->tangent(
                             label => _('Administration mode is enabled.'),
                             url   => '/__jifty/admin/'
@@ -142,7 +142,7 @@
                 script { outs('new Jifty.Subs({}).start();') };
             }
         };
-        outs('</body></html>');
+        outs_raw('</body></html>');
     };
 
     $Template::Declare::Tags::BUFFER =
@@ -183,7 +183,7 @@
 
     with(@params), li {
 
-        outs( $item->as_link );
+        outs_raw( $item->as_link );
 
         if (@kids) {
             with( class => "submenu" ), ul {
@@ -233,8 +233,7 @@
         $begin =~ s/<body>$/$whitespace/s;
     }
 
-    outs($begin);
-    # $m->flush_buffer;
+    outs_raw($begin);
     $writer->startTag("body");
 
     while (1) {
@@ -849,7 +848,7 @@
                                     my $depth = 0;
 
                                     div {
-                                        outs(
+                                        outs_raw(
 '<a href="#" id="render_info" onclick="Element.toggle('
                                               render_info_tree
                                               '); return false">Page info</a>'
@@ -880,7 +879,7 @@
                                 }
 
                                 li {
-                                    outs(
+                                    outs_raw(
                                         '<a href="#" class="halo_comp_info" 
     onmouseover="halo_over(' < %$item->{id} % > ')"
     onmouseout="halo_out(' < %$item->{id} % > ')"
@@ -1002,7 +1001,7 @@
 Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$frame->{' path
                                           '}, label => _('Edit'));
  } else {
-outs(' & nbsp;
+outs_raw(' &nbsp;
                                         ');
 % }
 }
@@ -1457,7 +1456,7 @@
         $writer->endTag();
     }
     $writer->endTag();
-    outs($output);
+    outs_raw($output);
 };
 
 template '__jifty/webservices/xml' => sub {
@@ -1592,7 +1591,7 @@
 
     $writer->endTag();
     $r->content_type('text/xml; charset=utf-8');
-    outs($output);
+    out_raws($output);
 };
 
 template '__jifty/webservices/yaml' => sub {

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Handler.pm	Tue Dec 26 23:31:42 2006
@@ -34,7 +34,7 @@
         }
 
         local $Template::Declare::Tags::BUFFER = '';
-        goto &Template::Declare::Tags::outs;
+        goto &Template::Declare::Tags::outs_raw;
     };
     print STDOUT Template::Declare::Tags::show($code_template);
 

Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/Templates.pm	Tue Dec 26 23:31:42 2006
@@ -6,26 +6,26 @@
 use Template::Declare::Tags;
 
 use base qw/Template::Declare/;
-our @EXPORT = qw(form hyperlink tangent redirect new_action form_submit form_next_page request get render_param current_user render_action render_region);
+our @EXPORT = qw(form hyperlink tangent redirect new_action form_submit form_next_page request get render_param current_user render_action render_region );
 
 {
 no warnings qw/redefine/;
 sub form (&){
     my $code = shift;
-    outs(Jifty->web->form->start);
+    outs_raw(Jifty->web->form->start);
     $code->();
-    outs(Jifty->web->form->end);
+    outs_raw(Jifty->web->form->end);
     return ''
 }
 }
 
 sub hyperlink(@) {
-    outs (Jifty->web->link(@_));
+    outs_raw(Jifty->web->link(@_));
     return '';
 }
 
 sub tangent(@) {
-    outs (Jifty->web->tangent(@_));
+    outs_raw(Jifty->web->tangent(@_));
     return '';
 }
 sub redirect(@) {
@@ -46,12 +46,12 @@
     my ($action, $fields, $field_args) = @_;
     my @f = $fields && @$fields ? @$fields : $action->argument_names;
     foreach my $argument (@f) {
-        outs($action->form_field($argument, %$field_args));
+        outs_raw($action->form_field($argument, %$field_args));
     }
 }
 
 sub form_submit(@){
-    outs( Jifty->web->form->submit(@_));
+    outs_raw( Jifty->web->form->submit(@_));
     '';
 }
 
@@ -78,7 +78,7 @@
 
 sub render_param {
     my $action = shift;
-    outs($action->form_field(@_));
+    outs_raw($action->form_field(@_));
     return '';
 }
 


More information about the Jifty-commit mailing list