--- trunk/lib/Frey/View/NoPager.pm	2008/12/09 20:31:27	765
+++ trunk/lib/Frey/View/NoPager.pm	2008/12/14 23:26:54	843
@@ -17,15 +17,15 @@
 	default => '',
 );
 
-has 'sort' => (
+has 'on_page' => (	# FIXME Frey::Web->page, sigh!
 	is => 'rw',
-	isa => 'Str',
+	isa => 'Int',
+	default => 1,
 );
 
-has page => (
+has 'sort' => (
 	is => 'rw',
-	isa => 'Int',
-	default => 1,
+	isa => 'Str',
 );
 
 our $v = {
@@ -49,9 +49,8 @@
 
 sub results_as_markup {
 	my $self = shift;
-	my $p = {@_};
 
-	my ($search,$page) = ( $p->{search} , $p->{page} );
+	my ($search,$page) = ( $self->search , $self->on_page );
 
 	sub next_page {
 		my ($self) = @_;
@@ -86,7 +85,7 @@
 	$cond->set_phrase( $search );
 	$cond->set_max( $on_page * $page );	## FIXME * $page is needed by hest 1.3.8
 	$cond->set_skip( $skip );
-	$cond->set_order( $p->{sort} ) if ($p->{sort});
+	$cond->set_order( $self->sort ) if $self->sort;
 
 	my $nres = $node->search($cond, ( $self->config->{estraier}->{depth} || 0 ) );
 
@@ -188,12 +187,12 @@
 	my ($self) = @_;
 
 	$self->add_css('static/Frey/NoPager.css');
-	$self->add_css('static/Frey/NoPager.js');
+	$self->add_js ('static/Frey/NoPager.js');
 
 	$self->add_js(qq|
-		$(document).ready( function() {
-			$.log.info('hook onchange to #search_form' );
-			$('#search_form').change( function() {
+		\$(document).ready( function() {
+			\$.log.info('hook onchange to #search_form' );
+			\$('#search_form').change( function() {
 				//logDebug('submit #search_form');
 				this.submit();
 			});