nevermind

netfeed · Feb 3, 2012 · 8e3802e · 8e3802e
1 parent e6389d2
commit 8e3802e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 325 deletions.
diff --git a/lib/Coxify/Controller/Image.pm b/lib/Coxify/Controller/Image.pm
@@ -46,11 +46,7 @@ sub year {
     { path => '/image/' . $self->stash('year'), title => $self->stash('year') },
   ]);
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render
 }
 
 sub month {
@@ -84,11 +80,7 @@ sub month {
     { path => join('/', '/image', $from_date->year, sprintf("%02d", $from_date->month)), title => $from_date->month_name },
   ]);
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render
 }
 
 sub day {
@@ -128,11 +120,7 @@ sub day {
 
   $self->stash(meta_data => { image => $images->[0], title => $images->[0]->created_date->strftime("%B %d %Y") });
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render
 }
 
 sub image {
@@ -166,11 +154,7 @@ sub image {
   my $dates = Coxify::Image::date_list(from => $from_date, to => $to_date, today => $date);
   $self->stash(dates => $dates);  
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render
 }
 
 sub thousand {
@@ -189,11 +173,7 @@ sub thousand {
   $self->stash(years => $years);
   $self->stash(images => $images);
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render;
 }
 
 sub add {

diff --git a/lib/Coxify/Controller/Index.pm b/lib/Coxify/Controller/Index.pm
@@ -48,11 +48,7 @@ sub index {
   $self->stash(meta_data => { image => $images->[0] });
   $self->stash(breadcrumbs => [ { path => '/', title => 'Home' }]);
 
-  if ($self->req->headers->header('X-PJAX')) {
-    $self->render_partial;
-  } else {
-    $self->render;
-  }
+  $self->render;
 }
 
 1;
diff --git a/public/js/jquery.pjax.js b/public/js/jquery.pjax.js
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
@@ -19,7 +19,6 @@
     <script src="http://code.jquery.com/jquery-latest.js"></script>
     <script src="/js/jquery.colorbox.js"></script>
     <script src="/js/jquery.jkey.js"></script>
-    <script src="/js/jquery.pjax.js"></script>
 
     % if (stash('next_page')) {
       <meta name="coxify-next" id="coxify-next" content="<%= stash('next_page') %>"/>
@@ -58,10 +57,6 @@
         });
 
         $(".colorbox").colorbox({opacity: 0.85});
-
-        $('a').pjax('#main').live('click', function(){
-          //$(this).showLoader();
-        });
       });
 
       % if (stash("next_page")) {
@@ -115,10 +110,7 @@
             % }
           </ul>
         % }
-        <div id="main">
-          <div class='loader' style='display:none'><img src='/spinner.gif'></div>
-          <%= content %>
-        </div>
+        <%= content %>
       </div>
       <div style="padding-top: 25px">&nbsp;</div>
     </div>