activeadmin_polymorphic 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cbf1f0b0f079e6088f2a1ff29732358c233a904
-  data.tar.gz: 5b6a7163497ee3c62da16922e323c5a7edd48041
+  metadata.gz: a6e9bb8fba098550adca9dca00c11b4bc3fa3ec3
+  data.tar.gz: 2260658e276d864d4104838ebe0a4a6130193610
 SHA512:
-  metadata.gz: 64d0f628cdc26ae22a48b8d62ceb73ab2938966ef95c2c58994b51011f73c584c0b3bd6cf9a8055706f17a7a3a953acbbec68a6675f25e3b30699fe679b04a79
-  data.tar.gz: cde5452a87de323c0379408ef1af43c6c1b81186b310bc8df41b61641d47a6694cbe575ab3e9aa853daaf6c091398e14858d0860be02df6f561ed84e63811322
+  metadata.gz: 73ba47366b8b609b69d1325cf6a2f5ef3e52d4abbb219116c6deb11fec0058e7e45de56bbcef7978434a7e9fa7f84e32e71cb40eb3c4aed31603ee140a444192
+  data.tar.gz: 90d1a036bb4f4b5cf2b001148ef67b76f5201ad41b6458b43cf2dee946bb4f4de48af29d4906312eb53a81b84dc9561a6ae63b6b2b31be9668ac31a5013e521b

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 gem 'activeadmin', github: 'activeadmin'
 gem 'inherited_resources'
+gem 'spinjs-rails'
 
 group :development do
   # Debugging

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

@@ -1,3 +1,11 @@
+#= require spin
+
+spinner_opts =
+  lines: 8
+  length: 4
+  width: 3
+  radius: 5
+
 $ ->
   if $('.polymorphic_has_many_container').length
     form = $('#main_content').find('form:first')
@@ -34,7 +42,7 @@ $ ->
 
     extractAndInsertForm formPath, rapper
 
-  $(document).on 'click', 'a.button.polymorphic_has_many_remove', (e)->
+  $(document).on 'click', 'a.button.polymorphic_has_many_remove', (e) ->
     e.preventDefault()
     parent    = $(@).closest '.polymorphic_has_many_container'
     to_remove = $(@).closest 'fieldset'
@@ -44,7 +52,7 @@ $ ->
     to_remove.remove()
     parent.trigger 'polymorphic_has_many_remove:after', [to_remove, parent]
 
-  $(document).on 'click', 'a.button.polymorphic_has_many_add', (e)->
+  $(document).on 'click', 'a.button.polymorphic_has_many_add', (e) ->
     e.preventDefault()
     parent = $(@).closest '.polymorphic_has_many_container'
     parent.trigger before_add = $.Event('polymorphic_has_many_add:before'), [parent]
@@ -98,7 +106,7 @@ stripEmptyRelations = ->
     if $(@).val() == ""
       $(@).parents('.polymorphic_has_many_fields').remove()
 
-recompute_positions = (parent)->
+recompute_positions = (parent) ->
   parent     = if parent instanceof jQuery then parent else $(@)
   input_name = parent.data 'sortable'
   position   = parseInt(parent.data('sortable-start') || 0, 10)
@@ -112,23 +120,38 @@ recompute_positions = (parent)->
     if sortable_input.length
       sortable_input.val if destroy_input.is ':checked' then '' else position++
 
-window.extractAndInsertForm = (url, target)->
+init_loading_indicator = (target) ->
+  spinner = new Spinner(spinner_opts).spin()
+  $(target).height(50).children().hide()
+  $(target).append spinner.el
+
+  spinner
+
+stop_loading_indicator = (target, spinner) ->
+  spinner.stop()
+  $(target).height('').children().show()
+
+window.extractAndInsertForm = (url, target) ->
   target = $ target
+  spinner = init_loading_indicator(target)
   container = $(target).closest '.polymorphic_has_many_container'
   container.trigger "polymorphic_has_many_form:beforeInsert", [ target ]
 
   $.ajax url,
     headers:
       Accept: 'text/html'
-    success: (data)->
+    success: (data) ->
       elements = $(data)
       form = $('#main_content form', elements).first()
       $(form).find('.actions').remove()
       $(form).on 'submit', -> return false
 
+      stop_loading_indicator(target, spinner)
       target.prepend form
 
       container.trigger "polymorphic_has_many_form:inserted", [form]
+    error: (xhr, status, error) ->
+      stop_loading_indicator(target, spinner)
 
 window.loadErrors = (target) ->
   $(target).off('ajax:success').off('ajax:beforeSend')
@@ -145,7 +168,7 @@ window.loadErrors = (target) ->
     container = $(form).closest '.polymorphic_has_many_container'
     container.trigger "polymorphic_has_many_form:inserted", [ form ]
 
-window.remoteSubmit = (target, callback)->
+window.remoteSubmit = (target, callback) ->
   action = $(target).attr('action')
   $(target).data('remote', true)
   $(target).removeAttr('novalidate')
@@ -159,7 +182,7 @@ window.remoteSubmit = (target, callback)->
   .trigger('submit.rails')
     .on 'ajax:aborted:file', (inputs) ->
       false
-    .on 'ajax:error', (event, response, status)->
+    .on 'ajax:error', (event, response, status) ->
       if response.status == 422
         loadErrors(target)
     .on 'ajax:success', (event, object, status, response) ->

data/lib/activeadmin_polymorphic/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminPolymorphic
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_polymorphic
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Petr Sergeev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies: []
 description: This gem extends formtastic's form builder to support polymoprhic has
   many relations in your forms