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

Fix camelcase eslint rule in ES5 files

Browse Source 
[MAILPOET-1144]
This commit is contained in:
Pavel Dohnal
2017-11-30 09:10:08 +00:00
parent dc569672a9
commit 0e08e58288
9 changed files with 96 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.es5.json
View File

@ -41,7 +41,6 @@
"no-throw-literal": 0,
"no-extra-bind": 0,
"brace-style": 0,
"camelcase": 0,
"padded-blocks": 0,
"strict": 0,
"space-infix-ops": 0,

4
assets/js/src/date.js
View File

@ -77,7 +77,7 @@ define('date',
var escapeToken;
var index;
var token;
var format_mappings = {
var formatMappings = {
date: {
d: 'DD',
D: 'ddd',
@ -146,7 +146,7 @@ define('date',
if (!format || format.length <= 0) return format;
replacements = format_mappings['date'];
replacements = formatMappings['date'];
convertedFormat = [];
escapeToken = false;

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

@ -306,8 +306,8 @@ WysijaForm = {
return str.replace(/&amp;/g, '&').replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&quot;/g, '"');
// ": fix for FileMerge because the previous line fucks up its syntax coloring
},
loading: function (is_loading) {
if (is_loading) {
loading: function (isLoading) {
if (isLoading) {
window.$(WysijaForm.options.editor).addClassName('loading');
window.$(WysijaForm.options.toolbar).addClassName('loading');
} else {
@ -322,7 +322,7 @@ WysijaForm = {
});
},
load: function (data) {
var settings_elements;
var settingsElements;
if (data === undefined) return;
// load body
@ -333,8 +333,8 @@ WysijaForm = {
});
// load settings
settings_elements = window.$('mailpoet_form_settings').getElements();
settings_elements.each(function (setting) {
settingsElements = window.$('mailpoet_form_settings').getElements();
settingsElements.each(function (setting) {
// skip lists
if (setting.name === 'segments') {
return true;
@ -365,17 +365,17 @@ WysijaForm = {
};
// body
WysijaForm.getBlocks().each(function (b) {
var block_data = (typeof (b.block['save']) === 'function') ? b.block.save() : null;
var blockData = (typeof (b.block['save']) === 'function') ? b.block.save() : null;
if (block_data !== null) {
if (blockData !== null) {
// set block position
block_data['position'] = position;
blockData['position'] = position;
// increment position
position++;
// add block data to body
data['body'].push(block_data);
data['body'].push(blockData);
}
});
@ -458,10 +458,10 @@ WysijaForm = {
return (window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]').length > 0);
},
isSegmentSelectionValid: function () {
var segment_selection = window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]')[0];
var segmentSelection = window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]')[0];
var block;
if (segment_selection !== undefined) {
block = WysijaForm.get(segment_selection).block.getData();
if (segmentSelection !== undefined) {
block = WysijaForm.get(segmentSelection).block.getData();
return (
(block.params.values !== undefined)
&&
@ -472,8 +472,8 @@ WysijaForm = {
},
setBlockPositions: function (event, target) {
var index = 1;
var block_placeholder;
var previous_placeholder;
var blockPlaceholder;
var previousPlaceholder;
// release dragging lock
WysijaForm.locks.dragging = false;
@ -489,19 +489,19 @@ WysijaForm = {
if (target !== undefined) {
// get placeholders (previous placeholder matches the placeholder linked to the next block)
block_placeholder = window.$(target.element.readAttribute('wysija_placeholder'));
previous_placeholder = target.element.previous('.block_placeholder');
blockPlaceholder = window.$(target.element.readAttribute('wysija_placeholder'));
previousPlaceholder = target.element.previous('.block_placeholder');
if (block_placeholder !== null) {
if (blockPlaceholder !== null) {
// put block placeholder before the current block
target.element.insert({
before: block_placeholder
before: blockPlaceholder
});
// if the next block is a wysija_block, insert previous placeholder
if (target.element.next() !== undefined && target.element.next().hasClassName('mailpoet_form_block') && previous_placeholder !== undefined) {
if (target.element.next() !== undefined && target.element.next().hasClassName('mailpoet_form_block') && previousPlaceholder !== undefined) {
target.element.insert({
after: previous_placeholder
after: previousPlaceholder
});
}
}
@ -521,11 +521,11 @@ WysijaForm = {
// get parent dimensions and position
var parentDim = element.up('.mailpoet_form_block').getDimensions();
var parentPos = element.up('.mailpoet_form_block').cumulativeOffset();
var is_visible = (parentPos.top <= (WysijaForm.scroll.top + viewportHeight));
var isVisible = (parentPos.top <= (WysijaForm.scroll.top + viewportHeight));
var buttonMargin = 5;
var relativeTop = buttonMargin;
if (is_visible) {
if (isVisible) {
// always center
relativeTop = parseInt((parentDim.height / 2) - (element.getHeight() / 2), 10);
}
@ -799,28 +799,28 @@ WysijaForm.Block = window.Class.create({
}
},
makeBlockDroppable: function () {
var block_placeholder;
var blockPlaceholder;
if (this.isBlockDroppableEnabled() === false) {
block_placeholder = this.getBlockDroppable();
window.Droppables.add(block_placeholder.identify(), WysijaForm.blockDropOptions);
block_placeholder.addClassName('enabled');
blockPlaceholder = this.getBlockDroppable();
window.Droppables.add(blockPlaceholder.identify(), WysijaForm.blockDropOptions);
blockPlaceholder.addClassName('enabled');
}
},
removeBlockDroppable: function () {
var block_placeholder;
var blockPlaceholder;
if (this.isBlockDroppableEnabled()) {
block_placeholder = this.getBlockDroppable();
window.Droppables.remove(block_placeholder.identify());
block_placeholder.removeClassName('enabled');
blockPlaceholder = this.getBlockDroppable();
window.Droppables.remove(blockPlaceholder.identify());
blockPlaceholder.removeClassName('enabled');
}
},
isBlockDroppableEnabled: function () {
// if the block_placeholder does not exist, create it
var block_placeholder = this.getBlockDroppable();
if (block_placeholder === null) {
var blockPlaceholder = this.getBlockDroppable();
if (blockPlaceholder === null) {
return this.createBlockDroppable().hasClassName('enabled');
}
return block_placeholder.hasClassName('enabled');
return blockPlaceholder.hasClassName('enabled');
},
createBlockDroppable: function () {
@ -940,25 +940,25 @@ WysijaForm.Block = window.Class.create({
WysijaForm.Block.create = function (createBlock, target) {
var block = createBlock;
var body;
var block_template;
var blockTemplate;
var template;
var output;
var settings_segments;
var settingsSegments;
if (window.$('form_template_' + block.type) === null) {
return false;
}
body = window.$(WysijaForm.options.body);
block_template = window.Handlebars.compile(window.$('form_template_block').innerHTML);
blockTemplate = window.Handlebars.compile(window.$('form_template_block').innerHTML);
template = window.Handlebars.compile(window.$('form_template_' + block.type).innerHTML);
output = '';
if (block.type === 'segment') {
if (block.params.values === undefined) {
settings_segments = window.jQuery('#mailpoet_form_segments').val();
if (settings_segments !== null && settings_segments.length > 0) {
settingsSegments = window.jQuery('#mailpoet_form_segments').val();
if (settingsSegments !== null && settingsSegments.length > 0) {
block.params.values = window.mailpoet_segments.filter(function (segment) {
return (settings_segments.indexOf(segment.id) !== -1);
return (settingsSegments.indexOf(segment.id) !== -1);
});
}
}
@ -966,7 +966,7 @@ WysijaForm.Block.create = function (createBlock, target) {
// set block template (depending on the block type)
block.template = template(block);
output = block_template(block);
output = blockTemplate(block);
// check if the new block is unique and if there's already an instance
// of it in the history. If so, remove its former instance from the history
@ -1033,11 +1033,11 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
return data;
},
setData: function (data) {
var current_data = this.getData();
var params = window.$H(current_data.params).merge(data.params).toObject();
var currentData = this.getData();
var params = window.$H(currentData.params).merge(data.params).toObject();
// update type if it changed
if (data.type !== undefined && data.type !== current_data.type) {
if (data.type !== undefined && data.type !== currentData.type) {
this.element.writeAttribute('wysija_type', data.type);
}
@ -1060,19 +1060,19 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
},
redraw: function (data) {
var options;
var block_template;
var blockTemplate;
var template;
var params;
// set parameters
this.setData(data);
options = this.getData();
// redraw block
block_template = window.Handlebars.compile(window.$('form_template_block').innerHTML);
blockTemplate = window.Handlebars.compile(window.$('form_template_block').innerHTML);
template = window.Handlebars.compile(window.$('form_template_' + options.type).innerHTML);
params = window.$H(options).merge({
template: template(options)
}).toObject();
this.element.replace(block_template(params));
this.element.replace(blockTemplate(params));
WysijaForm.init();
},

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

@ -25,7 +25,7 @@ define(
*/
$.fn.mailpoetSerializeObject = function (coerce) {
var obj = {};
var coerce_types = { true: !0, false: !1, null: null };
var coerceTypes = { true: !0, false: !1, null: null };
// Iterate over all name=value pairs.
$.each(this.serializeArray(), function (j, v) {
@ -37,33 +37,33 @@ define(
// If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
// into its component parts.
var keys = key.split('][');
var keys_last = keys.length - 1;
var keysLast = keys.length - 1;
// If the first keys part contains [ and the last ends with ], then []
// are correctly balanced.
if (/\[/.test(keys[0]) && /\]$/.test(keys[keys_last])) {
if (/\[/.test(keys[0]) && /\]$/.test(keys[keysLast])) {
// Remove the trailing ] from the last keys part.
keys[keys_last] = keys[keys_last].replace(/\]$/, '');
keys[keysLast] = keys[keysLast].replace(/\]$/, '');
// Split first keys part into two parts on the [ and add them back onto
// the beginning of the keys array.
keys = keys.shift().split('[').concat(keys);
keys_last = keys.length - 1;
keysLast = keys.length - 1;
} else {
// Basic 'foo' style key.
keys_last = 0;
keysLast = 0;
}
// Coerce values.
if (coerce) {
val = val && !isNaN(val) ? +val // number
: val === 'undefined' ? undefined // undefined
: coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
: coerceTypes[val] !== undefined ? coerceTypes[val] // true, false, null
: val; // string
}
if (keys_last) {
if (keysLast) {
// Complex key, build deep object structure based on a few rules:
// * The 'cur' pointer starts at the object top-level.
// * [] = array push (n is set to array length), [n] = array if n is
@ -73,9 +73,9 @@ define(
// object or array based on the type of the next keys part.
// * Move the 'cur' pointer to the next level.
// * Rinse & repeat.
for (; i <= keys_last; i++) {
for (; i <= keysLast; i++) {
key = keys[i] === '' ? cur.length : keys[i];
cur[key] = i < keys_last
cur[key] = i < keysLast
? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
: val;
cur = cur[key];

4
assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js
View File

@ -281,7 +281,7 @@ define([
// 2. Remove visual markings of drop position visualization
this.view.$('.mailpoet_drop_marker').remove();
},
getDropPosition: function (eventX, eventY, is_unsafe) {
getDropPosition: function (eventX, eventY, isUnsafe) {
var SPECIAL_AREA_INSERTION_WIDTH = 0.00; // Disable special insertion. Default: 0.3
var element = this.view.$el;
@ -307,7 +307,7 @@ define([
var position;
var indexAndPosition;
var unsafe = !!is_unsafe;
var unsafe = !!isUnsafe;
if (this.getCollection().length === 0) {
return {

6
assets/js/src/newsletter_editor/components/sidebar.js
View File

@ -111,12 +111,12 @@ define([
// position of the sidebar would be scrollable and not fixed
// partially out of visible screen
this.$el.parent().each(function () {
var calculated_left;
var calculatedLeft;
var self = jQuery(this);
if (self.css('position') === 'fixed') {
calculated_left = self.parent().offset().left - jQuery(window).scrollLeft();
self.css('left', calculated_left + 'px');
calculatedLeft = self.parent().offset().left - jQuery(window).scrollLeft();
self.css('left', calculatedLeft + 'px');
} else {
self.css('left', '');
}

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

@ -30,7 +30,7 @@ function (
});
form.parsley().on('form:submit', function (parsley) {
var form_data = form.mailpoetSerializeObject() || {};
var formData = form.mailpoetSerializeObject() || {};
// check if we're on the same domain
if (isSameDomain(window.MailPoetForm.ajax_url) === false) {
// non ajax post request
@ -39,11 +39,11 @@ function (
// ajax request
MailPoet.Ajax.post({
url: window.MailPoetForm.ajax_url,
token: form_data.token,
api_version: form_data.api_version,
token: formData.token,
api_version: formData.api_version,
endpoint: 'subscribers',
action: 'subscribe',
data: form_data.data
data: formData.data
}).fail(function (response) {
form.find('.mailpoet_validate_error').html(
response.errors.map(function (error) {

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

@ -21,15 +21,15 @@ define(
var groupBySegmentOptionElement;
var nextStepButton;
var renderSegmentsAndFields;
var subscribers_export_template;
var subscribersExportTemplate;
if (!window.exportData.segments) {
return;
}
subscribers_export_template =
subscribersExportTemplate =
Handlebars.compile(jQuery('#mailpoet_subscribers_export_template').html());
// render template
jQuery('#mailpoet_subscribers_export > div.inside').html(subscribers_export_template(window.exportData));
jQuery('#mailpoet_subscribers_export > div.inside').html(subscribersExportTemplate(window.exportData));
function toggleNextStepButton(condition) {
var disabled = 'button-disabled';

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

@ -99,8 +99,8 @@ define(
// define method change behavior
methodSelectionElement.change(function () {
var available_methods = jQuery(':radio[name="select_method"]');
var selected_method = available_methods.index(available_methods.filter(':checked'));
var availableMethods = jQuery(':radio[name="select_method"]');
var selectedMethod = availableMethods.index(availableMethods.filter(':checked'));
MailPoet.Notice.hide();
// hide all methods
currentStepE.find('.inside')
@ -108,7 +108,7 @@ define(
.hide();
// show selected method
currentStepE.find('.inside')
.children('div[id^="method_"]:eq(' + selected_method + ')')
.children('div[id^="method_"]:eq(' + selectedMethod + ')')
.show()
.find('table')
.show();
@ -466,7 +466,7 @@ define(
var filler;
var fillerArray;
var fillerPosition;
var import_results;
var importResults;
var duplicates;
var email;
if (typeof (window.importData.step1) === 'undefined') {
@ -524,7 +524,7 @@ define(
}
}
import_results = {
importResults = {
notice: MailPoet.I18n.t('importNoticeSkipped').replace(
'%1$s',
'<strong>' + (subscribers.invalid.length + subscribers.duplicate.length) + '</strong>'
@ -541,7 +541,7 @@ define(
: null
};
jQuery('#subscribers_data_parse_results').html(
subscribersDataParseResultsTemplate(import_results)
subscribersDataParseResultsTemplate(importResults)
);
}
@ -629,22 +629,22 @@ define(
description: segmentDescription
}
}).done(function (response) {
var selected_values;
var selectedValues;
window.mailpoetSegments.push({
id: response.data.id,
name: response.data.name,
subscriberCount: 0
});
selected_values = segmentSelectElement.val();
if (selected_values === null) {
selected_values = [response.data.id];
selectedValues = segmentSelectElement.val();
if (selectedValues === null) {
selectedValues = [response.data.id];
} else {
selected_values.push(response.data.id);
selectedValues.push(response.data.id);
}
enableSegmentSelection(window.mailpoetSegments);
segmentSelectElement.val(selected_values).trigger('change');
segmentSelectElement.val(selectedValues).trigger('change');
jQuery('.mailpoet_segments:hidden').show();
jQuery('.mailpoet_no_segments:visible').hide();
MailPoet.Modal.close();
@ -922,7 +922,7 @@ define(
action: 'save',
data: data
}).done(function (response) {
var new_column_data = {
var newColumnData = {
id: response.data.id,
name: response.data.name,
type: response.data.type,
@ -936,8 +936,8 @@ define(
children: []
});
}
window.mailpoetColumnsSelect2[2].children.push(new_column_data);
window.mailpoetColumns.push(new_column_data);
window.mailpoetColumnsSelect2[2].children.push(newColumnData);
window.mailpoetColumns.push(newColumnData);
jQuery('select.mailpoet_subscribers_column_data_match')
.each(function () {
jQuery(this)
@ -954,7 +954,7 @@ define(
}
});
});
jQuery(selectElement).data('column-id', new_column_data.id);
jQuery(selectElement).data('column-id', newColumnData.id);
jQuery(selectElement).data('validation-rule', false);
filterSubscribers();
// close popup
@ -1008,7 +1008,7 @@ define(
var batchNumber = 0;
var batchSize = 2000;
var timestamp = Date.now() / 1000;
var importResults = {
var clickImportResults = {
created: 0,
updated: 0,
errors: [],
@ -1057,10 +1057,10 @@ define(
updateSubscribers: (jQuery(':radio[name="subscriber_update_option"]:checked').val() === 'yes')
})
}).done(function (response) {
importResults.created += response.data.created;
importResults.updated += response.data.updated;
importResults.segments = response.data.segments;
importResults.added_to_segment_with_welcome_notification = response.data.added_to_segment_with_welcome_notification;
clickImportResults.created += response.data.created;
clickImportResults.updated += response.data.updated;
clickImportResults.segments = response.data.segments;
clickImportResults.added_to_segment_with_welcome_notification = response.data.added_to_segment_with_welcome_notification;
addQueue.run();
}).fail(function (response) {
MailPoet.Modal.loading(false);
@ -1079,17 +1079,17 @@ define(
queue.onComplete(function () {
MailPoet.Modal.loading(false);
if (importResults.errors.length > 0 && !importResults.updated && !importResults.created) {
MailPoet.Notice.error(_.flatten(importResults.errors)
if (clickImportResults.errors.length > 0 && !clickImportResults.updated && !clickImportResults.created) {
MailPoet.Notice.error(_.flatten(clickImportResults.errors)
);
}
else {
window.mailpoetSegments = importResults.segments;
importResults.segments = _.map(segmentSelectElement.select2('data'),
window.mailpoetSegments = clickImportResults.segments;
clickImportResults.segments = _.map(segmentSelectElement.select2('data'),
function (data) {
return data.name;
});
window.importData.step2 = importResults;
window.importData.step2 = clickImportResults;
enableSegmentSelection(window.mailpoetSegments);
router.navigate('step3', { trigger: true });
}