Merge pull request #65 from abarriga/master

Rails 5.1 fixes
benlangfeld · Aug 20, 2017 · ea23b6b · ea23b6b
2 parents 3f4389f + 2c4861e
commit ea23b6b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/mobile-fu.rb b/lib/mobile-fu.rb
@@ -20,7 +20,8 @@ class Railtie < Rails::Railtie
       initializer "mobile-fu.action_view" do |app|
         ActiveSupport.on_load :action_view do
           include MobileFu::Helper
-          alias_method_chain :stylesheet_link_tag, :mobilization
+          alias_method :stylesheet_link_tag_without_mobilization, :stylesheet_link_tag
+          alias_method :stylesheet_link_tag, :stylesheet_link_tag_with_mobilization
         end
       end
     end
@@ -55,7 +56,7 @@ module ClassMethods
       def has_mobile_fu(set_request_format = true)
         include ActionController::MobileFu::InstanceMethods
 
-        before_filter :set_request_format if set_request_format
+        before_action :set_request_format if set_request_format
 
         helper_method :is_mobile_device?
         helper_method :is_tablet_device?
@@ -197,5 +198,6 @@ def mobile_exempt?
 if Rails::VERSION::MAJOR < 3
   ActionController::Base.send :include, ActionController::MobileFu
   ActionView::Base.send :include, MobileFu::Helper
-  ActionView::Base.send :alias_method_chain, :stylesheet_link_tag, :mobilization
+  ActionView::Base.send :alias_method, :stylesheet_link_tag_without_mobilization, :stylesheet_link_tag
+  ActionView::Base.send :alias_method, :stylesheet_link_tag, :stylesheet_link_tag_with_mobilization
 end