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

arsduo · Apr 2, 2010 · 2ff39a3 · 2ff39a3
2 parents 8aa797b + 41dd15c
commit 2ff39a3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/mobile_fu.rb b/lib/mobile_fu.rb
@@ -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