Merge pull request #1 from DATA-DOG/feature/js-form-in-content

js-form not in modals
DATA-DOG · Nov 4, 2015 · e946e7f · e946e7f
2 parents 1e3faa2 + 53477da
commit e946e7f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/dist/modal.min.js b/dist/modal.min.js
diff --git a/modal.js b/modal.js
@@ -65,28 +65,29 @@
     }
 
     function onJsFormSubmit(event) {
+        var form = $(this);
         var formData = new FormData(this);
 
         $(document).trigger('bsmodal.js-form.submitted', [$(this), formData]);
 
         $.ajax({
-            url: $(this).attr("action"),
-            type: $(this).attr("method"),
+            url: form.attr("action"),
+            type: form.attr("method"),
             data: formData,
             processData: false,
             contentType: false,
             success: function(data, status, xhr) {
-                $(document).trigger('bsmodal.js-form.success', [data, status, xhr]);
+                $(document).trigger('bsmodal.js-form.success', [data, status, xhr, form]);
             },
             complete: function() {
-                $(document).trigger('bsmodal.js-form.completed');
+                $(document).trigger('bsmodal.js-form.completed', [form]);
             }
         });
 
         event.preventDefault();
     }
 
-    function onJsFormSuccess(event, data, status, xhr) {
+    function onJsFormSuccess(event, data, status, xhr, form) {
         if (xhr.status == 201) {
             modal.modal('hide');
 
@@ -96,7 +97,13 @@
                 window.location.reload();
             }
         } else {
-            displayContent(data);
+            if (modal.hasClass('in') && modal.find('.js-form')) {
+                displayContent(data);
+            } else if (form.attr('id')) {
+                form.html($(data).find('#' + form.attr('id')));
+            } else {
+                console.debug(".js-form must have an id attribute or be in modal window")
+            }
         }
     }