Permalink
Browse files

Merge branch 'master' of git://github.com/revgum/mobile-fu into 2.x

  • Loading branch information...
2 parents 8aa797b + 41dd15c commit 2ff39a32848d4061daa4802b5ab28dd58699d4f4 @brendanlim committed Apr 2, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/mobile_fu.rb
View
@@ -70,7 +70,7 @@ def force_mobile_format
# the user has opted to use either the 'Standard' view or 'Mobile' view.
def set_mobile_format
- if is_mobile_device?
+ if is_mobile_device? && !request.xhr?
request.format = session[:mobile_view] == false ? :html : :mobile
session[:mobile_view] = true if session[:mobile_view].nil?
end

0 comments on commit 2ff39a3

Please sign in to comment.