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

minor fixes

Browse Source
This commit is contained in:
Amine Ben hammou
2017-08-29 12:07:57 +00:00
parent 609f1b5e67
commit e7e08dbb3a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/js/src/modal.js
View File

@ -309,7 +309,6 @@ define('modal', ['mailpoet', 'jquery'],
setDimensions: function() { setDimensions: function() {
switch(this.options.type) { switch(this.options.type) {
case 'popup': case 'popup':
console.log(this.options)
// set popup dimensions // set popup dimensions
jQuery('#mailpoet_popup').css({ jQuery('#mailpoet_popup').css({
width: this.options.width, width: this.options.width,

5
assets/js/src/subscribers/importExport/export.js
View File

@ -137,13 +137,14 @@ define(
return; return;
} }
MailPoet.Modal.loading(true); MailPoet.Modal.loading(true);
var exportFormat = jQuery(':radio[name="option_format"]:checked').val();
MailPoet.Ajax.post({ MailPoet.Ajax.post({
api_version: window.mailpoet_api_version, api_version: window.mailpoet_api_version,
endpoint: 'ImportExport', endpoint: 'ImportExport',
action: 'processExport', action: 'processExport',
data: JSON.stringify({ data: JSON.stringify({
export_confirmed_option: exportData.exportConfirmedOption, export_confirmed_option: exportData.exportConfirmedOption,
export_format_option: jQuery(':radio[name="option_format"]:checked').val(), export_format_option: exportFormat,
group_by_segment_option: (groupBySegmentOptionElement.is(':visible')) ? groupBySegmentOptionElement.prop('checked') : false, group_by_segment_option: (groupBySegmentOptionElement.is(':visible')) ? groupBySegmentOptionElement.prop('checked') : false,
segments: (exportData.segments) ? segmentsContainerElement.val() : false, segments: (exportData.segments) ? segmentsContainerElement.val() : false,
subscriber_fields: subscriberFieldsContainerElement.val() subscriber_fields: subscriberFieldsContainerElement.val()
@ -157,9 +158,11 @@ define(
.replace('[/link]', '</a>'); .replace('[/link]', '</a>');
jQuery('#export_result_notice').html('<p>' + resultMessage + '</p>').show(); jQuery('#export_result_notice').html('<p>' + resultMessage + '</p>').show();
window.location.href = response.data.exportFileURL; window.location.href = response.data.exportFileURL;
console.log(response.data, exportData)
MailPoet.trackEvent('Subscribers export completed', { MailPoet.trackEvent('Subscribers export completed', {
'Total exported': response.data.totalExported, 'Total exported': response.data.totalExported,
'Only confirmed?': exportData.exportConfirmedOption, 'Only confirmed?': exportData.exportConfirmedOption,
'File Format': exportFormat,
'MailPoet Free version': window.mailpoet_version 'MailPoet Free version': window.mailpoet_version
}); });
}).fail(function(response) { }).fail(function(response) {