mrujs_rails 0.1.0.pre.beta.14 → 0.1.0.pre.beta.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d8d955fbddbe962a7033fc776c25ef83954f755847610f90cad2978cd81935d
-  data.tar.gz: 9f86695adad081d1f65a1ba8b27f0a6cc7ccc4ea025e6bc857dfcf8493334ee2
+  metadata.gz: b23ad71e18cb8e0952208f2b6a10dab8b1b814d1b5cba39815da8f6bea1fb52a
+  data.tar.gz: 5b1173f9c287817b9465730a2ac061ca979131c2fb742c107bd86a9a7dc43d8e
 SHA512:
-  metadata.gz: 017f96373ddc46c41111e8e901b85ef7f78bac687ef16f127296a44534c443ab47dea958321493227e4cfca787665550f4be4ddbc5683227e9d414f5d5842e51
-  data.tar.gz: 70b21b20741ba26aba60ef5e0332ab2373fc44698b5c270ab726790ffff70672248f8c1b58ca25bce04305383354116a5d857c7a1a40b3674df3dc8bfd390cab
+  metadata.gz: e00853b4cc33b9226fb741b59e41a51e1a35fb0846ff39cc45a9bda4497d79e777e1829a8eb009e8682688b19bbc5b0f16810d1015fcf055e94e0d866df82b23
+  data.tar.gz: 55e6cf87fe17c76c9a0ed9bff90408de97b351906a680669615e4df762f8704cc3b0ba6a588a757e65b18c32f6a5e4f80091ac17496fcf2a59fbea45bfed8404

data/lib/mrujs_rails/redirection.rb

@@ -7,10 +7,10 @@ module MrujsRails
     end
 
     def redirect_to(url = {}, options = {})
-      # turbolinks = options.delete(:turbolinks)
+      turbolinks = options.delete(:turbolinks)
 
       super.tap do
-        if request.xhr? && !request.get?
+        if turbolinks != false && request.xhr? && !request.get?
           visit_location_with_turbolinks(location, turbolinks)
         elsif request.headers["Turbolinks-Referrer"]
           store_turbolinks_location_in_session(location)
@@ -24,10 +24,10 @@ module MrujsRails
       action = action.to_s
       visit_action = action == "advance" ? action : "replace"
 
+      response.set_header("X-Xhr-Redirect", location)
+      response.set_header("TURBOLINKS-REDIRECT-ACTION", visit_action)
+      response.set_header("TURBOLINKS-REDIRECT-LOCATION", location)
       response.content_type = Mime[:turbolinks]
-      response.headers["X-Xhr-Redirect"] = location
-      response.headers["TURBOLINKS-REDIRECT-ACTION"] = visit_action
-      response.headers["TURBOLINKS-REDIRECT-LOCATION"] = location
     end
 
     def store_turbolinks_location_in_session(location)
@@ -35,9 +35,9 @@ module MrujsRails
     end
 
     def set_turbolinks_location_header_from_session
-      if session && session[:_turbolinks_location]
-        response.headers["Turbolinks-Location"] = session.delete(:_turbolinks_location)
-      end
+      return unless session && session[:_turbolinks_location]
+
+      response.set_header("Turbolinks-Location", session.delete(:_turbolinks_location))
     end
   end
 end

data/lib/mrujs_rails/version.rb

@@ -1,3 +1,3 @@
 module MrujsRails
-  VERSION = "0.1.0-beta.14"
+  VERSION = "0.1.0-beta.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrujs_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.beta.14
+  version: 0.1.0.pre.beta.16
 platform: ruby
 authors:
 - ParamagicDev