[Jifty-commit] r3343 - in jifty/trunk/lib/Jifty: View/Declare

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Sun Jun  3 20:01:27 2007
New Revision: 3343

Modified:
   jifty/trunk/lib/Jifty/ClassLoader.pm
   jifty/trunk/lib/Jifty/View/Declare/Helpers.pm

Log:
Optionally use app's View::Page class for wrapper.

Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm	(original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm	Sun Jun  3 20:01:27 2007
@@ -131,7 +131,7 @@
                   "package $module;\n"
                 . "use base qw/Jifty::$1/; sub _autogenerated { 1 };\n"
             );
-    } elsif ( $module =~ /^(?:$base)::View/ ) {
+    } elsif ( $module =~ /^(?:$base)::View$/ ) {
         return $self->return_class(
                   "package $module;\n"
                 . "use Jifty::View::Declare -base; sub _autogenerated { 1 };\n"

Modified: jifty/trunk/lib/Jifty/View/Declare/Helpers.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	Sun Jun  3 20:01:27 2007
@@ -8,7 +8,6 @@
 
 our @EXPORT = ( qw(form hyperlink tangent redirect new_action form_submit form_return  form_next_page page wrapper request get set render_param current_user render_action render_region), @Template::Declare::Tags::EXPORT);
 
-
 =head1 NAME
 
 Jifty::View::Declare::Helpers
@@ -296,8 +295,11 @@
 =cut
 
 sub wrapper ($) {
-    my $page_class = 'Jifty::View::Declare::Page';
-    Jifty::Util->require($page_class);
+    my $page_class = Jifty->app_class('View::Page');
+    $page_class = 'Jifty::View::Declare::Page'
+        unless Jifty::Util->_require( module => $page_class, quiet => 1 );
+    # XXX: fallback, this is ugly
+    Jifty::Util->require( $page_class );
 
     my $page = $page_class->new({ content_code => shift });