Skip to content
This repository was archived by the owner on Aug 26, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/mobylette/resolvers/chained_fallback_resolver.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
require 'action_view'
require 'action_view/template/resolver'

module Mobylette
module Resolvers
class ChainedFallbackResolver < ::ActionView::FileSystemResolver
Expand All @@ -24,9 +27,9 @@ def initialize(formats = {}, view_paths = ['app/views'])
# ...
# }
#
# It will add the fallback chain array of the
# It will add the fallback chain array of the
# request.format to the resolver.
#
#
# If the format.request is not defined in formats,
# it will behave as a normal FileSystemResovler.
#
Expand All @@ -39,11 +42,11 @@ def replace_fallback_formats_chain(formats)
# Private: finds the right template on the filesystem,
# using fallback if needed
#
def find_templates(name, prefix, partial, details)
def find_templates(name, prefix, partial, details, outside_app_allowed = false)
# checks if the format has a fallback chain
if @fallback_formats.has_key?(details[:formats].first)
details = details.dup
details[:formats] = Array.wrap(@fallback_formats[details[:formats].first])
details[:formats] = Array.wrap(@fallback_formats[details[:formats].first])
end
super(name, prefix, partial, details)
end
Expand Down
6 changes: 3 additions & 3 deletions lib/mobylette/respond_to_mobile_requests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module RespondToMobileRequests
helper_method :is_mobile_view?
helper_method :request_device?

before_filter :handle_mobile
before_action :handle_mobile

cattr_accessor :mobylette_options
@@mobylette_options = Hash.new
Expand Down Expand Up @@ -101,7 +101,7 @@ def mobylette_config

# Private: Configures how the resolver shall handle fallbacks.
#
# if options has a :fallback_chains key, it will use it
# if options has a :fallback_chains key, it will use it
# as the fallback rules for the resolver, the format should
# be a hash, where each key defines a array of formats.
# Example:
Expand Down Expand Up @@ -213,7 +213,7 @@ def set_mobile_format
return device if request_device?(device)
end
end
:mobile
:mobile
end

end
Expand Down