[Jifty-commit] r2758 - in jifty/branches/template-declare: . lib/Jifty/View/Declare

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Tue Feb  6 03:52:07 2007
New Revision: 2758

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

Log:
 r21816 at hualien:  jesse | 2007-02-06 21:51:22 +1300
 * try harder to make the right thing happen on subregion/fragment


Modified: jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/View/Declare/CoreTemplates.pm	Tue Feb  6 03:52:07 2007
@@ -1539,7 +1539,7 @@
 
     $writer->endTag();
     Jifty->handler->apache->content_type('text/xml; charset=utf-8');
-    Jifty->web->out($output);
+    outs_raw($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 Feb  6 03:52:07 2007
@@ -29,15 +29,13 @@
     no warnings qw/redefine utf8/;
     local *Jifty::Web::out = sub {
         shift;    # Turn the method into a function
+        goto &Template::Declare::Tags::outs_raw;
+    };
+    my $content =Template::Declare::Tags::show($code_template);
         unless ( Jifty->handler->apache->http_header_sent ||Jifty->web->request->is_subrequest ) {
             Jifty->handler->apache->send_http_header();
         }
-
-        local $Template::Declare::Tags::BUFFER = '';
-        goto &Template::Declare::Tags::outs_raw;
-    };
-    print STDOUT Template::Declare::Tags::show($code_template);
-
+    print STDOUT $content;
     return undef;
 }
 

Modified: jifty/branches/template-declare/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Web.pm	Tue Feb  6 03:52:07 2007
@@ -658,6 +658,7 @@
 
     # Clear out the mason output, if any
     $self->mason->clear_buffer if $self->mason;
+    Template::Declare->buffer->clear if(Template::Declare->buffer);
 
     my $apache = Jifty->handler->apache;