ajax_modal_rails 1.0.6 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b5cd3355b18f1154755d6909cb048faaa7b588b
-  data.tar.gz: 4553782756bd57b8d6c38f6d35e38633a3e860f8
+SHA256:
+  metadata.gz: e66f785e054c0c9f3e9325e9db132040fc6086197b6c59cae71005438ac55333
+  data.tar.gz: aa1f2252e4873ab7f72d18ffa0fe38ac05a665a9f76874f969580a8281767a79
 SHA512:
-  metadata.gz: dc222f19b5f721b513eb724651928c48853b03ebdb5c1a48451fab131d108649e54da69666f039199477c6f34eec727e2361213d334159e4242af86c4aae21e7
-  data.tar.gz: 4c9855bcc5a96aaf618fffce0849ac55a95d21dfa3ede384fbd91c8220e11bb50310ee349e0e73c6054de5eff626f0a0ad13d6262dae8a12edf4cd6c0ec77d7f
+  metadata.gz: b5aff934fb6b38f47f57d26c14f0412c719cc2d3e82413d9d09d0489ac8b527b012aad7257daf394e8a753eff17a87a8b34d6f709b86a57b889700397d8a2631
+  data.tar.gz: 8dfef6e192d6c811701c17d6db5a3a63579955e097c76276d52ac6484ce6608c6d3cb8478a311e320ab5c881f52fbcedd8afc19322c272486f623f27afe1ed24

data/README.md

@@ -42,6 +42,8 @@ A controller that is processing actions to be loaded in a modal should `include
 
 The mixin sets the appropriate layout for modal requests and adds behavior that allows a modal request that results in a redirect to redirect the whole page.
 
+Note that a controller that includes the `AjaxModalRails::Controller` module will have a few things done to it, including overriding the default implementation of `redirect_to` and also have it's default `layout` set.   These modifications should be pretty innocuous as they only take effect for ajax modal requests and fall back to the default behavior otherwise, but if you encounter unexpected behavior be sure to examine the code in [app/controllers/ajax_modal_rails/controller.rb](app/controllers/ajax_modal_rails/controller.rb) You can then either copy the file into your own repository and make modifications there or just add appropriate code to your including controllers.
+
 ## Example
 
 These snippets are taken from the included [example application](spec/dummy)
@@ -77,4 +79,4 @@ The provided modal views and javascript require [Twitter Bootstrap 4.0](https://
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 ## Gratitude
-This gem was made possible by a Professional Development benefit from my employer, [Green River](http://www.greenriver.com)
+This gem was made possible by a Professional Development benefit from my employer, [Green River](http://www.greenriver.com)

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.6'
+  VERSION = "1.0.12"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ajax_modal_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.12
 platform: ruby
 authors:
 - Rafe Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -238,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: simple ajax-driven modals for rails.  uses bootstrap 4