Permalink
Browse files

Remove pjax

  • Loading branch information...
1 parent 6c16288 commit 06f20156eaebc771eacb7032fae0177c2d06b4b9 tashian committed Jun 7, 2011
Showing with 1 addition and 4 deletions.
  1. +1 −4 app/controllers/application_controller.rb
View
5 app/controllers/application_controller.rb
@@ -7,10 +7,7 @@ class ApplicationController < ActionController::Base
layout :layout_by_resource
def layout_by_resource
- if request.headers['X-PJAX']
- # jquery-pjax support (see https://github.com/defunkt/jquery-pjax)
- 'pjax'
- elsif request.xhr?
+ if request.xhr?
# for ajax modals via jquery.colorbox.js
"popup"
elsif devise_controller?

0 comments on commit 06f2015

Please sign in to comment.