egov_utils 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e83b4cc0d2d3c4cca271573fe52c05be094841c2752355fd419d3ad5ede82c
-  data.tar.gz: 13ec9e2830a06f4863bfd58890258ebccf7266e37783af5e094de4089a4e7806
+  metadata.gz: b8835d8512728822233b57d0054282dd28484a259ba2e6809c95614a1b53ea95
+  data.tar.gz: 695953ffa8addaf5470bbea332093f6d572b202a88f4731f659852a921c2259a
 SHA512:
-  metadata.gz: bcd3259094c96b7dbfea0cda362bbaf570a96ca8315c4f7c92e0f376018435f4b5193b23348f30805acf48f808291b008de11cd78105e9db1903e48397d4f824
-  data.tar.gz: 437c12e05d1839a2e6e980b5ef062c7e753620fff6f11807d7d4bb75c6e0aaf898424c491739a8ac7fb3ad1e5dacffdeb64ec51a6759c165caeaae619edcc502
+  metadata.gz: 360361559b3569ad840420f04f92211c1b222aff42e2420cc24fce49e2daf1113bd0f03e6e391521b63a020be1629773b302d73b9aa93af9d73596c4b87781d1
+  data.tar.gz: f184c8def268115b841ec3dcbdf2d683d90795edb6f4c81263654794e26491bf32781832fba740b5e96262568b520c01bca83a50f4676bc8edfbd0573711e187

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -122,6 +122,7 @@ window.eGovUtilities =
     options = options || {}
     modalId = modalId || 'modal'
     $modal = $('#'+modalId)
+    modalOptions = options
     if $modal.length != 1
       $modal = $('<div id="'+modalId+'" class="modal fade"'+(if options['backdrop'] then ' data-backdrop="static"' else '')+'><div class="modal-dialog">
     <div class="modal-content">
@@ -133,17 +134,19 @@ window.eGovUtilities =
       <div class="modal-footer"></div>
     </div></div></div>').appendTo('body')
       $modal.on 'submit', 'form', (evt)->
-        evt.preventDefault()
-        $form = $(this)
-        data = $form.serializeArray()
-        $.ajax($form.attr('action')+'.json', {method: $form.attr('method'), data: data, dataType: 'json'}).done (xhr)->
-          $modal.trigger('egov:submitted', [xhr])
+        if modalOptions['ajaxForm'] != false
+          evt.preventDefault()
+          $form = $(this)
+          data = $form.serializeArray()
+          $.ajax($form.attr('action'), {method: $form.attr('method'), data: data, dataType: 'json'}).done (xhr)->
+            $modal.trigger('egov:submitted', [xhr])
+            $modal.modal('hide')
+          .fail (xhr) ->
+            if xhr.status == 422
+              $.ajax($form.attr('action'),  {method: $form.attr('method'), data: data, dataType: 'html'}).done (xhr)->
+                eGovUtilities.setModalContent($modal, xhr)
+        else
           $modal.modal('hide')
-        .fail (xhr) ->
-          if xhr.status == 422
-            $.ajax($form.attr('action'),  {method: $form.attr('method'), data: data, dataType: 'html'}).done (xhr)->
-              eGovUtilities.setModalContent($modal, xhr)
-
     $modal
 
   setModalContent: ($modal, body, title) ->
@@ -153,11 +156,12 @@ window.eGovUtilities =
 
   showModal: (body, options) ->
     options = options || {}
-    $modal = this.initModal((options['modalId']), {backdrop: options['backdrop']})
+    $modal = this.initModal((options['modalId']), {backdrop: options['backdrop'], ajaxForm: options['ajaxForm']})
     title = options['title']
     delete options['modalId']
     delete options['backdrop']
     delete options['title']
+    delete options['ajaxForm']
     eGovUtilities.setModalContent($modal, body, title)
     $modal.modal(options)
     window.setTimeout(()->

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Ondřej Ezr