ajax_modal_rails 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee4e3b7e2d6a4ddb14bd27b3179a0ac68f64550860afaee1f939ccc35742a07
-  data.tar.gz: 0d2a91587e598c640ccc4c40102e40860bc5cd97e8d7eab94f28e4cb8a239981
+  metadata.gz: e66f785e054c0c9f3e9325e9db132040fc6086197b6c59cae71005438ac55333
+  data.tar.gz: aa1f2252e4873ab7f72d18ffa0fe38ac05a665a9f76874f969580a8281767a79
 SHA512:
-  metadata.gz: 5f08e1b419c1753210b26fb1f88fa98f713885652be567f1d8448333114ddc5d10f2230e8883900d77e2f3e62de251632d4f6723d694bbb78eb502f1ae609755
-  data.tar.gz: 737aba34c5c95ca942d3b5a6e508e5e779e686ddfffdc4f27d4e098c4dde0d6c65aece28f07668e99dae74b271fc653dc29dbff1c95a029385ce32436613b625
+  metadata.gz: b5aff934fb6b38f47f57d26c14f0412c719cc2d3e82413d9d09d0489ac8b527b012aad7257daf394e8a753eff17a87a8b34d6f709b86a57b889700397d8a2631
+  data.tar.gz: 8dfef6e192d6c811701c17d6db5a3a63579955e097c76276d52ac6484ce6608c6d3cb8478a311e320ab5c881f52fbcedd8afc19322c272486f623f27afe1ed24

data/app/assets/javascripts/ajax_modal_rails/index.coffee

@@ -32,7 +32,6 @@ class window.AjaxModal
           @open
 
   _registerForms: ->
-    # scope.find(@formTriggersSelector).attr('data-remote', true)
     $('body').on 'submit', @formTriggersSelector, (event) =>
       form = event.currentTarget
       event.preventDefault()
@@ -50,15 +49,13 @@ class window.AjaxModal
           @open
       return false
 
-
-    # $('body').on 'ajax:complete', @formTriggersSelector, (event, data, status, xhr) =>
-    #   @_registerForms @content
-      
-  # maybe don't need this for bootstrap
   _registerClose: ->
     @modal.on 'click', '[data-ajax-modal-close]', =>
-      @modal.modal('hide')
-      @reset()
+    @close
+
+  close: ->
+    @modal.modal('hide')
+    @reset()
 
   open: ->
     @modal.modal 'show'

data/app/controllers/ajax_modal_rails/controller.rb

@@ -1,6 +1,7 @@
 module AjaxModalRails::Controller
   # This module sets up controllers to load their content in a modal
-  # in response to pjax requests.  See pjax-modals.js.coffee for client side details
+  # in response to ajax requests.  See app/assets/javascripts/ajax_modal_rails/index.cofee
+  # for client side details
   #
   # calling render will render a template to the modal
   # and calling redirect_to will trigger a redirect on the underlying page
@@ -9,7 +10,7 @@ module AjaxModalRails::Controller
   # and forms should have `data-submits-to-pjax-modal`
 
   extend ActiveSupport::Concern
-  HEADER = 'HTTP_X_AJAX_MODAL'
+  HEADER = "HTTP_X_AJAX_MODAL"
 
   included do
     layout ->(c) { ajax_modal_request? ? ajax_modal_layout : nil }
@@ -17,27 +18,30 @@ module AjaxModalRails::Controller
     def redirect_to_with_xhr_redirect(*args)
       if ajax_modal_request?
         flash.merge! args.last if args.length > 1
-        render "ajax_modal_rails/redirect_via_js", layout: ajax_modal_layout, locals: {redirect: url_for(args.first)}
+        render "ajax_modal_rails/redirect_via_js", layout: ajax_modal_layout, locals: { redirect: url_for(args.first) }
       else
         redirect_to_without_xhr_redirect(*args)
       end
     end
+
     alias_method :redirect_to_without_xhr_redirect, :redirect_to
     alias_method :redirect_to, :redirect_to_with_xhr_redirect
-
   end
 
   private
 
-    def ajax_modal_layout
-      'ajax_modal_rails/content'
-    end
+  def ajax_modal_layout
+    "ajax_modal_rails/content"
+  end
 
-    def ajax_modal_request?
-      # TODO implement w/ special request header just catch all xhr for now
-      # can always override in controller if necessary
-      # request.env['HTTP_X_AJAX_MODAL'].present?
-      request.env[HEADER].present?
-    end
+  def ajax_modal_request?
+    # TODO implement w/ special request header just catch all xhr for now
+    # can always override in controller if necessary
+    # request.env['HTTP_X_AJAX_MODAL'].present?
+    request.env[HEADER].present?
+  end
 
+  def render_close_modal_and_reload_page
+    render "ajax_modal_rails/close_modal_and_reload_page", layout: ajax_modal_layout
+  end
 end

data/app/views/ajax_modal_rails/close_modal_and_reload_page.html.erb

@@ -0,0 +1,3 @@
+<script>
+  window.location.reload()
+</script>

data/lib/ajax_modal_rails/version.rb

@@ -1,3 +1,3 @@
 module AjaxModalRails
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ajax_modal_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Rafe Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,7 @@ files:
 - app/assets/javascripts/ajax_modal_rails/index.coffee
 - app/controllers/ajax_modal_rails/controller.rb
 - app/views/ajax_modal_rails/_frame.html.erb
+- app/views/ajax_modal_rails/close_modal_and_reload_page.html.erb
 - app/views/ajax_modal_rails/redirect_via_js.html.erb
 - app/views/layouts/ajax_modal_rails/content.html.erb
 - config/routes.rb