activeadmin_polymorphic 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38734d64a3a49cacac95b52d252669e4a6f8da48
-  data.tar.gz: 50322538d61f978ac685e9d7fd2ce159d2bb17f7
+  metadata.gz: 43398c27e99911511850142ccc62840fe7379cce
+  data.tar.gz: df4359fa2f201f03432e208c5029c1b556151198
 SHA512:
-  metadata.gz: 1fb80e97f99a5665121eb268847265925514bda9b694cb7756d7d3a34f9e9038c6545990d2f29e800a9425215c6c8f9b3f418746f09b825cc6dada64ca19c41a
-  data.tar.gz: c3d4a08f4d83a8e0332338f3e48ca59450588524569d10930a5ca59818a943798fb28bc1aba8e15184ea1069f20114e4f8226ac3c6df19eddb4e1788a20164af
+  metadata.gz: 215e4a12f450e2841a318b4e1fc8e6bb6a5a4e23548a1ce1e8693a0fd8e413f829aea0626d837b3a16e548334cb32a05a43c7952f5fd44ee0be3d7062863bb72
+  data.tar.gz: fa0b5bb262e1b5f2c8b46bf0aee195cf8bd044f73458cd0a739e3c6005131a3ea8f95dbb91ef3723e9d59d014d34dc37abae3a62bff64f9558b4654aadfba90e

data/app/assets/javascripts/activeadmin_polymorphic.js.coffee

@@ -130,8 +130,10 @@ window.extractAndInsertForm = (url, target)->
       container.trigger "polymorphic_has_many_form:inserted", [form]
 
 window.loadErrors = (target) ->
-  $(target).off('ajax:success') # unbind successfull action for json form
-  $(target).trigger('submit.rails').on 'ajax:success', (event, data, result) ->
+  $(target).off('ajax:success').off('ajaxBeforeSend')
+  $(target).on 'ajax:beforeSend', (event, xhr, setting) ->
+    xhr.setRequestHeader 'Accept', 'text/html'
+  .trigger('submit.rails').on 'ajax:success', (event, data, result) ->
     # duplicates method above. refactor using callbacks
     elements = $(data)
     form = $('#main_content form', elements).first()
@@ -139,30 +141,27 @@ window.loadErrors = (target) ->
     $(form).on 'submit', -> return false
 
     $(target).replaceWith(form)
+    container = $(form).closest '.polymorphic_has_many_container'
+    container.trigger "polymorphic_has_many_form:inserted", [ form ]
 
 window.remoteSubmit = (target, callback)->
+  action = $(target).attr('action')
   $(target).data('remote', true)
   $(target).removeAttr('novalidate')
-  action = $(target).attr('action')
   $(target).find("input[type=file]").remove()
-  # we gonna burn in hell for that
-  # perhaps we can use ajax:before callback
-  # to set type json
-  action_with_json = action + '.json'
-  $(target).attr('action', action_with_json)
 
   # unbind callbacks action for form if it was submitted before
-  $(target).off('ajax:success').off('ajax:aborted:file').off('ajax:error')
+  $(target).off('ajax:success').off('ajax:aborted:file').off('ajax:error').off 'ajax:beforeSend'
 
-  $(target).trigger('submit.rails')
+  $(target).on 'ajax:beforeSend', (event, xhr, setting) ->
+    xhr.setRequestHeader 'Accept', 'application/json'
+  .trigger('submit.rails')
     .on 'ajax:aborted:file', (inputs) ->
       false
     .on 'ajax:error', (event, response, status)->
-      $(target).attr('action', action)
       if response.status == 422
         loadErrors(target)
     .on 'ajax:success', (event, object, status, response) ->
-      $(target).attr('action', action)
       unless $(target).next().find('input:first').val() # create
         $(target).next().find('input:first').val(object.id)
         # replace new form with edit form

data/lib/activeadmin_polymorphic/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminPolymorphic
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_polymorphic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Petr Sergeev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies: []
 description: This gem extends formtastic's form builder to support polymoprhic has
   many relations in your forms
@@ -28,7 +28,7 @@ files:
 - Rakefile
 - activeadmin_polymorphic.gemspec
 - app/assets/javascripts/activeadmin_polymorphic.js.coffee
-- app/assets/stylesheets/activeadmin_polymorphic.css.sass
+- app/assets/stylesheets/activeadmin_polymorphic.sass
 - lib/activeadmin_polymorphic.rb
 - lib/activeadmin_polymorphic/engine.rb
 - lib/activeadmin_polymorphic/form_builder.rb