ajax_modal_rails 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a097482ac0d66acab2dc3cd309d30ac82f55ca
-  data.tar.gz: 91f2d8a4fb8e8afc93f4d3c94b764a7c4528011e
+  metadata.gz: 4a77b001fa8a1be628edc3125925d3de35b33c6e
+  data.tar.gz: 9fec48b8c2aba9d6a26f0523081af60348ed6e61
 SHA512:
-  metadata.gz: a6fee6360573c3b17b20bf1a21c4c45406042311bec16beab3f1220845546dbc38e4133bb7a53f8c4f627d4feaf08c2c445f6f47ba2759d85b8526e6fb3d66df
-  data.tar.gz: 9c51d390060be4a84e4f3919215986675853e3ca38d04775c59790af4ad1a7ea951e1fd1322241d4d47723667cc68d402fb5de4ed5cdf94ab050976d32b26888
+  metadata.gz: 18f7fde5218671c7da121fa2b7523a575cf00d71d48a4c567fb8dcf7c6393b76d3edaead92add4a5f4b27e9670c6ad63d38037d3f68b5c1ca7e057cdb2d8d6d2
+  data.tar.gz: 1335579f97251241965ec1b45b009cd97139bcd7238e3c8ef9dd4c7df90f5befc825a2de8df285ee0fd90812d8c4e9f8c6517bb57f10176eb62c676ac571b7c8

data/README.md

@@ -1,5 +1,9 @@
 # AjaxModalRails
-This plugin provides a simple way to do common modal interactions in a rails app.  Add a single data attribute to links and forms and include a controller mixin to load pages via ajax in a modal.
+This plugin provides a simple way to do common modal interactions in a rails app.  Keep your nice thin scaffolded controller, and just include a single mixin.  Then add data attribute to links and forms to load pages via ajax in a modal.
+
+![demo screencast](doc/demo.gif)
+
+![demo screencast](doc/demo.gif)
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -40,7 +44,7 @@ The mixin sets the appropriate layout for modal requests and adds behavior that
 
 ## Example
 
-These snippets are taken from the included [example application](blob/master/spec/dummy)
+These snippets are taken from the included [example application](spec/dummy)
 
 *app/controllers/messages_controller.rb*
 ```ruby

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

@@ -20,8 +20,16 @@ class window.AjaxModal
       e.preventDefault()
       @loading.show()
       @open()
-      @content.load e.currentTarget.getAttribute("href"), (data) =>
-        @loading.hide()
+      $.ajax
+        url: e.currentTarget.getAttribute("href"),
+        dataType: 'html',
+        headers: {
+          'X_AJAX_MODAL': true
+        },
+        complete: (xhr, status) =>
+          @loading.hide()
+          @content.html xhr.responseText
+          @open
 
   _registerForms: ->
     console.log $(@formTriggersSelector).toArray()
@@ -34,12 +42,14 @@ class window.AjaxModal
         url: form.getAttribute('action')
         type: form.getAttribute('method')
         dataType: 'html',
-        data: $(form).serialize()
+        data: $(form).serialize(),
+        headers: {
+          'X_AJAX_MODAL': true
+        },
         complete: (xhr, status) =>
           @loading.hide()
           @content.html xhr.responseText
           @open
-          @_registerLinks @content
       return false
 
 

data/app/controllers/ajax_modal_rails/controller.rb

@@ -9,17 +9,11 @@ module AjaxModalRails::Controller
   # and forms should have `data-submits-to-pjax-modal`
 
   extend ActiveSupport::Concern
+  HEADER = 'HTTP_X_AJAX_MODAL'
 
   included do
     layout ->(c) { ajax_modal_request? ? ajax_modal_layout : nil }
 
-    def form_html_options
-      Hash.new.tap do |result|
-        result['data-submits-to-pjax-modal'] = true if ajax_modal_request?
-      end
-    end
-    helper_method :form_html_options
-
     def redirect_to_with_xhr_redirect(*args)
       if ajax_modal_request?
         flash.merge! args.last if args.length > 1
@@ -43,7 +37,7 @@ module AjaxModalRails::Controller
       # 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.xhr?
+      request.env[HEADER].present?
     end
 
 end

data/lib/ajax_modal_rails/version.rb

@@ -1,3 +1,3 @@
 module AjaxModalRails
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ajax_modal_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Rafe Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - existentialmutt@gmail.com