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

Fix ES5 comma-dangle eslint rule [MAILPOET-1028]

Browse Source
This commit is contained in:
stoletniy
2017-07-27 18:19:35 +03:00
committed by pavel-mailpoet
parent f0c59ff635
commit 08f81bd816
32 changed files with 360 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.es5.json
View File

@ -14,7 +14,6 @@
"comma-dangle": 0,
"space-before-function-paren": 0,
"prefer-arrow-callback": 0,
"no-undef": 0,

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

@ -55,7 +55,7 @@ function cacheEvent(forced, name, data) {
eventsCache.push({
name: name,
data: data,
forced: forced,
forced: forced
});
}

4
assets/js/src/newsletter_editor/App.js
View File

@ -15,8 +15,8 @@ define([
contentRegion: '#mailpoet_editor_content',
sidebarRegion: '#mailpoet_editor_sidebar',
bottomRegion: '#mailpoet_editor_bottom',
headingRegion: '#mailpoet_editor_heading',
},
headingRegion: '#mailpoet_editor_heading'
}
});
var EditorApplication = Marionette.Application.extend({

2
assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js
View File

@ -21,6 +21,6 @@ define([
chooseText: MailPoet.I18n.t('selectColor'),
cancelText: MailPoet.I18n.t('cancelColorSelection')
});
},
}
});
});

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

@ -15,7 +15,7 @@ define([
BehaviorsLookup.ContainerDropZoneBehavior = Marionette.Behavior.extend({
defaults: {
columnLimit: 3,
columnLimit: 3
},
onRender: function() {
var dragAndDropDisabled = _.isObject(this.view.options.renderOptions) && this.view.options.renderOptions.disableDragAndDrop === true;
@ -195,7 +195,7 @@ define([
if (view.model.get('orientation') === 'horizontal' && droppableModel.get('type') !== 'container') {
// Regular blocks always need to be inserted into columns - vertical containers
tempCollection = new (EditorApplication.getBlockTypeModel('container'))({
orientation: 'vertical',
orientation: 'vertical'
});
tempCollection.get('blocks').add(droppableModel);
viewCollection.add(tempCollection, {at: index});
@ -210,7 +210,7 @@ define([
var tempModel = viewCollection.at(dropPosition.index);
tempCollection = new (EditorApplication.getBlockTypeModel('container'))({
orientation: (view.model.get('orientation') === 'vertical') ? 'horizontal' : 'vertical',
orientation: (view.model.get('orientation') === 'vertical') ? 'horizontal' : 'vertical'
});
viewCollection.remove(tempModel);
@ -218,19 +218,19 @@ define([
if (tempCollection.get('orientation') === 'horizontal') {
if (dropPosition.position === 'before') {
tempCollection2 = new (EditorApplication.getBlockTypeModel('container'))({
orientation: 'vertical',
orientation: 'vertical'
});
tempCollection2.get('blocks').add(droppableModel);
tempCollection.get('blocks').add(tempCollection2);
}
tempCollection2 = new (EditorApplication.getBlockTypeModel('container'))({
orientation: 'vertical',
orientation: 'vertical'
});
tempCollection2.get('blocks').add(tempModel);
tempCollection.get('blocks').add(tempCollection2);
if (dropPosition.position === 'after') {
tempCollection2 = new (EditorApplication.getBlockTypeModel('container'))({
orientation: 'vertical',
orientation: 'vertical'
});
tempCollection2.get('blocks').add(droppableModel);
tempCollection.get('blocks').add(tempCollection2);
@ -254,11 +254,11 @@ define([
event.draggable.onDrop({
dropBehavior: that,
droppedModel: droppableModel,
droppedView: droppedView,
droppedView: droppedView
});
that.cleanup();
},
}
});
},
cleanup: function() {
@ -296,7 +296,7 @@ define([
return {
insertionType: 'normal',
index: 0,
position: 'inside',
position: 'inside'
};
}
@ -347,7 +347,7 @@ define([
return {
insertionType: insertionType, // 'normal'|'special'
index: index,
position: position, // 'inside'|'before'|'after'
position: position // 'inside'|'before'|'after'
};
},
_computeNormalIndex: function(eventX, eventY) {
@ -377,13 +377,13 @@ define([
// First half of the element
return {
index: index,
position: 'before',
position: 'before'
};
} else {
// Second half of the element
return {
index: index,
position: 'after',
position: 'after'
};
}
},

8
assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js
View File

@ -28,7 +28,7 @@ define([
},
onDrop: function(model, view) {},
testAttachToInstance: function(model, view) { return true; },
testAttachToInstance: function(model, view) { return true; }
},
onRender: function() {
var that = this,
@ -38,7 +38,7 @@ define([
if (!this.options.testAttachToInstance(this.view.model, this.view)) return;
interactable = interact(this.$el.get(0), {
ignoreFrom: this.options.ignoreSelector,
ignoreFrom: this.options.ignoreSelector
}).draggable({
// allow dragging of multple elements at the same time
max: Infinity,
@ -111,7 +111,7 @@ define([
that.view.$el.removeClass('mailpoet_hidden');
}
}
},
}
})
.preventDefault('auto')
.styleCursor(false)
@ -137,6 +137,6 @@ define([
// Delegate to view's event handler
that.options.onDrop.apply(that, [options]);
};
},
}
});
});

6
assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js
View File

@ -5,19 +5,19 @@
*/
define([
'backbone.marionette',
'newsletter_editor/behaviors/BehaviorsLookup',
'newsletter_editor/behaviors/BehaviorsLookup'
], function(Marionette, BehaviorsLookup) {
BehaviorsLookup.HighlightEditingBehavior = Marionette.Behavior.extend({
modelEvents: {
'startEditing': 'enableHighlight',
'stopEditing': 'disableHighlight',
'stopEditing': 'disableHighlight'
},
enableHighlight: function() {
this.$el.addClass('mailpoet_highlight');
},
disableHighlight: function() {
this.$el.removeClass('mailpoet_highlight');
},
}
});
});

10
assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js
View File

@ -15,11 +15,11 @@ define([
resizeHandleSelector: true, // true will use edges of the element itself
transformationFunction: function(y) { return y; },
minLength: 0,
modelField: 'styles.block.height',
modelField: 'styles.block.height'
},
events: {
"mouseenter": 'showResizeHandle',
"mouseleave": 'hideResizeHandle',
"mouseleave": 'hideResizeHandle'
},
onRender: function() {
this.attachResize();
@ -37,8 +37,8 @@ define([
top: false,
left: false,
right: false,
bottom: (typeof this.options.resizeHandleSelector === 'string') ? this.view.$(this.options.resizeHandleSelector).get(0) : this.options.resizeHandleSelector,
},
bottom: (typeof this.options.resizeHandleSelector === 'string') ? this.view.$(this.options.resizeHandleSelector).get(0) : this.options.resizeHandleSelector
}
}).on('resizestart', function(event) {
that.isBeingResized = true;
that.$el.addClass('mailpoet_resize_active');
@ -63,6 +63,6 @@ define([
if (typeof this.options.resizeHandleSelector === 'string') {
this.view.$(this.options.resizeHandleSelector).addClass('mailpoet_hidden');
}
},
}
});
});

8
assets/js/src/newsletter_editor/behaviors/ShowSettingsBehavior.js
View File

@ -6,15 +6,15 @@
define([
'backbone.marionette',
'jquery',
'newsletter_editor/behaviors/BehaviorsLookup',
'newsletter_editor/behaviors/BehaviorsLookup'
], function(Marionette, jQuery, BehaviorsLookup) {
BehaviorsLookup.ShowSettingsBehavior = Marionette.Behavior.extend({
defaults: {
ignoreFrom: '', // selector
ignoreFrom: '' // selector
},
events: {
'click .mailpoet_content': 'showSettings',
'click .mailpoet_content': 'showSettings'
},
showSettings: function(event) {
if(!this.isIgnoredElement(event.target)) {
@ -25,7 +25,7 @@ define([
return this.options.ignoreFrom
&& this.options.ignoreFrom.length > 0
&& jQuery(element).is(this.options.ignoreFrom);
},
}
});
});

2
assets/js/src/newsletter_editor/behaviors/SortableBehavior.js
View File

@ -32,7 +32,7 @@ define([
collection.remove(model);
collection.add(model, { at: newIndex });
},
items: this.options.items,
items: this.options.items
});
}
}

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

@ -18,7 +18,7 @@ define([
invalidElements: "script",
blockFormats: 'Paragraph=p',
plugins: "link textcolor colorpicker mailpoet_shortcodes",
configurationFilter: function(originalConfig) { return originalConfig; },
configurationFilter: function(originalConfig) { return originalConfig; }
},
onDomRefresh: function() {
var that = this;
@ -76,7 +76,7 @@ define([
editor.on('blur', function(e) {
that.view.triggerMethod('text:editor:blur');
});
},
}
}));
}
});

50
assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
View File

@ -53,7 +53,7 @@ define([
});
CommunicationComponent.getBulkTransformedPosts({
blocks: blocks,
blocks: blocks
}).then(_.partial(this.refreshBlocks, models));
},
refreshBlocks: function(models, renderedBlocks) {
@ -65,7 +65,7 @@ define([
model.trigger('refreshPosts', contents);
}
);
},
}
});
Module.AutomatedLatestContentBlockModel = base.BlockModel.extend({
@ -97,14 +97,14 @@ define([
sortBy: 'newest', // 'newest'|'oldest',
showDivider: true, // true|false
divider: {},
_container: new (App.getBlockTypeModel('container'))(),
_container: new (App.getBlockTypeModel('container'))()
}, App.getConfig().get('blockDefaults.automatedLatestContent'));
},
relations: function() {
return {
readMoreButton: App.getBlockTypeModel('button'),
divider: App.getBlockTypeModel('divider'),
_container: App.getBlockTypeModel('container'),
_container: App.getBlockTypeModel('container')
};
},
initialize: function() {
@ -124,7 +124,7 @@ define([
*/
_scheduleFetchPosts: function() {
App.getChannel().trigger('automatedLatestContentRefresh');
},
}
});
Module.AutomatedLatestContentBlockView = base.BlockView.extend({
@ -138,15 +138,15 @@ define([
getTemplate: function() { return templates.automatedLatestContentBlock; },
regions: {
toolsRegion: '.mailpoet_tools',
postsRegion: '.mailpoet_automated_latest_content_block_posts',
postsRegion: '.mailpoet_automated_latest_content_block_posts'
},
modelEvents: _.extend(
_.omit(base.BlockView.prototype.modelEvents, 'change'),
{
'postsChanged': 'render',
'postsChanged': 'render'
}),
events: _.extend(base.BlockView.prototype.events, {
'click .mailpoet_automated_latest_content_block_overlay': 'showSettings',
'click .mailpoet_automated_latest_content_block_overlay': 'showSettings'
}),
onDragSubstituteBy: function() { return Module.AutomatedLatestContentWidgetView; },
onRender: function() {
@ -154,16 +154,16 @@ define([
renderOptions = {
disableTextEditor: true,
disableDragAndDrop: true,
emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay'),
emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay')
};
this.toolsView = new Module.AutomatedLatestContentBlockToolsView({ model: this.model });
this.showChildView('toolsRegion', this.toolsView);
this.showChildView('postsRegion', new ContainerView({ model: this.model.get('_container'), renderOptions: renderOptions }));
},
}
});
Module.AutomatedLatestContentBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.AutomatedLatestContentBlockSettingsView; },
getSettingsView: function() { return Module.AutomatedLatestContentBlockSettingsView; }
});
// Sidebar view container
@ -192,7 +192,7 @@ define([
"input .mailpoet_automated_latest_content_categories": _.partial(this.changeField, "categoriesPrecededBy"),
"input .mailpoet_automated_latest_content_read_more_text": _.partial(this.changeField, "readMoreText"),
"change .mailpoet_automated_latest_content_sort_by": _.partial(this.changeField, "sortBy"),
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
onRender: function() {
@ -247,8 +247,8 @@ define([
}
)
};
},
},
}
}
}).on({
'select2:select': function(event) {
var terms = that.model.get('terms');
@ -261,7 +261,7 @@ define([
terms.remove(event.params.data);
// Reset whole model in order for change events to propagate properly
that.model.set('terms', terms.toJSON());
},
}
}).trigger( 'change' );
},
toggleDisplayOptions: function(event) {
@ -282,8 +282,8 @@ define([
renderOptions: {
displayFormat: 'subpanel',
hideLink: true,
hideApplyToAll: true,
},
hideApplyToAll: true
}
})).render();
},
showDividerSettings: function(event) {
@ -292,8 +292,8 @@ define([
model: this.model.get('divider'),
renderOptions: {
displayFormat: 'subpanel',
hideApplyToAll: true,
},
hideApplyToAll: true
}
})).render();
},
changeReadMoreType: function(event) {
@ -356,11 +356,11 @@ define([
_.each(postTypes, function(type) {
select.append(jQuery('<option>', {
value: type.name,
text: type.label,
text: type.label
}));
});
select.val(selectedValue);
},
}
});
Module.AutomatedLatestContentWidgetView = base.WidgetView.extend({
@ -373,21 +373,21 @@ define([
},
onDrop: function(options) {
options.droppedView.triggerMethod('showSettings');
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('automatedLatestContent', {
blockModel: Module.AutomatedLatestContentBlockModel,
blockView: Module.AutomatedLatestContentBlockView,
blockView: Module.AutomatedLatestContentBlockView
});
App.registerWidget({
name: 'automatedLatestContent',
widgetView: Module.AutomatedLatestContentWidgetView,
priority: 97,
priority: 97
});
});

36
assets/js/src/newsletter_editor/blocks/base.js
View File

@ -42,21 +42,21 @@ define([
},
getChildren: function() {
return [];
},
}
});
Module.BlockView = AugmentedView.extend({
regions: {
toolsRegion: '> .mailpoet_tools',
toolsRegion: '> .mailpoet_tools'
},
modelEvents: {
'change': 'render',
'delete': 'deleteBlock',
'duplicate': 'duplicateBlock',
'duplicate': 'duplicateBlock'
},
events: {
"mouseenter": "showTools",
"mouseleave": "hideTools",
"mouseleave": "hideTools"
},
behaviors: {
DraggableBehavior: {
@ -79,14 +79,14 @@ define([
WidgetView.destroy();
return node;
}
},
}
},
HighlightEditingBehavior: {},
HighlightEditingBehavior: {}
},
templateContext: function() {
return {
model: this.model.toJSON(),
viewCid: this.cid,
viewCid: this.cid
};
},
constructor: function() {
@ -162,19 +162,19 @@ define([
easing: easing,
complete: function() {
promise.resolve();
}.bind(this),
}.bind(this)
}
).velocity(
fadeDirection,
{
duration: 250,
easing: easing,
queue: false, // Do not enqueue, trigger animation in parallel
queue: false // Do not enqueue, trigger animation in parallel
}
);
return promise;
},
}
});
Module.BlockToolsView = AugmentedView.extend({
@ -184,14 +184,14 @@ define([
"click .mailpoet_delete_block_activate": "showDeletionConfirmation",
"click .mailpoet_delete_block_cancel": "hideDeletionConfirmation",
"click .mailpoet_delete_block_confirm": "deleteBlock",
"click .mailpoet_duplicate_block": "duplicateBlock",
"click .mailpoet_duplicate_block": "duplicateBlock"
},
// Markers of whether these particular tools will be used for this instance
tools: {
settings: true,
delete: true,
duplicate: true,
move: true,
move: true
},
getSettingsView: function() { return Module.BlockSettingsView; },
initialize: function(options) {
@ -209,7 +209,7 @@ define([
return {
model: this.model.toJSON(),
viewCid: this.cid,
tools: this.tools,
tools: this.tools
};
},
changeSettings: function(options) {
@ -231,13 +231,13 @@ define([
event.preventDefault();
this.model.trigger('duplicate');
return false;
},
}
});
Module.BlockSettingsView = Marionette.View.extend({
className: 'mailpoet_editor_settings',
behaviors: {
ColorPickerBehavior: {},
ColorPickerBehavior: {}
},
initialize: function(params) {
this.model.trigger('startEditing');
@ -248,7 +248,7 @@ define([
width: App.getConfig().get('sidepanelWidth'),
onCancel: function() {
this.destroy();
}.bind(this),
}.bind(this)
};
this.renderOptions = params.renderOptions || {};
if (this.renderOptions.displayFormat === 'subpanel') {
@ -290,7 +290,7 @@ define([
onBeforeDestroy: function() {
MailPoet.Modal.close();
this.model.trigger('stopEditing');
},
}
});
Module.WidgetView = Marionette.View.extend({
@ -301,7 +301,7 @@ define([
throw "Unsupported operation";
}
}
},
}
});
return Module;

26
assets/js/src/newsletter_editor/blocks/button.js
View File

@ -33,11 +33,11 @@ define([
fontFamily: 'Arial',
fontSize: '16px',
fontWeight: 'normal', // 'normal'|'bold'
textAlign: 'center',
},
},
textAlign: 'center'
}
}
}, App.getConfig().get('blockDefaults.button'));
},
}
});
Module.ButtonBlockView = base.BlockView.extend({
@ -45,7 +45,7 @@ define([
getTemplate: function() { return templates.buttonBlock; },
onDragSubstituteBy: function() { return Module.ButtonWidgetView; },
behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
ShowSettingsBehavior: {},
ShowSettingsBehavior: {}
}),
initialize: function() {
base.BlockView.prototype.initialize.apply(this, arguments);
@ -57,11 +57,11 @@ define([
onRender: function() {
this.toolsView = new Module.ButtonBlockToolsView({ model: this.model });
this.showChildView('toolsRegion', this.toolsView);
},
}
});
Module.ButtonBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.ButtonBlockSettingsView; },
getSettingsView: function() { return Module.ButtonBlockSettingsView; }
});
Module.ButtonBlockSettingsView = base.BlockSettingsView.extend({
@ -95,13 +95,13 @@ define([
"input .mailpoet_field_button_line_height_input": _.partial(this.updateValueAndCall, '.mailpoet_field_button_line_height', _.partial(this.changePixelField, "styles.block.lineHeight").bind(this)),
"click .mailpoet_field_button_replace_all_styles": "applyToAll",
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
templateContext: function() {
return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
availableStyles: App.getAvailableStyles().toJSON(),
renderOptions: this.renderOptions,
renderOptions: this.renderOptions
});
},
applyToAll: function() {
@ -127,21 +127,21 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.ButtonBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('button', {
blockModel: Module.ButtonBlockModel,
blockView: Module.ButtonBlockView,
blockView: Module.ButtonBlockView
});
App.registerWidget({
name: 'button',
widgetView: Module.ButtonWidgetView,
priority: 92,
priority: 92
});
});

70
assets/js/src/newsletter_editor/blocks/container.js
View File

@ -30,12 +30,12 @@ define([
// TODO: If type has no registered model, use a backup one
return new Type(block, {parse: true});
});
},
}
});
Module.ContainerBlockModel = base.BlockModel.extend({
relations: {
blocks: BlockCollection,
blocks: BlockCollection
},
defaults: function() {
return this._getDefaults({
@ -43,10 +43,10 @@ define([
orientation: 'vertical',
styles: {
block: {
backgroundColor: 'transparent',
},
backgroundColor: 'transparent'
}
},
blocks: new BlockCollection(),
blocks: new BlockCollection()
}, App.getConfig().get('blockDefaults.container'));
},
validate: function() {
@ -60,7 +60,7 @@ define([
// If container has any blocks - add them to a collection
if (response.type === 'container' && _.has(response, 'blocks')) {
response.blocks = new BlockCollection(response.blocks, {
parse: true,
parse: true
});
}
return response;
@ -71,7 +71,7 @@ define([
});
return _.flatten(models);
},
}
});
Module.ContainerBlocksView = Marionette.CollectionView.extend({
@ -100,12 +100,12 @@ define([
blocks: {
el: '> .mailpoet_container',
replaceElement: true
},
}
}),
className: 'mailpoet_block mailpoet_container_block mailpoet_droppable_block mailpoet_droppable_layout_block',
getTemplate: function() { return templates.containerBlock; },
events: _.extend({}, base.BlockView.prototype.events, {
"click .mailpoet_newsletter_layer_selector": "toggleEditingLayer",
"click .mailpoet_newsletter_layer_selector": "toggleEditingLayer"
}),
ui: {
tools: '> .mailpoet_tools'
@ -137,8 +137,8 @@ define([
// Attach Draggable only to layout containers and disable it
// for root and column containers.
return view.renderOptions.depth === 1;
},
},
}
}
}),
onDragSubstituteBy: function() {
// For two and three column layouts display their respective widgets,
@ -163,8 +163,8 @@ define([
delete: this.renderOptions.depth === 1,
duplicate: true,
move: this.renderOptions.depth === 1,
layerSelector: false,
},
layerSelector: false
}
});
this.showChildView('toolsRegion', this.toolsView);
this.showChildView('blocks', new Module.ContainerBlocksView({
@ -213,7 +213,7 @@ define([
enableContainerLayer();
}
event.stopPropagation();
},
}
});
Module.ContainerBlockEmptyView = Marionette.View.extend({
@ -224,13 +224,13 @@ define([
templateContext: function() {
return {
isRoot: this.renderOptions.depth === 0,
emptyContainerMessage: this.renderOptions.emptyContainerMessage || '',
emptyContainerMessage: this.renderOptions.emptyContainerMessage || ''
};
},
}
});
Module.ContainerBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.ContainerBlockSettingsView; },
getSettingsView: function() { return Module.ContainerBlockSettingsView; }
});
Module.ContainerBlockSettingsView = base.BlockSettingsView.extend({
@ -238,31 +238,31 @@ define([
events: function() {
return {
"change .mailpoet_field_container_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
regions: {
columnsSettingsRegion: '.mailpoet_container_columns_settings',
columnsSettingsRegion: '.mailpoet_container_columns_settings'
},
initialize: function() {
base.BlockSettingsView.prototype.initialize.apply(this, arguments);
this._columnsSettingsView = new (Module.ContainerBlockColumnsSettingsView)({
collection: this.model.get('blocks'),
collection: this.model.get('blocks')
});
},
onRender: function() {
this.showChildView('columnsSettingsRegion', this._columnsSettingsView);
},
}
});
Module.ContainerBlockColumnsSettingsView = Marionette.CollectionView.extend({
childView: function() { return Module.ContainerBlockColumnSettingsView; },
childViewOptions: function(model, index) {
return {
columnIndex: index,
columnIndex: index
};
},
}
});
Module.ContainerBlockColumnSettingsView = Marionette.View.extend({
@ -273,9 +273,9 @@ define([
templateContext: function() {
return {
model: this.model.toJSON(),
columnNumber: this.columnNumber,
columnNumber: this.columnNumber
};
},
}
});
Module.OneColumnContainerWidgetView = base.WidgetView.extend({
@ -288,12 +288,12 @@ define([
return new Module.ContainerBlockModel({
orientation: 'horizontal',
blocks: [
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel()
]
});
}
}
},
}
});
Module.TwoColumnContainerWidgetView = base.WidgetView.extend({
@ -307,12 +307,12 @@ define([
orientation: 'horizontal',
blocks: [
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel()
]
});
}
}
},
}
});
Module.ThreeColumnContainerWidgetView = base.WidgetView.extend({
@ -327,36 +327,36 @@ define([
blocks: [
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel(),
new Module.ContainerBlockModel()
]
});
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('container', {
blockModel: Module.ContainerBlockModel,
blockView: Module.ContainerBlockView,
blockView: Module.ContainerBlockView
});
App.registerLayoutWidget({
name: 'oneColumnLayout',
priority: 100,
widgetView: Module.OneColumnContainerWidgetView,
widgetView: Module.OneColumnContainerWidgetView
});
App.registerLayoutWidget({
name: 'twoColumnLayout',
priority: 100,
widgetView: Module.TwoColumnContainerWidgetView,
widgetView: Module.TwoColumnContainerWidgetView
});
App.registerLayoutWidget({
name: 'threeColumnLayout',
priority: 100,
widgetView: Module.ThreeColumnContainerWidgetView,
widgetView: Module.ThreeColumnContainerWidgetView
});
});

34
assets/js/src/newsletter_editor/blocks/divider.js
View File

@ -24,11 +24,11 @@ define([
padding: '12px',
borderStyle: 'solid',
borderWidth: '1px',
borderColor: '#000000',
},
},
borderColor: '#000000'
}
}
}, App.getConfig().get('blockDefaults.divider'));
},
}
});
Module.DividerBlockView = base.BlockView.extend({
@ -41,11 +41,11 @@ define([
resizeHandleSelector: '.mailpoet_resize_handle',
transformationFunction: function(y) { return y / 2; },
minLength: 0, // TODO: Move this number to editor configuration
modelField: 'styles.block.padding',
modelField: 'styles.block.padding'
},
ShowSettingsBehavior: {
ignoreFrom: '.mailpoet_resize_handle'
},
}
}, base.BlockView.prototype.behaviors),
onDragSubstituteBy: function() { return Module.DividerWidgetView; },
initialize: function() {
@ -61,7 +61,7 @@ define([
},
templateContext: function() {
return _.extend({
totalHeight: parseInt(this.model.get('styles.block.padding'), 10)*2 + parseInt(this.model.get('styles.block.borderWidth')) + 'px',
totalHeight: parseInt(this.model.get('styles.block.padding'), 10)*2 + parseInt(this.model.get('styles.block.borderWidth')) + 'px'
}, base.BlockView.prototype.templateContext.apply(this));
},
onRender: function() {
@ -76,11 +76,11 @@ define([
this.$('.mailpoet_content').css('padding-top', this.model.get('styles.block.padding'));
this.$('.mailpoet_content').css('padding-bottom', this.model.get('styles.block.padding'));
this.$('.mailpoet_resize_handle_text').text(parseInt(this.model.get('styles.block.padding'), 10)*2 + parseInt(this.model.get('styles.block.borderWidth')) + 'px');
},
}
});
Module.DividerBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.DividerBlockSettingsView; },
getSettingsView: function() { return Module.DividerBlockSettingsView; }
});
Module.DividerBlockSettingsView = base.BlockSettingsView.extend({
@ -96,18 +96,18 @@ define([
"change .mailpoet_field_divider_border_color": _.partial(this.changeColorField, "styles.block.borderColor"),
"change .mailpoet_field_divider_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
"click .mailpoet_button_divider_apply_to_all": "applyToAll",
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
modelEvents: function() {
return {
'change:styles.block.borderColor': 'repaintDividerStyleOptions',
'change:styles.block.borderColor': 'repaintDividerStyleOptions'
};
},
templateContext: function() {
return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
availableStyles: App.getAvailableStyles().toJSON(),
renderOptions: this.renderOptions,
renderOptions: this.renderOptions
});
},
changeStyle: function(event) {
@ -125,7 +125,7 @@ define([
updateValueAndCall: function(fieldToUpdate, callable, event) {
this.$(fieldToUpdate).val(jQuery(event.target).val());
callable(event);
},
}
});
Module.DividerWidgetView = base.WidgetView.extend({
@ -135,20 +135,20 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.DividerBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('divider', {
blockModel: Module.DividerBlockModel,
blockView: Module.DividerBlockView,
blockView: Module.DividerBlockView
});
App.registerWidget({
name: 'divider',
widgetView: Module.DividerWidgetView,
priority: 93,
priority: 93
});
});

36
assets/js/src/newsletter_editor/blocks/footer.js
View File

@ -19,38 +19,38 @@ define([
text: '<a href="[link:subscription_unsubscribe_url]">Unsubscribe</a> | <a href="[link:subscription_manage_url]">Manage subscription</a><br /><b>Add your postal address here!</b>',
styles: {
block: {
backgroundColor: 'transparent',
backgroundColor: 'transparent'
},
text: {
fontColor: '#000000',
fontFamily: 'Arial',
fontSize: '12px',
textAlign: 'center',
textAlign: 'center'
},
link: {
fontColor: '#0000ff',
textDecoration: 'none',
},
},
textDecoration: 'none'
}
}
}, App.getConfig().get('blockDefaults.footer'));
},
}
});
Module.FooterBlockView = base.BlockView.extend({
className: "mailpoet_block mailpoet_footer_block mailpoet_droppable_block",
getTemplate: function() { return templates.footerBlock; },
modelEvents: _.extend({
'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render'
}, _.omit(base.BlockView.prototype.modelEvents, 'change')),
behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
TextEditorBehavior: {
configurationFilter: function(originalSettings) {
return _.extend({}, originalSettings, {
mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
});
}
},
}
}),
onDragSubstituteBy: function() { return Module.FooterWidgetView; },
onRender: function() {
@ -67,11 +67,11 @@ define([
onTextEditorBlur: function() {
this.enableDragging();
this.enableShowingTools();
},
}
});
Module.FooterBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.FooterBlockSettingsView; },
getSettingsView: function() { return Module.FooterBlockSettingsView; }
});
Module.FooterBlockSettingsView = base.BlockSettingsView.extend({
@ -87,14 +87,14 @@ define([
},
"change .mailpoet_field_footer_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
"change .mailpoet_field_footer_alignment": _.partial(this.changeField, "styles.text.textAlign"),
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
templateContext: function() {
return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
availableStyles: App.getAvailableStyles().toJSON(),
availableStyles: App.getAvailableStyles().toJSON()
});
},
}
});
Module.FooterWidgetView = base.WidgetView.extend({
@ -104,21 +104,21 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.FooterBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('footer', {
blockModel: Module.FooterBlockModel,
blockView: Module.FooterBlockView,
blockView: Module.FooterBlockView
});
App.registerWidget({
name: 'footer',
widgetView: Module.FooterWidgetView,
priority: 99,
priority: 99
});
});

36
assets/js/src/newsletter_editor/blocks/header.js
View File

@ -19,38 +19,38 @@ define([
text: 'Display problems? <a href="[link:newsletter_view_in_browser_url]">View it in your browser</a>',
styles: {
block: {
backgroundColor: 'transparent',
backgroundColor: 'transparent'
},
text: {
fontColor: '#000000',
fontFamily: 'Arial',
fontSize: '12px',
textAlign: 'center',
textAlign: 'center'
},
link: {
fontColor: '#0000ff',
textDecoration: 'underline',
},
},
textDecoration: 'underline'
}
}
}, App.getConfig().get('blockDefaults.header'));
},
}
});
Module.HeaderBlockView = base.BlockView.extend({
className: "mailpoet_block mailpoet_header_block mailpoet_droppable_block",
getTemplate: function() { return templates.headerBlock; },
modelEvents: _.extend({
'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render'
}, _.omit(base.BlockView.prototype.modelEvents, 'change')),
behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
TextEditorBehavior: {
configurationFilter: function(originalSettings) {
return _.extend({}, originalSettings, {
mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
});
}
},
}
}),
onDragSubstituteBy: function() { return Module.HeaderWidgetView; },
onRender: function() {
@ -67,11 +67,11 @@ define([
onTextEditorBlur: function() {
this.enableDragging();
this.enableShowingTools();
},
}
});
Module.HeaderBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.HeaderBlockSettingsView; },
getSettingsView: function() { return Module.HeaderBlockSettingsView; }
});
Module.HeaderBlockSettingsView = base.BlockSettingsView.extend({
@ -87,14 +87,14 @@ define([
},
"change .mailpoet_field_header_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
"change .mailpoet_field_header_alignment": _.partial(this.changeField, "styles.text.textAlign"),
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
templateContext: function() {
return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
availableStyles: App.getAvailableStyles().toJSON(),
availableStyles: App.getAvailableStyles().toJSON()
});
},
}
});
Module.HeaderWidgetView = base.WidgetView.extend({
@ -104,21 +104,21 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.HeaderBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('header', {
blockModel: Module.HeaderBlockModel,
blockView: Module.HeaderBlockView,
blockView: Module.HeaderBlockView
});
App.registerWidget({
name: 'header',
widgetView: Module.HeaderWidgetView,
priority: 98,
priority: 98
});
});

36
assets/js/src/newsletter_editor/blocks/image.js
View File

@ -25,11 +25,11 @@ define([
height: '64px',
styles: {
block: {
textAlign: 'center',
},
},
textAlign: 'center'
}
}
}, App.getConfig().get('blockDefaults.image'));
},
}
});
Module.ImageBlockView = base.BlockView.extend({
@ -38,11 +38,11 @@ define([
onDragSubstituteBy: function() { return Module.ImageWidgetView; },
templateContext: function() {
return _.extend({
imageMissingSrc: App.getConfig().get('urls.imageMissing'),
imageMissingSrc: App.getConfig().get('urls.imageMissing')
}, base.BlockView.prototype.templateContext.apply(this));
},
behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
ShowSettingsBehavior: {},
ShowSettingsBehavior: {}
}),
onRender: function() {
this.toolsView = new Module.ImageBlockToolsView({ model: this.model });
@ -53,11 +53,11 @@ define([
} else {
this.$el.removeClass('mailpoet_full_image');
}
},
}
});
Module.ImageBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.ImageBlockSettingsView; },
getSettingsView: function() { return Module.ImageBlockSettingsView; }
});
Module.ImageBlockSettingsView = base.BlockSettingsView.extend({
@ -70,7 +70,7 @@ define([
"change .mailpoet_field_image_full_width": _.partial(this.changeBoolCheckboxField, "fullWidth"),
"change .mailpoet_field_image_alignment": _.partial(this.changeField, "styles.block.textAlign"),
"click .mailpoet_field_image_select_another_image": "showMediaManager",
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
initialize: function(options) {
@ -141,7 +141,7 @@ define([
// Update user settings when users adjust the
// attachment display settings.
displayUserSettings: false
}),
})
]);
if(wp.media.view.settings.post.featuredImageId) {
@ -285,8 +285,8 @@ define([
},
displaySettings: false,
button: {
text: 'Select',
},
text: 'Select'
}
}),
that = this;
@ -318,7 +318,7 @@ define([
height: mainSize.height + 'px',
width: mainSize.width + 'px',
src: mainSize.url,
alt: (attachment.get('alt') !== "" && attachment.get('alt') !== undefined) ? attachment.get('alt') : attachment.get('title'),
alt: (attachment.get('alt') !== "" && attachment.get('alt') !== undefined) ? attachment.get('alt') : attachment.get('title')
});
// Rerender settings view due to changes from outside of settings view
that.render();
@ -346,7 +346,7 @@ define([
if (typeof this._mediaManager === 'object') {
this._mediaManager.remove();
}
},
}
});
ImageWidgetView = base.WidgetView.extend({
@ -359,22 +359,22 @@ define([
},
onDrop: function(options) {
options.droppedView.triggerMethod('showSettings', { showImageManager: true });
},
}
}
},
}
});
Module.ImageWidgetView = ImageWidgetView;
App.on('before:start', function(App, options) {
App.registerBlockType('image', {
blockModel: Module.ImageBlockModel,
blockView: Module.ImageBlockView,
blockView: Module.ImageBlockView
});
App.registerWidget({
name: 'image',
widgetView: Module.ImageWidgetView,
priority: 91,
priority: 91
});
});

72
assets/js/src/newsletter_editor/blocks/posts.js
View File

@ -76,7 +76,7 @@ define([
divider: {},
_selectedPosts: [],
_availablePosts: [],
_transformedPosts: new (App.getBlockTypeModel('container'))(),
_transformedPosts: new (App.getBlockTypeModel('container'))()
}, App.getConfig().get('blockDefaults.posts'));
},
relations: function() {
@ -85,7 +85,7 @@ define([
divider: App.getBlockTypeModel('divider'),
_selectedPosts: Backbone.Collection,
_availablePosts: Backbone.Collection,
_transformedPosts: App.getBlockTypeModel('container'),
_transformedPosts: App.getBlockTypeModel('container')
};
},
initialize: function() {
@ -172,7 +172,7 @@ define([
}).fail(function() {
MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
});
},
}
});
Module.PostsBlockView = base.BlockView.extend({
@ -180,7 +180,7 @@ define([
getTemplate: function() { return templates.postsBlock; },
modelEvents: {}, // Forcefully disable all events
regions: _.extend({
postsRegion: '.mailpoet_posts_block_posts',
postsRegion: '.mailpoet_posts_block_posts'
}, base.BlockView.prototype.regions),
onDragSubstituteBy: function() { return Module.PostsWidgetView; },
initialize: function() {
@ -199,7 +199,7 @@ define([
renderOptions = {
disableTextEditor: true,
disableDragAndDrop: true,
emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay'),
emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay')
};
this.showChildView('postsRegion', new ContainerView({ model: this.model.get('_transformedPosts'), renderOptions: renderOptions }));
},
@ -208,27 +208,27 @@ define([
},
onBeforeDestroy: function() {
this.model.stopReplying('blockView', this.notifyAboutSelf, this);
},
}
});
Module.PostsBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.PostsBlockSettingsView; },
getSettingsView: function() { return Module.PostsBlockSettingsView; }
});
Module.PostsBlockSettingsView = base.BlockSettingsView.extend({
getTemplate: function() { return templates.postsBlockSettings; },
regions: {
selectionRegion: '.mailpoet_settings_posts_selection',
displayOptionsRegion: '.mailpoet_settings_posts_display_options',
displayOptionsRegion: '.mailpoet_settings_posts_display_options'
},
events: {
'click .mailpoet_settings_posts_show_display_options': 'switchToDisplayOptions',
'click .mailpoet_settings_posts_show_post_selection': 'switchToPostSelection',
'click .mailpoet_settings_posts_insert_selected': 'insertPosts',
'click .mailpoet_settings_posts_insert_selected': 'insertPosts'
},
templateContext: function() {
return {
model: this.model.toJSON(),
model: this.model.toJSON()
};
},
initialize: function() {
@ -251,7 +251,7 @@ define([
onCancel: function() {
// Self destroy the block if the user closes settings modal
that.model.destroy();
},
}
});
// Inform child views that they have been attached to document
@ -280,7 +280,7 @@ define([
this.model.trigger('insertSelectedPosts');
this.model.destroy();
this.close();
},
}
});
var PostsSelectionCollectionView = Marionette.CollectionView.extend({
@ -289,14 +289,14 @@ define([
emptyView: function() { return EmptyPostSelectionSettingsView; },
childViewOptions: function() {
return {
blockModel: this.blockModel,
blockModel: this.blockModel
};
},
initialize: function(options) {
this.blockModel = options.blockModel;
},
events: {
'scroll': 'onPostsScroll',
'scroll': 'onPostsScroll'
},
onPostsScroll: function(event) {
var $postsBox = jQuery(event.target);
@ -304,19 +304,19 @@ define([
// Load more posts if scrolled to bottom
this.blockModel.trigger('loadMorePosts');
}
},
}
});
var PostSelectionSettingsView = Marionette.View.extend({
getTemplate: function() { return templates.postSelectionPostsBlockSettings; },
regions: {
posts: '.mailpoet_post_selection_container',
posts: '.mailpoet_post_selection_container'
},
events: function() {
return {
'change .mailpoet_settings_posts_content_type': _.partial(this.changeField, 'contentType'),
'change .mailpoet_posts_post_status': _.partial(this.changeField, 'postStatus'),
'input .mailpoet_posts_search_term': _.partial(this.changeField, 'search'),
'input .mailpoet_posts_search_term': _.partial(this.changeField, 'search')
};
},
modelEvents: {
@ -392,8 +392,8 @@ define([
}
)
};
},
},
}
}
}).on({
'select2:select': function(event) {
var terms = that.model.get('terms');
@ -406,7 +406,7 @@ define([
terms.remove(event.params.data);
// Reset whole model in order for change events to propagate properly
that.model.set('terms', terms.toJSON());
},
}
}).trigger( 'change' );
},
changeField: function(field, event) {
@ -420,28 +420,28 @@ define([
_.each(postTypes, function(type) {
select.append(jQuery('<option>', {
value: type.name,
text: type.label,
text: type.label
}));
});
select.val(selectedValue);
},
}
});
var EmptyPostSelectionSettingsView = Marionette.View.extend({
getTemplate: function() { return templates.emptyPostPostsBlockSettings; },
getTemplate: function() { return templates.emptyPostPostsBlockSettings; }
});
var SinglePostSelectionSettingsView = Marionette.View.extend({
getTemplate: function() { return templates.singlePostPostsBlockSettings; },
events: function() {
return {
'change .mailpoet_select_post_checkbox': 'postSelectionChange',
'change .mailpoet_select_post_checkbox': 'postSelectionChange'
};
},
templateContext: function() {
return {
model: this.model.toJSON(),
index: this._index,
index: this._index
};
},
initialize: function(options) {
@ -455,7 +455,7 @@ define([
} else {
selectedPostsCollection.remove(this.model);
}
},
}
});
var PostsDisplayOptionsSettingsView = base.BlockSettingsView.extend({
@ -480,12 +480,12 @@ define([
"change .mailpoet_posts_show_categories": _.partial(this.changeField, "showCategories"),
"input .mailpoet_posts_categories": _.partial(this.changeField, "categoriesPrecededBy"),
"input .mailpoet_posts_read_more_text": _.partial(this.changeField, "readMoreText"),
"change .mailpoet_posts_sort_by": _.partial(this.changeField, "sortBy"),
"change .mailpoet_posts_sort_by": _.partial(this.changeField, "sortBy")
};
},
templateContext: function() {
return {
model: this.model.toJSON(),
model: this.model.toJSON()
};
},
showButtonSettings: function(event) {
@ -495,8 +495,8 @@ define([
renderOptions: {
displayFormat: 'subpanel',
hideLink: true,
hideApplyToAll: true,
},
hideApplyToAll: true
}
})).render();
},
showDividerSettings: function(event) {
@ -505,8 +505,8 @@ define([
model: this.model.get('divider'),
renderOptions: {
displayFormat: 'subpanel',
hideApplyToAll: true,
},
hideApplyToAll: true
}
})).render();
},
changeReadMoreType: function(event) {
@ -560,7 +560,7 @@ define([
this.$('.mailpoet_posts_title_as_link').removeClass('mailpoet_hidden');
}
this.changeField('titleFormat', event);
},
}
});
Module.PostsWidgetView = base.WidgetView.extend({
@ -572,19 +572,19 @@ define([
return new Module.PostsBlockModel({}, { parse: true });
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('posts', {
blockModel: Module.PostsBlockModel,
blockView: Module.PostsBlockView,
blockView: Module.PostsBlockView
});
App.registerWidget({
name: 'posts',
widgetView: Module.PostsWidgetView,
priority: 96,
priority: 96
});
});

70
assets/js/src/newsletter_editor/blocks/social.js
View File

@ -30,7 +30,7 @@ define([
image: App.getAvailableStyles().get('socialIconSets.default.custom'),
height: '32px',
width: '32px',
text: defaultValues.get('title'),
text: defaultValues.get('title')
};
},
initialize: function(options) {
@ -42,11 +42,11 @@ define([
this.set({
link: defaultValues.get('defaultLink'),
image: iconSet.get(that.get('iconType')),
text: defaultValues.get('title'),
text: defaultValues.get('title')
});
}, this);
this.on('change', function() { App.getChannel().trigger('autoSave'); });
},
}
});
Module.SocialIconCollectionModel = Backbone.Collection.extend({
@ -59,11 +59,11 @@ define([
return this._getDefaults({
type: 'social',
iconSet: 'default',
icons: new Module.SocialIconCollectionModel(),
icons: new Module.SocialIconCollectionModel()
}, App.getConfig().get('blockDefaults.social'));
},
relations: {
icons: Module.SocialIconCollectionModel,
icons: Module.SocialIconCollectionModel
},
initialize: function() {
this.get('icons').on('add remove change', this._iconsChanged, this);
@ -80,27 +80,27 @@ define([
},
_iconsChanged: function() {
App.getChannel().trigger('autoSave');
},
}
});
var SocialIconView = Marionette.View.extend({
tagName: 'span',
getTemplate: function() { return templates.socialIconBlock; },
modelEvents: {
'change': 'render',
'change': 'render'
},
templateContext: function() {
var allIconSets = App.getAvailableStyles().get('socialIconSets');
return {
model: this.model.toJSON(),
allIconSets: allIconSets.toJSON(),
imageMissingSrc: App.getConfig().get('urls.imageMissing'),
imageMissingSrc: App.getConfig().get('urls.imageMissing')
};
},
}
});
Module.SocialIconCollectionView = Marionette.CollectionView.extend({
childView: SocialIconView,
childView: SocialIconView
});
Module.SocialBlockView = base.BlockView.extend({
@ -113,7 +113,7 @@ define([
tools: '> .mailpoet_tools'
},
behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
ShowSettingsBehavior: {},
ShowSettingsBehavior: {}
}),
onDragSubstituteBy: function() { return Module.SocialWidgetView; },
onRender: function() {
@ -122,11 +122,11 @@ define([
this.showChildView('icons', new Module.SocialIconCollectionView({
collection: this.model.get('icons')
}))
},
}
});
Module.SocialBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.SocialBlockSettingsView; },
getSettingsView: function() { return Module.SocialBlockSettingsView; }
});
// Sidebar view container
@ -134,11 +134,11 @@ define([
getTemplate: function() { return templates.socialBlockSettings; },
regions: {
iconRegion: '#mailpoet_social_icons_selection',
stylesRegion: '#mailpoet_social_icons_styles',
stylesRegion: '#mailpoet_social_icons_styles'
},
events: function() {
return {
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
initialize: function() {
@ -162,7 +162,7 @@ define([
"change .mailpoet_social_icon_field_type": _.partial(this.changeField, "iconType"),
"input .mailpoet_social_icon_field_image": _.partial(this.changeField, "image"),
"input .mailpoet_social_icon_field_link": this.changeLink,
"input .mailpoet_social_icon_field_text": _.partial(this.changeField, "text"),
"input .mailpoet_social_icon_field_text": _.partial(this.changeField, "text")
};
},
modelEvents: {
@ -172,7 +172,7 @@ define([
},
'change:text': function() {
this.$('.mailpoet_social_icon_image').attr('alt', this.model.get('text'));
},
}
},
templateContext: function() {
var icons = App.getConfig().get('socialIcons'),
@ -182,7 +182,7 @@ define([
return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
iconTypes: availableIconTypes,
currentType: icons.get(this.model.get('iconType')).toJSON(),
allIconSets: allIconSets.toJSON(),
allIconSets: allIconSets.toJSON()
});
},
deleteIcon: function() {
@ -197,17 +197,17 @@ define([
},
changeField: function(field, event) {
this.model.set(field, jQuery(event.target).val());
},
}
});
SocialBlockSettingsIconCollectionView = Marionette.CollectionView.extend({
behaviors: {
SortableBehavior: {
items: '> div',
},
items: '> div'
}
},
childViewContainer: '#mailpoet_social_icon_selector_contents',
childView: SocialBlockSettingsIconView,
childView: SocialBlockSettingsIconView
});
// Select icons section container view
@ -217,10 +217,10 @@ define([
'icons': '#mailpoet_social_icon_selector_contents'
},
events: {
'click .mailpoet_add_social_icon': 'addSocialIcon',
'click .mailpoet_add_social_icon': 'addSocialIcon'
},
modelEvents: {
'change:iconSet': 'render',
'change:iconSet': 'render'
},
addSocialIcon: function() {
// Add a social icon with default values
@ -237,10 +237,10 @@ define([
SocialBlockSettingsStylesView = Marionette.View.extend({
getTemplate: function() { return templates.socialSettingsStyles; },
modelEvents: {
'change': 'render',
'change': 'render'
},
events: {
'click .mailpoet_social_icon_set': 'changeSocialIconSet',
'click .mailpoet_social_icon_set': 'changeSocialIconSet'
},
initialize: function() {
this.listenTo(this.model.get('icons'), 'add remove change', this.render);
@ -251,7 +251,7 @@ define([
activeSet: this.model.get('iconSet'),
socialIconSets: allIconSets.toJSON(),
availableSets: _.keys(allIconSets.toJSON()),
availableSocialIcons: this.model.get('icons').pluck('iconType'),
availableSocialIcons: this.model.get('icons').pluck('iconType')
};
},
changeSocialIconSet: function(event) {
@ -259,7 +259,7 @@ define([
},
onBeforeDestroy: function() {
this.model.get('icons').off('add remove', this.render, this);
},
}
});
Module.SocialWidgetView = base.WidgetView.extend({
@ -279,7 +279,7 @@ define([
image: App.getAvailableStyles().get('socialIconSets.default.facebook'),
height: '32px',
width: '32px',
text: 'Facebook',
text: 'Facebook'
},
{
type: 'socialIcon',
@ -288,25 +288,25 @@ define([
image: App.getAvailableStyles().get('socialIconSets.default.twitter'),
height: '32px',
width: '32px',
text: 'Twitter',
},
],
text: 'Twitter'
}
]
}, { parse: true });
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('social', {
blockModel: Module.SocialBlockModel,
blockView: Module.SocialBlockView,
blockView: Module.SocialBlockView
});
App.registerWidget({
name: 'social',
widgetView: Module.SocialWidgetView,
priority: 95,
priority: 95
});
});

28
assets/js/src/newsletter_editor/blocks/spacer.js
View File

@ -19,11 +19,11 @@ define([
styles: {
block: {
backgroundColor: 'transparent',
height: '40px',
},
},
height: '40px'
}
}
}, App.getConfig().get('blockDefaults.spacer'));
},
}
});
Module.SpacerBlockView = base.BlockView.extend({
@ -34,11 +34,11 @@ define([
elementSelector: '.mailpoet_spacer',
resizeHandleSelector: '.mailpoet_resize_handle',
minLength: 20, // TODO: Move this number to editor configuration
modelField: 'styles.block.height',
modelField: 'styles.block.height'
},
ShowSettingsBehavior: {
ignoreFrom: '.mailpoet_resize_handle'
},
}
}, base.BlockView.prototype.behaviors),
modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'),
onDragSubstituteBy: function() { return Module.SpacerWidgetView; },
@ -58,11 +58,11 @@ define([
},
onBeforeDestroy: function() {
this.stopListening(this.model);
},
}
});
Module.SpacerBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.SpacerBlockSettingsView; },
getSettingsView: function() { return Module.SpacerBlockSettingsView; }
});
Module.SpacerBlockSettingsView = base.BlockSettingsView.extend({
@ -70,9 +70,9 @@ define([
events: function() {
return {
"change .mailpoet_field_spacer_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
"click .mailpoet_done_editing": "close",
"click .mailpoet_done_editing": "close"
};
},
}
});
Module.SpacerWidgetView = base.WidgetView.extend({
@ -82,21 +82,21 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.SpacerBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('spacer', {
blockModel: Module.SpacerBlockModel,
blockView: Module.SpacerBlockView,
blockView: Module.SpacerBlockView
});
App.registerWidget({
name: 'spacer',
widgetView: Module.SpacerWidgetView,
priority: 94,
priority: 94
});
});

28
assets/js/src/newsletter_editor/blocks/text.js
View File

@ -16,9 +16,9 @@ define([
defaults: function() {
return this._getDefaults({
type: 'text',
text: 'Edit this to insert text',
text: 'Edit this to insert text'
}, App.getConfig().get('blockDefaults.text'));
},
}
});
Module.TextBlockView = base.BlockView.extend({
@ -36,16 +36,16 @@ define([
configurationFilter: function(originalSettings) {
return _.extend({}, originalSettings, {
mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
});
}
},
}
}),
initialize: function(options) {
base.BlockView.prototype.initialize.apply(this, arguments);
this.renderOptions = _.defaults(options.renderOptions || {}, {
disableTextEditor: false,
disableTextEditor: false
});
this.disableTextEditor = this.renderOptions.disableTextEditor;
@ -55,8 +55,8 @@ define([
this.toolsView = new Module.TextBlockToolsView({
model: this.model,
tools: {
settings: false,
},
settings: false
}
});
this.showChildView('toolsRegion', this.toolsView);
},
@ -70,15 +70,15 @@ define([
onTextEditorBlur: function() {
this.enableDragging();
this.enableShowingTools();
},
}
});
Module.TextBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.TextBlockSettingsView; },
getSettingsView: function() { return Module.TextBlockSettingsView; }
});
Module.TextBlockSettingsView = base.BlockSettingsView.extend({
getTemplate: function() { return templates.textBlockSettings; },
getTemplate: function() { return templates.textBlockSettings; }
});
Module.TextWidgetView = base.WidgetView.extend({
@ -88,21 +88,21 @@ define([
cloneOriginal: true,
drop: function() {
return new Module.TextBlockModel();
},
}
}
},
}
});
App.on('before:start', function(App, options) {
App.registerBlockType('text', {
blockModel: Module.TextBlockModel,
blockView: Module.TextBlockView,
blockView: Module.TextBlockView
});
App.registerWidget({
name: 'text',
widgetView: Module.TextWidgetView,
priority: 90,
priority: 90
});
});

4
assets/js/src/newsletter_editor/components/config.js
View File

@ -12,8 +12,8 @@ define([
blockDefaults: {},
sidepanelWidth: '331px',
validation: {},
urls: {},
},
urls: {}
}
});
// Global and available styles for access in blocks and their settings

8
assets/js/src/newsletter_editor/components/content.js
View File

@ -22,7 +22,7 @@ define([
// Use only whitelisted properties to ensure properties editor
// doesn't control don't change.
return _.pick(SuperModel.prototype.toJSON.call(this), this.whitelisted);
},
}
});
// Content block view and model handlers for different content types
@ -48,13 +48,13 @@ define([
Module.getBody = function() {
return {
content: App._contentContainer.toJSON(),
globalStyles: App.getGlobalStyles().toJSON(),
globalStyles: App.getGlobalStyles().toJSON()
};
};
Module.toJSON = function() {
return _.extend({
body: Module.getBody(),
body: Module.getBody()
}, App.getNewsletter().toJSON());
};
@ -94,7 +94,7 @@ define([
App._contentContainer = new (App.getBlockTypeModel('container'))(content, {parse: true});
App._contentContainerView = new (App.getBlockTypeView('container'))({
model: App._contentContainer,
renderOptions: { depth: 0 },
renderOptions: { depth: 0 }
});
App._appView.showChildView('contentRegion', App._contentContainerView);

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

@ -14,18 +14,18 @@ define([
getTemplate: function() { return templates.heading; },
templateContext: function() {
return {
model: this.model.toJSON(),
model: this.model.toJSON()
};
},
events: function() {
return {
'keyup .mailpoet_input_title': _.partial(this.changeField, "subject"),
'keyup .mailpoet_input_preheader': _.partial(this.changeField, "preheader"),
'keyup .mailpoet_input_preheader': _.partial(this.changeField, "preheader")
};
},
changeField: function(field, event) {
this.model.set(field, jQuery(event.target).val());
},
}
});
App.on('start', function(App, options) {

26
assets/js/src/newsletter_editor/components/save.js
View File

@ -49,7 +49,7 @@ define([
MailPoet.Notice.error(
MailPoet.I18n.t('templateSaveFailed'),
{
scroll: true,
scroll: true
}
);
} else {
@ -105,7 +105,7 @@ define([
promise.then(function(thumbnail) {
var data = _.extend(options || {}, {
thumbnail: thumbnail.toDataURL('image/jpeg'),
body: JSON.stringify(App.getBody()),
body: JSON.stringify(App.getBody())
});
return MailPoet.Ajax.post({
@ -132,7 +132,7 @@ define([
).then(function(thumbnail) {
var data = _.extend(options || {}, {
thumbnail: thumbnail.toDataURL('image/jpeg'),
body: App.getBody(),
body: App.getBody()
});
var blob = new Blob(
[JSON.stringify(data)],
@ -154,7 +154,7 @@ define([
'click .mailpoet_save_as_template': 'saveAsTemplate',
/* Export template */
'click .mailpoet_save_export': 'toggleExportTemplate',
'click .mailpoet_export_template': 'exportTemplate',
'click .mailpoet_export_template': 'exportTemplate'
},
initialize: function(options) {
App.getChannel().on('beforeEditorSave', this.beforeSave, this);
@ -202,7 +202,7 @@ define([
MailPoet.I18n.t('templateNameMissing'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
} else if (templateDescription === '') {
@ -210,19 +210,19 @@ define([
MailPoet.I18n.t('templateDescriptionMissing'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
} else {
Module.saveTemplate({
name: templateName,
description: templateDescription,
description: templateDescription
}).done(function() {
MailPoet.Notice.success(
MailPoet.I18n.t('templateSaved'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
}).fail(function() {
@ -230,7 +230,7 @@ define([
MailPoet.I18n.t('templateSaveFailed'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
});
@ -255,7 +255,7 @@ define([
MailPoet.I18n.t('templateNameMissing'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
} else if (templateDescription === '') {
@ -263,13 +263,13 @@ define([
MailPoet.I18n.t('templateDescriptionMissing'),
{
positionAfter: that.$el,
scroll: true,
scroll: true
}
);
} else {
Module.exportTemplate({
name: templateName,
description: templateDescription,
description: templateDescription
});
this.hideExportTemplate();
}
@ -311,7 +311,7 @@ define([
hideValidationError: function() {
this.$('.mailpoet_save_error').addClass('mailpoet_hidden');
this.$('.mailpoet_save_next').removeClass('button-disabled');
},
}
});
Module.autoSave = function() {

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

@ -30,10 +30,10 @@ define([
defaults: {
name: '',
priority: 100,
widgetView: undefined,
},
widgetView: undefined
}
}),
comparator: 'priority',
comparator: 'priority'
}))();
Module.registerWidget = function(widget) { return Module._contentWidgets.add(widget); };
Module.getWidgets = function() { return Module._contentWidgets; };
@ -44,10 +44,10 @@ define([
defaults: {
name: '',
priority: 100,
widgetView: undefined,
},
widgetView: undefined
}
}),
comparator: 'priority',
comparator: 'priority'
}))();
Module.registerLayoutWidget = function(widget) { return Module._layoutWidgets.add(widget); };
Module.getLayoutWidgets = function() { return Module._layoutWidgets; };
@ -58,7 +58,7 @@ define([
contentRegion: '.mailpoet_content_region',
layoutRegion: '.mailpoet_layout_region',
stylesRegion: '.mailpoet_styles_region',
previewRegion: '.mailpoet_preview_region',
previewRegion: '.mailpoet_preview_region'
},
events: {
'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function(event) {
@ -84,11 +84,11 @@ define([
easing: "easeIn",
complete: function() {
$targetRegion.removeClass('closed');
},
}
}
);
}
},
}
},
initialize: function(options) {
jQuery(window)
@ -104,7 +104,7 @@ define([
));
this.showChildView('stylesRegion', new Module.SidebarStylesView({
model: App.getGlobalStyles(),
availableStyles: App.getAvailableStyles(),
availableStyles: App.getAvailableStyles()
}));
this.showChildView('previewRegion', new Module.SidebarPreviewView());
},
@ -127,13 +127,13 @@ define([
},
onDomRefresh: function() {
this.$el.parent().stick_in_parent({
offset_top: 32,
offset_top: 32
});
this.$el.parent().on('sticky_kit:stick', this.updateHorizontalScroll.bind(this));
this.$el.parent().on('sticky_kit:unstick', this.updateHorizontalScroll.bind(this));
this.$el.parent().on('sticky_kit:bottom', this.updateHorizontalScroll.bind(this));
this.$el.parent().on('sticky_kit:unbottom', this.updateHorizontalScroll.bind(this));
},
}
});
/**
@ -167,7 +167,7 @@ define([
* Responsible for rendering draggable layout widgets
*/
Module.SidebarLayoutWidgetsView = Module.SidebarWidgetsView.extend({
getTemplate: function() { return templates.sidebarLayout; },
getTemplate: function() { return templates.sidebarLayout; }
});
/**
@ -176,7 +176,7 @@ define([
Module.SidebarStylesView = Marionette.View.extend({
getTemplate: function() { return templates.sidebarStyles; },
behaviors: {
ColorPickerBehavior: {},
ColorPickerBehavior: {}
},
events: function() {
return {
@ -213,13 +213,13 @@ define([
this.model.set('link.textDecoration', (event.target.checked) ? event.target.value : 'none');
},
"change #mailpoet_newsletter_background_color": _.partial(this.changeColorField, 'wrapper.backgroundColor'),
"change #mailpoet_background_color": _.partial(this.changeColorField, 'body.backgroundColor'),
"change #mailpoet_background_color": _.partial(this.changeColorField, 'body.backgroundColor')
};
},
templateContext: function() {
return {
model: this.model.toJSON(),
availableStyles: this.availableStyles.toJSON(),
availableStyles: this.availableStyles.toJSON()
};
},
initialize: function(options) {
@ -234,14 +234,14 @@ define([
value = 'transparent';
}
this.model.set(field, value);
},
}
});
Module.SidebarPreviewView = Marionette.View.extend({
getTemplate: function() { return templates.sidebarPreview; },
events: {
'click .mailpoet_show_preview': 'showPreview',
'click #mailpoet_send_preview': 'sendPreview',
'click #mailpoet_send_preview': 'sendPreview'
},
onBeforeDestroy: function() {
if (this.previewView) {
@ -263,7 +263,7 @@ define([
api_version: window.mailpoet_api_version,
endpoint: 'newsletters',
action: 'showPreview',
data: json,
data: json
}).always(function() {
MailPoet.Modal.loading(false);
}).done(function(response) {
@ -296,7 +296,7 @@ define([
var $emailField = this.$('#mailpoet_preview_to_email');
var data = {
subscriber: $emailField.val(),
id: App.getNewsletter().get('id'),
id: App.getNewsletter().get('id')
};
if (data.subscriber.length <= 0) {
@ -304,7 +304,7 @@ define([
MailPoet.I18n.t('newsletterPreviewEmailMissing'),
{
positionAfter: $emailField,
scroll: true,
scroll: true
}
);
return false;
@ -333,7 +333,7 @@ define([
}
});
});
},
}
});
Module.NewsletterPreviewView = Marionette.View.extend({
@ -347,7 +347,7 @@ define([
return {
previewUrl: this.previewUrl,
width: this.width,
height: this.height,
height: this.height
};
}
});

18
assets/js/src/newsletter_editor/components/styles.js
View File

@ -13,7 +13,7 @@ define([
text: {
fontColor: '#000000',
fontFamily: 'Arial',
fontSize: '16px',
fontSize: '16px'
},
h1: {
fontColor: '#111111',
@ -23,33 +23,33 @@ define([
h2: {
fontColor: '#222222',
fontFamily: 'Tahoma',
fontSize: '32px',
fontSize: '32px'
},
h3: {
fontColor: '#333333',
fontFamily: 'Verdana',
fontSize: '24px',
fontSize: '24px'
},
link: {
fontColor: '#21759B',
textDecoration: 'underline',
textDecoration: 'underline'
},
wrapper: {
backgroundColor: '#ffffff',
backgroundColor: '#ffffff'
},
body: {
backgroundColor: '#cccccc',
},
backgroundColor: '#cccccc'
}
},
initialize: function() {
this.on('change', function() { App.getChannel().trigger('autoSave'); });
},
}
});
Module.StylesView = Marionette.View.extend({
getTemplate: function() { return templates.styles; },
modelEvents: {
'change': 'render',
'change': 'render'
},
serializeData: function() {
return this.model.toJSON();

6
assets/js/src/newsletter_editor/tinymce/mailpoet_shortcodes/plugin.js
View File

@ -31,7 +31,7 @@ tinymce.PluginManager.add('mailpoet_shortcodes', function(editor, url) {
if (configShortcodes.hasOwnProperty(segment)) {
shortcodes.push({
type: 'label',
text: segment,
text: segment
});
for (var i = 0; i < configShortcodes[segment].length; i += 1) {
@ -51,8 +51,8 @@ tinymce.PluginManager.add('mailpoet_shortcodes', function(editor, url) {
autoScroll: true,
title: editor.settings.mailpoet_shortcodes_window_title,
body: shortcodes,
buttons: [],
buttons: []
});
},
}
});
});

12
assets/js/src/newsletter_editor/widgets/ImageAndTextWidgetView.js
View File

@ -13,15 +13,15 @@ ImageAndTextTemplateWidgetView = EditorApplication.module('blocks.base').WidgetV
orientation: 'horizontal',
blocks: [
{
type: 'image',
type: 'image'
},
{
type: 'text',
text: 'Some random text',
},
],
text: 'Some random text'
}
]
}, {parse: true});
},
}
}
},
}
});

2
assets/js/src/settings/tabs.js
View File

@ -17,7 +17,7 @@ define(
routes: {
'': 'sendingMethodGroup', // the default tab is currently mta, needs its own method
'mta(/:group)': 'sendingMethodGroup',
'(:tab)': 'tabs',
'(:tab)': 'tabs'
},
sendingMethodGroup: function(group) {
// display mta tab