mobile-fu-uncommon 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mobile-fu.rb +5 -7
- data/lib/mobile-fu/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0a164ed6f4956c0323103674b0bf18075d54f5dc
|
4
|
+
data.tar.gz: 5d8fb6b252e5ff066e91bd91b43187449b1b30b5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e728a11d4220b68bdb2361281a55292a6a0a79584c8ceaefb9d869f00bc744d4be121ad60c43c922bc9f009b965e0a7041bfe5d7cfd165e8734085af5b688164
|
7
|
+
data.tar.gz: 0c824a1b4e7c44c083f242b0c1bfa7434477035822edcbfa000bf82c255805cb5e2121e724e63eef1ee65388c4d742ca5aad3d11be5a8d84d3f8c2603fba46c0
|
data/lib/mobile-fu.rb
CHANGED
@@ -111,23 +111,21 @@ module ActionController
|
|
111
111
|
if mobile_action? && !request.xhr?
|
112
112
|
if tablet_enabled? && is_tablet_device?
|
113
113
|
prepend_view_path tablet_views_path
|
114
|
-
if request_format_enabled? &&
|
114
|
+
if request_format_enabled? && [Mime::HTML, Mime::ALL].include?(request.formats.first)
|
115
115
|
request.formats.prepend(Mime::TABLET)
|
116
116
|
end
|
117
117
|
elsif mobile_enabled? && is_mobile_device?
|
118
118
|
prepend_view_path mobile_views_path
|
119
|
-
if request_format_enabled? &&
|
119
|
+
if request_format_enabled? && [Mime::HTML, Mime::ALL].include?(request.formats.first)
|
120
120
|
request.formats.prepend(Mime::MOBILE)
|
121
121
|
end
|
122
122
|
end
|
123
123
|
|
124
|
-
if !request_format_enabled? &&
|
125
|
-
request.format = :html
|
126
|
-
end
|
127
|
-
else
|
128
|
-
if (request.formats.first == Mime::MOBILE) || (request.formats.first == Mime::TABLET)
|
124
|
+
if !request_format_enabled? && [Mime::HTML, Mime::ALL].include?(request.formats.first)
|
129
125
|
request.format = :html
|
130
126
|
end
|
127
|
+
elsif [Mime::HTML, Mime::ALL].include?(request.formats.first)
|
128
|
+
request.format = :html
|
131
129
|
end
|
132
130
|
end
|
133
131
|
|
data/lib/mobile-fu/version.rb
CHANGED