Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Rename jQuery Serialize Object function to prevent conflicts [MAILPOET-1190]

Browse Source
This commit is contained in:
stoletniy
2017-10-30 22:49:00 +03:00
parent 6e45892118
commit b648852ef5
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/form/form.jsx
View File

@ -44,7 +44,7 @@ define(
this.loadItem(this.props.params.id);
} else {
this.setState({
item: jQuery('.mailpoet_form').serializeObject(),
item: jQuery('.mailpoet_form').mailpoetSerializeObject(),
});
}
}

2
assets/js/src/form_editor/form_editor.js
View File

@ -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)
});

2
assets/js/src/jquery.serialize_object.js
View File

@ -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 };

2
assets/js/src/public.js
View File

@ -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

2
assets/js/src/subscribers/importExport/import.js
View File

@ -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({

2
views/form/templates/settings/field_form.hbs
View File

@ -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({

2
views/settings.html
View File

@ -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);

2
views/settings/mta.html
View File

@ -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());