From d04a8bff09a385112a0f39e5c446311651311e3f Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 28 Jan 2011 12:04:24 -0800 Subject: [PATCH] changes weren't added last commit --- vendor/plugins/mobile-fu/lib/mobile_fu.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/vendor/plugins/mobile-fu/lib/mobile_fu.rb b/vendor/plugins/mobile-fu/lib/mobile_fu.rb index 9af11d428..5e85d9d36 100644 --- a/vendor/plugins/mobile-fu/lib/mobile_fu.rb +++ b/vendor/plugins/mobile-fu/lib/mobile_fu.rb @@ -2,12 +2,11 @@ module ActionController module MobileFu # These are various strings that can be found in mobile devices. Please feel free # to add on to this list. - # removed ipad because ipad isn't a mobile device MOBILE_USER_AGENTS = 'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|' + 'audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|' + 'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' + 'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' + - 'webos|amoi|novarra|cdm|alcatel|pocket|iphone|mobileexplorer|' + + 'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' + 'mobile' def self.included(base) @@ -60,13 +59,8 @@ module ActionController # Forces the request format to be :mobile def force_mobile_format - #request.format = :mobile - #session[:mobile_view] = true if session[:mobile_view].nil? - - if !request.xhr? - request.format = :mobile - session[:mobile_view] = true if session[:mobile_view].nil? - end + request.format = :mobile + session[:mobile_view] = true if session[:mobile_view].nil? end # Determines the request format based on whether the device is mobile or if