diff --git a/assets/js/src/form/form.jsx b/assets/js/src/form/form.jsx index fdb58e30a4..e1babf256a 100644 --- a/assets/js/src/form/form.jsx +++ b/assets/js/src/form/form.jsx @@ -44,7 +44,7 @@ define( this.loadItem(this.props.params.id); } else { this.setState({ - item: jQuery('.mailpoet_form').serializeObject(), + item: jQuery('.mailpoet_form').mailpoetSerializeObject(), }); } } diff --git a/assets/js/src/form_editor/form_editor.js b/assets/js/src/form_editor/form_editor.js index ad5358cf0c..22e093b46a 100644 --- a/assets/js/src/form_editor/form_editor.js +++ b/assets/js/src/form_editor/form_editor.js @@ -1060,7 +1060,7 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, { template: window.jQuery('#form_template_field_settings').html(), data: this.getData(), onSuccess: function () { - var data = window.jQuery('#form_field_settings').serializeObject(); + var data = window.jQuery('#form_field_settings').mailpoetSerializeObject(); this.redraw(data); }.bind(this) }); diff --git a/assets/js/src/jquery.serialize_object.js b/assets/js/src/jquery.serialize_object.js index 44ec7fe789..9b4c9a0330 100644 --- a/assets/js/src/jquery.serialize_object.js +++ b/assets/js/src/jquery.serialize_object.js @@ -23,7 +23,7 @@ define( * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ - $.fn.serializeObject = function (coerce) { + $.fn.mailpoetSerializeObject = function (coerce) { var obj = {}; var coerce_types = { true: !0, false: !1, null: null }; diff --git a/assets/js/src/public.js b/assets/js/src/public.js index e08f11bc13..bc7880c781 100644 --- a/assets/js/src/public.js +++ b/assets/js/src/public.js @@ -30,7 +30,7 @@ function ( }); form.parsley().on('form:submit', function (parsley) { - var form_data = form.serializeObject() || {}; + var form_data = form.mailpoetSerializeObject() || {}; // check if we're on the same domain if (isSameDomain(window.MailPoetForm.ajax_url) === false) { // non ajax post request diff --git a/assets/js/src/subscribers/importExport/import.js b/assets/js/src/subscribers/importExport/import.js index 16fc9db071..867ff10dcd 100644 --- a/assets/js/src/subscribers/importExport/import.js +++ b/assets/js/src/subscribers/importExport/import.js @@ -771,7 +771,7 @@ define( }); jQuery('#form_field_new').parsley().on('form:submit', function () { // get data - var data = jQuery(this.$element).serializeObject(); + var data = jQuery(this.$element).mailpoetSerializeObject(); // save custom field MailPoet.Ajax.post({ diff --git a/views/form/templates/settings/field_form.hbs b/views/form/templates/settings/field_form.hbs index 39bd648805..d3e1da006a 100644 --- a/views/form/templates/settings/field_form.hbs +++ b/views/form/templates/settings/field_form.hbs @@ -70,7 +70,7 @@ $('#form_field_new').parsley().on('form:submit', function(parsley) { // get data - var data = $(this.$element).serializeObject(); + var data = $(this.$element).mailpoetSerializeObject(); // save custom field MailPoet.Ajax.post({ diff --git a/views/settings.html b/views/settings.html index fc0dbab11a..45d1c4cc0e 100644 --- a/views/settings.html +++ b/views/settings.html @@ -80,7 +80,7 @@ function saveSettings() { // serialize form data - var settings_data = $('#mailpoet_settings_form').serializeObject(); + var settings_data = $('#mailpoet_settings_form').mailpoetSerializeObject(); // show loading screen MailPoet.Modal.loading(true); diff --git a/views/settings/mta.html b/views/settings/mta.html index b45eeb387d..2ea8ffc3a6 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -699,7 +699,7 @@ // get test email and include it in data var recipient = $('#mailpoet_mta_test_email').val(); - var settings = jQuery('#mailpoet_settings_form').serializeObject(); + var settings = jQuery('#mailpoet_settings_form').mailpoetSerializeObject(); var mailer = settings.mta; mailer.method = getMethodFromGroup($('#mta_group').val());