releasing 3.3.6

[MAILPOET-1266]

.circleci/apache/mailpoet.loc.conf

@@ -1,6 +1,4 @@
-Listen 8080
+<VirtualHost *:80>
-
-<VirtualHost *:8080>
   UseCanonicalName Off
   ServerName mailpoet.loc
   DocumentRoot /home/circleci/mailpoet/wordpress
@@ -8,6 +6,9 @@ Listen 8080
   LogLevel notice
 
   <Directory /home/circleci/mailpoet/wordpress>
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    RewriteEngine On
     Require all granted
   </Directory>
 </VirtualHost>

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  qa_js_php5:
+  qa_js_security_php5:
     working_directory: /home/circleci/mailpoet
     docker:
       - image: circleci/php:5.6.30-apache-browsers
@@ -38,6 +38,10 @@ jobs:
           command: |
             mkdir test-results/mocha
             ./do t:j test-results/mocha/junit.xml
+      - run:
+          name: "Composer security check"
+          command: |
+            ./do s:composer
       - run:
           name: "PHP Unit tests"
           command: |
@@ -81,6 +85,7 @@ jobs:
               curl -sS https://getcomposer.org/installer | php
               php composer.phar install
               ./do install
+              ./do compile:all --env production
       - save_cache:
           key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
           paths:
@@ -94,9 +99,52 @@ jobs:
           command: |
               docker-compose run codeception --steps --debug -vvv --html --xml
       - store_artifacts:
-          path: ~/mailpoet/tests/acceptance-tests/_output
+          path: tests/_output
       - store_test_results:
-          path: ~/mailpoet/tests/acceptance-tests/_output
+          path: tests/_output
+  acceptance_tests_multisite:
+      working_directory: /home/circleci/mailpoet
+      machine: true
+      steps:
+        - checkout
+        - run:
+            name: "Set up virtual host"
+            command: echo 127.0.0.1 mailpoet.loc | sudo tee -a /etc/hosts
+        - restore_cache:
+            key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+        - restore_cache:
+            key: npm-{{ checksum "package.json" }}
+        - run:
+            name: "Set up test environment"
+            command: |
+                sudo apt-get update
+                sudo apt-get install circleci-php-5.6.23
+                sudo rm /usr/bin/php
+                sudo ln -s /opt/circleci/php/5.6.23/bin/php /usr/bin/php
+                # Install NodeJS+NPM
+                curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+                sudo apt-get install nodejs build-essential
+                # install plugin dependencies
+                curl -sS https://getcomposer.org/installer | php
+                php composer.phar install
+                ./do install
+                ./do compile:all --env production
+        - save_cache:
+            key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+            paths:
+              - vendor
+        - save_cache:
+            key: npm-{{ checksum "package.json" }}
+            paths:
+              - node_modules
+        - run:
+            name: Run acceptance tests
+            command: |
+                docker-compose run -e MULTISITE=1 codeception --steps --debug -vvv --html --xml
+        - store_artifacts:
+            path: tests/_output
+        - store_test_results:
+            path: tests/_output
   php7:
     working_directory: /home/circleci/mailpoet
     docker:
@@ -119,7 +167,38 @@ jobs:
       - run:
           name: "PHP Unit tests"
           command: |
-            WP_TEST_PATH="/home/circleci/mailpoet/wordpress" ./do t:u --xml
+            ./do t:u --xml
+      - store_test_results:
+          path: tests/_output
+      - store_artifacts:
+          path: tests/_output
+          destination: codeception
+      - store_artifacts:
+          path: /tmp/fake-mailer/
+          destination: fake-mailer
+  php7_multisite:
+    working_directory: /home/circleci/mailpoet
+    docker:
+      - image: circleci/php:7.1-apache-browsers
+      - image: circleci/mysql:5.7
+    environment:
+      TZ: /usr/share/zoneinfo/Etc/UTC
+    steps:
+      - checkout
+      - run:
+          name: "Set up virtual host"
+          command: echo 127.0.0.1 mailpoet.loc | sudo tee -a /etc/hosts
+      - restore_cache:
+          key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+      - restore_cache:
+          key: npm-{{ checksum "package.json" }}
+      - run:
+          name: "Set up test environment"
+          command: source ./.circleci/setup.bash && setup php7_multisite
+      - run:
+          name: "PHP Unit tests"
+          command: |
+            ./do t:multisite-unit --xml
       - store_test_results:
           path: tests/_output
       - store_artifacts:
@@ -132,6 +211,8 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - qa_js_php5
+      - qa_js_security_php5
       - php7
+      - php7_multisite
       - acceptance_tests
+      - acceptance_tests_multisite

.circleci/setup.bash

@@ -2,11 +2,16 @@
 
 function setup {
 	local version=$1
+	local wp_cli_wordpress_path="--path=wordpress"
+	local wp_cli_allow_root="--allow-root"
+
 	# install PHP dependencies for WordPress
-	if [[ $version == "php7" ]]; then
+	if [[ $version == "php7" ]] || [[ $version == "php7_multisite" ]]; then
-		echo "deb http://packages.dotdeb.org jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list
+		echo "deb http://dotdeb.mirror.iphh.net/ jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list
-		echo "deb-src http://packages.dotdeb.org jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list
+		echo "deb-src http://dotdeb.mirror.iphh.net/ jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list
-		wget -qO - http://www.dotdeb.org/dotdeb.gpg | sudo apt-key add -
+		wget -qO - https://mirror.applebred.net/dotdeb.key | sudo apt-key add -
+		# ref: https://github.com/docker-library/php/pull/542
+		sudo rm /etc/apt/preferences.d/no-debian-php
 		sudo apt-get update
 		sudo apt-get install mysql-client php7.0-mysql zlib1g-dev
 		sudo docker-php-ext-install mysqli pdo pdo_mysql zip
@@ -15,34 +20,66 @@ function setup {
 		sudo apt-get install mysql-client php5-mysql zlib1g-dev
 		sudo docker-php-ext-install mysql mysqli pdo pdo_mysql zip
 	fi
+
 	# Add a fake sendmail mailer
 	sudo cp ./.circleci/fake-sendmail.php /usr/local/bin/
+
 	# configure Apache
 	sudo cp ./.circleci/mailpoet_php.ini /usr/local/etc/php/conf.d/
 	sudo cp ./.circleci/apache/mailpoet.loc.conf /etc/apache2/sites-available
+	sudo a2dissite 000-default.conf
 	sudo a2ensite mailpoet.loc
 	sudo a2enmod rewrite
 	sudo service apache2 restart
+
 	# Install NodeJS+NPM
 	curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
 	sudo apt-get install nodejs build-essential
+
 	# install plugin dependencies
 	curl -sS https://getcomposer.org/installer | php
 	./composer.phar install
 	./do install
-	# Set up Wordpress
+
+	# Set up WordPress
 	mysql -h 127.0.0.1 -u root -e "create database wordpress"
 	curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
 	chmod +x wp-cli.phar
-	./wp-cli.phar core download --allow-root --path=wordpress
+	sudo mv wp-cli.phar /usr/local/bin/wp
+	wp core download $wp_cli_wordpress_path $wp_cli_allow_root
+
 	# Generate `wp-config.php` file with debugging enabled
-	echo "define(\"WP_DEBUG\", true);" | ./wp-cli.phar core config --allow-root --dbname=wordpress --dbuser=root --dbhost=127.0.0.1 --path=wordpress --extra-php
+	echo "define(\"WP_DEBUG\", true);" | wp core config --dbname=wordpress --dbuser=root --dbhost=127.0.0.1 --extra-php $wp_cli_wordpress_path $wp_cli_allow_root
+
+	# Change default table prefix
+	sed -i "s/\$table_prefix = 'wp_';/\$table_prefix = 'mp_';/" ./wordpress/wp-config.php
+
 	# Install WordPress
-	./wp-cli.phar core install --allow-root --admin_name=admin --admin_password=admin --admin_email=admin@mailpoet.loc --url=http://mailpoet.loc:8080 --title=WordPress --path=wordpress
+    if [[ $version == "php7_multisite" ]]; then
+        # Configure multisite environment
+    	wp core multisite-install --admin_name=admin --admin_password=admin --admin_email=admin@mailpoet.loc --url=http://mailpoet.loc --title="WordPress MultiSite" $wp_cli_wordpress_path $wp_cli_allow_root
+    	cp ./.circleci/wordpress/.htaccess ./wordpress/
+
+    	# Add a second blog
+    	wp site create --slug=php7_multisite $wp_cli_wordpress_path $wp_cli_allow_root
+    	echo "WP_TEST_MULTISITE_SLUG=php7_multisite" >> .env
+    	echo "WP_TEST_PATH_MULTISITE=/home/circleci/mailpoet/wordpress" >> .env
+    	echo "HTTP_HOST=mailpoet.loc" >> .env
+
+    	# Add a third dummy blog
+        wp site create --slug=dummy_multisite $wp_cli_wordpress_path $wp_cli_allow_root
+    else
+    	wp core install --admin_name=admin --admin_password=admin --admin_email=admin@mailpoet.loc --url=http://mailpoet.loc --title="WordPress Single" $wp_cli_wordpress_path $wp_cli_allow_root
+    	echo "WP_TEST_PATH=/home/circleci/mailpoet/wordpress" >> .env
+    fi
+
 	# Softlink plugin to plugin path
 	ln -s ../../.. wordpress/wp-content/plugins/mailpoet
-	./wp-cli.phar plugin activate mailpoet --path=wordpress
+
-	# Create .env file with correct path to WP installation
+	# Activate plugin
-	# TODO: Remove this line after PR gets merged and CircleCI env variables change
+	if [[ $version == "php7_multisite" ]]; then
-	echo "WP_TEST_PATH=\"/home/circleci/mailpoet/wordpress\"" > .env
+	    wp plugin activate mailpoet --url=http://mailpoet.loc/php7_multisite/ $wp_cli_wordpress_path $wp_cli_allow_root
-}
+	else
+	    wp plugin activate mailpoet $wp_cli_wordpress_path $wp_cli_allow_root
+	fi
+}

.circleci/wordpress/.htaccess

@@ -0,0 +1,12 @@
+RewriteEngine On
+RewriteBase /
+RewriteRule ^index\.php$ - [L]
+
+RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
+
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
+RewriteRule . index.php [L]

.env.sample

@@ -1,4 +1,6 @@
 WP_TEST_PATH="/var/www/wordpress"
+WP_TEST_PATH_MULTISITE="/var/www/wordpress"
+WP_TEST_MULTISITE_SLUG=""
 WP_TEST_ENABLE_NETWORK_TESTS="true"
 WP_TEST_IMPORT_MAILCHIMP_API=""
 WP_TEST_IMPORT_MAILCHIMP_LISTS="" // (separated with comma)
@@ -16,4 +18,5 @@ WP_TEST_MAILER_SMTP_LOGIN=""
 WP_TEST_MAILER_SMTP_PASSWORD=""
 WP_SVN_USERNAME=""
 WP_SVN_PASSWORD=""
-WP_TRANSIFEX_API_TOKEN=""
+WP_TRANSIFEX_API_TOKEN=""
+HTTP_HOST="" // URL of your site (used for multisite env and equals to DOMAIN_CURRENT_SITE from wp-config.php)

.eslintrc.es5.json

@@ -8,18 +8,17 @@
     "ecmaVersion": 5
   },
   "rules": {
+    // Exceptions
+    "no-underscore-dangle": 0, // Backbone uses underscores, we cannot remove them
+    // Temporary
     "import/no-amd": 0,
-    "space-before-function-paren": 0,
     "prefer-arrow-callback": 0,
-    "key-spacing": 0,
     "radix": 0,
     "no-alert": 0,
-    "block-scoped-var": 0,
     "guard-for-in": 0,
     "no-prototype-builtins": 0,
     "no-restricted-syntax": 0,
     "no-useless-concat": 0,
-    "no-multi-spaces": 0,
     "no-nested-ternary": 0,
     "no-sequences": 0,
     "no-useless-return": 0,
@@ -27,50 +26,21 @@
     "new-cap": 0,
     "no-continue": 0,
     "no-new": 0,
-    "space-unary-ops": 0,
     "no-redeclare": 0,
     "no-console": 0,
     "no-empty": 0,
     "no-useless-escape": 0,
     "wrap-iife": 0,
-    "block-spacing": 0,
-    "computed-property-spacing": 0,
     "no-plusplus": 0,
-    "array-bracket-spacing": 0,
     "default-case": 0,
     "no-lonely-if": 0,
-    "space-before-blocks": 0,
     "no-mixed-operators": 0,
     "eqeqeq": 0,
-    "space-in-parens": 0,
     "max-len": 0,
-    "no-trailing-spaces": 0,
     "global-require": 0,
     "no-throw-literal": 0,
     "no-extra-bind": 0,
-    "one-var-declaration-per-line": 0,
-    "consistent-return": 0,
-    "no-shadow": 0,
-    "no-underscore-dangle": 0,
     "brace-style": 0,
-    "no-else-return": 0,
+    "space-infix-ops": 0
-    "no-use-before-define": 0,
-    "one-var": 0,
-    "camelcase": 0,
-    "spaced-comment": 0,
-    "padded-blocks": 0,
-    "object-curly-spacing": 0,
-    "strict": 0,
-    "vars-on-top": 0,
-    "no-var": 0,
-    "space-infix-ops": 0,
-    "no-unused-vars": 0,
-    "object-shorthand": 0,
-    "new-parens": 0,
-    "keyword-spacing": 0,
-    "eol-last": 0,
-    "dot-notation": 0,
-    "prefer-template": 0,
-    "func-names": 0
   }
 }

.eslintrc.es6.json

@@ -14,7 +14,11 @@
     "import/resolver": "webpack"
   },
   "rules": {
+    // Exceptions
     "comma-dangle": ["error", "always-multiline"],
+    "no-script-url": 0,
+    "import/extensions": 0, // we wouldn't be able to import jQuery without this line
+    // Temporary
     "import/no-amd": 0,
     "react/no-multi-comp": 0,
     "react/sort-comp": 0,
@@ -28,10 +32,8 @@
     "react/jsx-no-bind": 0,
     "react/no-array-index-key": 0,
     "react/self-closing-comp": 0,
-    "react/jsx-tag-spacing": 0,
     "react/jsx-closing-bracket-location": 0,
     "react/no-string-refs": 0,
-    "react/jsx-curly-spacing": 0,
     "react/no-did-mount-set-state": 0,
     "react/prefer-stateless-function": 0,
     "jsx-a11y/label-has-for": 0,
@@ -39,44 +41,8 @@
     "jsx-a11y/alt-text": 0,
     "func-names": 0,
     "object-shorthand": 0,
-    "no-bitwise": 0,
-    "arrow-body-style": 0,
-    "prefer-template": 0,
-    "keyword-spacing": 0,
-    "default-case": 0,
-    "array-callback-return": 0,
-    "consistent-return": 0,
-    "import/extensions": 0,
-    "import/no-extraneous-dependencies": 0,
-    "camelcase": 0,
-    "template-curly-spacing": 0,
-    "eqeqeq": 0,
-    "no-lonely-if": 0,
     "space-unary-ops": 0,
-    "block-scoped-var": 0,
-    "no-extra-bind": 0,
-    "no-multi-spaces": 0,
-    "class-methods-use-this": 0,
-    "key-spacing": 0,
-    "space-in-parens": 0,
-    "no-case-declarations": 0,
-    "array-bracket-spacing": 0,
-    "no-else-return": 0,
-    "max-len": 0,
-    "no-useless-concat": 0,
-    "no-sequences": 0,
-    "no-extra-boolean-cast": 0,
-    "dot-notation": 0,
-    "no-shadow": 0,
-    "one-var": 0,
-    "no-alert": 0,
-    "one-var-declaration-per-line": 0,
-    "no-script-url": 0,
-    "wrap-iife": 0,
-    "vars-on-top": 0,
     "space-infix-ops": 0,
-    "no-irregular-whitespace": 0,
+    "no-irregular-whitespace": 0
-    "padded-blocks": 0,
-    "no-underscore-dangle": 0
   }
 }

.eslintrc.tests.json

@@ -8,25 +8,9 @@
     "ecmaVersion": 6
   },
   "rules": {
-    "import/no-amd": 0,
+    // Exceptions
-    "one-var": 0,
-    "no-whitespace-before-property": 0,
-    "global-require": 0,
-    "keyword-spacing": 0,
-    "no-bitwise": 0,
-    "no-spaced-func": 0,
-    "func-call-spacing": 0,
-    "max-len": 0,
-    "space-unary-ops": 0,
-    "no-unused-vars": 0,
-    "no-underscore-dangle": 0,
-    "no-shadow": 0,
-    "padded-blocks": 0,
-    "vars-on-top": 0,
-    "space-before-blocks": 0,
-    "object-curly-spacing": 0,
-    "one-var-declaration-per-line": 0,
     "func-names": 0,
-    "space-before-function-paren": 0
+    // Temporary
+    "no-underscore-dangle": 0
   }
 }

.gitignore

@@ -2,6 +2,7 @@
 TODO
 composer.phar
 /vendor
+/vendor_backup
 tests/_output/*
 tests/_support/_generated/*
 node_modules
@@ -20,4 +21,5 @@ assets/js/*.json
 .vagrant
 lang
 .mp_svn
-/nbproject/
+/nbproject/
+tests/_data/acceptanceGenerated.sql

RoboFile.php

@@ -90,6 +90,7 @@ class RoboFile extends \Robo\Tasks {
 
     $css_files = array(
       'assets/css/src/admin.styl',
+      'assets/css/src/admin-global.styl',
       'assets/css/src/newsletter_editor/newsletter_editor.styl',
       'assets/css/src/public.styl',
       'assets/css/src/rtl.styl',
@@ -152,17 +153,30 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec('./tasks/transifex_init.sh');
   }
 
-  function testUnit($opts=['file' => null, 'xml' => false]) {
+  function testUnit($opts=['file' => null, 'xml' => false, 'multisite' => false]) {
     $this->loadEnv();
 
-    $command = 'vendor/bin/codecept run unit -c codeception.unit.yml -f '.(($opts['file']) ? $opts['file'] : '');
+    $command = 'vendor/bin/codecept run unit -c codeception.unit.yml';
+
+    if($opts['multisite']) {
+      $command = 'MULTISITE=true ' . $command;
+    }
+
+    if($opts['file']) {
+      $command .= ' -f ' . $opts['file'];
+    }
 
     if($opts['xml']) {
       $command .= ' --xml';
     }
+
     return $this->_exec($command);
   }
 
+  function testMultisiteUnit($opts=['file' => null, 'xml' => false, 'multisite' => true]) {
+    return $this->testUnit($opts);
+  }
+
   function testCoverage($opts=['file' => null, 'xml' => false]) {
     $this->loadEnv();
     $command = join(' ', array(
@@ -197,6 +211,10 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec($command);
   }
 
+  function securityComposer() {
+    return $this->_exec('vendor/bin/security-checker security:check --format=simple');
+  }
+
   function testDebug($opts=['file' => null, 'xml' => false]) {
     $this->loadEnv();
     $this->_exec('vendor/bin/codecept build -c codeception.unit.yml');
@@ -213,6 +231,14 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec('COMPOSE_HTTP_TIMEOUT=200 docker-compose run codeception --steps --debug -vvv');
   }
 
+  function testAcceptanceMultisite() {
+    return $this->_exec('COMPOSE_HTTP_TIMEOUT=200 docker-compose run -e MULTISITE=1 codeception --steps --debug -vvv');
+  }
+
+  function deleteDocker() {
+    return $this->_exec('docker-compose down -v --remove-orphans --rmi all');
+  }
+
   function testFailed() {
     $this->loadEnv();
     $this->_exec('vendor/bin/codecept build -c codeception.unit.yml');
@@ -288,15 +314,16 @@ class RoboFile extends \Robo\Tasks {
   }
 
   function svnPublish($opts = ['force' => false]) {
-    $this->loadWPFunctions();
+    $this->loadEnv();
 
     $svn_dir = ".mp_svn";
-    $plugin_data = get_plugin_data('mailpoet.php', false, false);
+    $plugin_version = $this->getPluginVersion('mailpoet.php');
-    $plugin_version = $plugin_data['Version'];
+    $plugin_dist_name = 'mailpoet';
-    $plugin_dist_name = sanitize_title_with_dashes($plugin_data['Name']);
-    $plugin_dist_name = explode('-', $plugin_dist_name);
-    $plugin_dist_name = $plugin_dist_name[0];
     $plugin_dist_file = $plugin_dist_name . '.zip';
+
+    if(!$plugin_version) {
+      throw new \Exception('Could not parse plugin version, check the plugin header');
+    }
     $this->say('Publishing version: ' . $plugin_version);
 
     // Sanity checks
@@ -415,13 +442,9 @@ class RoboFile extends \Robo\Tasks {
     $dotenv->load();
   }
 
-  protected function loadWPFunctions() {
+  protected function getPluginVersion($file) {
-    $this->loadEnv();
+    $data = file_get_contents($file);
-    define('ABSPATH', getenv('WP_TEST_PATH') . '/');
+    preg_match('/^[ \t*]*Version:(.*)$/mi', $data, $m);
-    define('WPINC', 'wp-includes');
+    return !empty($m[1]) ? trim($m[1]) : false;
-    require_once(ABSPATH . WPINC . '/functions.php');
-    require_once(ABSPATH . WPINC . '/formatting.php');
-    require_once(ABSPATH . WPINC . '/plugin.php');
-    require_once(ABSPATH . 'wp-admin/includes/plugin.php');
   }
 }

assets/css/src/admin-global.styl

@@ -0,0 +1,18 @@
+@import 'nib'
+
+@require 'icons'
+
+/*
+Style for Members plugin
+*/
+
+.members-tab-title
+  .mailpoet-icon-logo
+    vertical-align: middle;
+    height: 20px;
+    width: 20px;
+    font-size: 20px;
+    margin-right: 3px;
+
+#wpbody
+  padding-bottom: 20px;

assets/css/src/admin.styl

@@ -27,3 +27,5 @@
 @require 'pages_custom'
 
 @require 'mp2migrator'
+
+@require '../../../node_modules/react-confirm-alert/src/react-confirm-alert.css'

assets/css/src/icons.styl

@@ -0,0 +1,24 @@
+icon-font-path ?= "../fonts"
+
+@font-face
+  font-family 'mailpoet'
+  src url(icon-font-path + '/mailpoet.ttf?mx0b6n') format('truetype'), url(icon-font-path + '/mailpoet.woff?mx0b6n') format('woff'), url(icon-font-path + '/mailpoet.svg?mx0b6n#mailpoet') format('svg')
+  font-weight normal
+  font-style normal
+
+[class^="mailpoet-icon-"], [class*=" mailpoet-icon-"]
+  font-family 'mailpoet' !important
+  speak none
+  font-style normal
+  font-weight normal
+  font-variant normal
+  text-transform none
+  line-height 1
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing antialiased
+  -moz-osx-font-smoothing grayscale
+
+.mailpoet-icon-logo
+  &:before
+    content "\e900"

assets/css/src/newsletter_editor/components/blockTools.styl

@@ -163,6 +163,7 @@ $master-column-tool-width = 24px
 
 .mailpoet_delete_block_confirm
   color: $warning-text-color
+  float: right
 
   &:hover
     color: $warning-text-color
@@ -170,6 +171,7 @@ $master-column-tool-width = 24px
 
 .mailpoet_delete_block_cancel
   color: $warning-alternate-text-color
+  float: right
 
   &:hover
     color: $warning-alternate-text-color

assets/css/src/newsletter_editor/components/resize.styl

@@ -48,3 +48,41 @@ $resize-handle-z-index = 2
 
   .mailpoet_resize_handle
     display: inline-block
+
+
+.mailpoet_image_resize_handle_container
+  position: absolute
+  bottom: 0
+  right: 0
+  width: 20px
+  height: 20px
+
+.mailpoet_image_resize_handle
+  position: relative
+  background: $resize-handle-background-color
+  border-radius(3px)
+  display: inline-block
+  width: 20px
+  height: 20px
+  cursor: nwse-resize
+  z-index: $resize-handle-z-index
+
+  .mailpoet_image_resize_handle_text,
+  .mailpoet_image_resize_handle_icon
+    pointer-events: none
+
+.mailpoet_image_resize_handle_icon
+  position: absolute
+  top: 0
+  right: 0
+
+  & > svg
+    width: 100%
+    height: 100%
+    fill: $resize-handle-font-color
+
+.mailpoet_block.mailpoet_image_resize_active > .mailpoet_block_highlight
+  border: 1px dashed $resize-active-color
+
+  .mailpoet_image_resize_handle
+    display: inline-block

assets/css/src/newsletter_editor/contentBlocks/base.styl

@@ -21,6 +21,8 @@ $block-text-line-height = $text-line-height
     left: 0
     pointer-events: none
     border: 1px solid $transparent-color
+    -webkit-transition: 0.3s;
+    transition: 0.3s;
 
   &:hover > .mailpoet_block_highlight
     border: 1px dashed $block-hover-highlight-color

assets/css/src/newsletter_editor/contentBlocks/image.styl

@@ -3,14 +3,19 @@
   img
     vertical-align: bottom
     max-width: 100%
-    width: auto
     height: auto
 
   &.mailpoet_full_image
     padding-left: 0
     padding-right: 0
+    margin: auto
     margin-bottom: 0
 
-  .mailpoet_content a:hover
+  .mailpoet_content 
-    cursor: all-scroll
+    margin: auto
+    max-width: 100%
+    min-width: 36px
+    
+    a:hover
+      cursor: all-scroll
 

assets/css/src/newsletter_editor/mixins/transitions.styl

@@ -2,7 +2,7 @@ animation-slide-open-downwards($max-height = 2000px)
   transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
   max-height: $max-height
   opacity: 1
-  overflow-y: hidden
+  overflow-y: inherit
 
   &.mailpoet_closed
     max-height: 0px

assets/css/src/pages_custom.styl

@@ -33,3 +33,6 @@ Custom styles for MailPoet pages.
 
   p.top-space-triple
     margin-top: 3em
+
+  p.mailpoet-top-text
+    margin-right: 0

assets/css/src/settings.styl

@@ -62,6 +62,15 @@
     margin-bottom: 2em
     margin-top: 2em
 
+  .sending-free-plan-button
+    background: #FF5301
+    border-color: #e64c03
+    text-shadow: 0 -1px 1px #e64c03
+    box-shadow: 0 1px 0 #e64c03
+    margin: 10px 0
+    strong
+      text-transform: uppercase
+
   .mailpoet_success_item::before
     content '✔ '
 

assets/fonts/mailpoet.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="mailpoet" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="0" d="" />
+<glyph unicode="&#xe900;" glyph-name="optimised" horiz-adv-x="972" d="M230.188 949.695c-21.982-3.361-41.376-14.741-48.618-28.188l-5.948-11.637 0.517-265.588c0.776-263.779 0.776-265.847 6.206-273.088 11.12-15.258 40.601-22.24 68.79-16.551 16.551 3.621 25.861 9.827 32.584 21.723 3.879 7.499 4.397 23.791 5.689 185.161l1.293 176.628 60.514-161.111c33.102-88.702 63.875-168.612 68.013-177.404 13.707-29.481 35.687-41.376 72.151-39.049 21.206 1.293 39.308 9.827 47.584 22.499 3.361 5.172 35.947 91.806 72.41 192.662s67.237 185.42 68.53 187.49c1.551 2.587 2.587-69.307 2.587-185.937v-190.335l5.948-11.379c8.533-16.809 20.172-21.982 49.652-21.982 27.929 0.259 39.825 4.914 49.911 20.172l6.982 10.603v530.401l-5.689 9.31c-12.671 20.43-50.17 31.033-91.806 25.601-34.394-4.138-53.79-16.292-66.72-41.118-2.587-5.172-35.947-101.89-73.961-214.902s-69.824-206.367-70.6-207.403c-1.034-1.034-32.326 86.115-69.824 193.954-37.757 107.581-71.892 205.075-76.030 216.453-10.086 26.118-25.601 42.929-45.514 48.877-17.326 5.172-46.807 6.982-64.652 4.138zM54.854 243.443c-20.172-3.879-43.963-19.136-51.204-33.619-6.206-11.379-4.914-32.843 2.587-47.841 23.533-46.807 71.634-86.892 126.717-104.736 17.068-5.689 23.274-5.948 120.252-7.499 97.235-1.551 102.926-1.81 116.373-7.241 29.739-11.896 51.204-35.687 61.807-68.013 3.621-11.12 13.964-21.206 25.861-25.344 4.914-1.551 18.361-2.844 29.739-2.844 16.809 0 23.533 1.293 32.584 5.689 11.896 6.206 13.964 9.31 26.895 38.791 11.896 27.671 39.567 49.652 70.858 56.117 8.533 1.81 47.067 2.844 100.856 2.844 99.563 0 113.786 2.068 151.801 20.689 49.652 24.567 96.978 77.84 101.373 113.529 3.104 26.118-17.326 49.394-51.204 58.187-25.601 6.465-41.635-0.517-54.825-24.050-11.12-19.655-29.998-38.015-47.841-46.29l-14.741-6.982-99.563-1.551c-90.77-1.293-101.373-2.068-120.252-6.982-27.154-7.499-58.444-23.016-80.427-40.084l-17.844-13.964-16.809 13.964c-20.689 16.809-51.462 32.584-78.875 39.825-19.136 5.172-28.705 5.948-120.252 7.241l-99.563 1.551-15.775 7.241c-18.102 8.533-32.584 21.982-48.36 45.773-16.034 24.567-26.895 29.998-50.17 25.601z" />
+</font></defs></svg>

assets/js/src/admin.js

@@ -1,10 +1,10 @@
 define('admin', [
   'jquery'
 ],
-  function(jQuery) {
+  function admin(jQuery) {
-    jQuery(function($) {
+    jQuery(function adminDomReady($) {
       // dom ready
-      $(function() {
+      $(function domReady() {
 
       });
     });

assets/js/src/ajax.js

@@ -2,17 +2,16 @@ function requestFailed(errorMessage, xhr) {
   if (xhr.responseJSON) {
     return xhr.responseJSON;
   }
-  var message = errorMessage.replace('%d', xhr.status);
   return {
     errors: [
       {
-        message: message
+        message: errorMessage.replace('%d', xhr.status)
       }
     ]
   };
 }
 
-define('ajax', ['mailpoet', 'jquery', 'underscore'], function(mp, jQuery, _) {
+define('ajax', ['mailpoet', 'jquery', 'underscore'], function ajax(mp, jQuery, _) {
   var MailPoet = mp;
 
   MailPoet.Ajax = {
@@ -26,24 +25,24 @@ define('ajax', ['mailpoet', 'jquery', 'underscore'], function(mp, jQuery, _) {
       token: null,
       data: {}
     },
-    post: function(options) {
+    post: function post(options) {
       return this.request('post', options);
     },
-    init: function(options) {
+    init: function init(options) {
       // merge options
       this.options = jQuery.extend({}, this.defaults, options);
 
       // set default url
-      if(this.options.url === null) {
+      if (this.options.url === null) {
         this.options.url = window.ajaxurl;
       }
 
       // set default token
-      if(this.options.token === null) {
+      if (this.options.token === null) {
         this.options.token = window.mailpoet_token;
       }
     },
-    getParams: function() {
+    getParams: function getParams() {
       return {
         action: 'mailpoet',
         api_version: this.options.api_version,
@@ -53,27 +52,29 @@ define('ajax', ['mailpoet', 'jquery', 'underscore'], function(mp, jQuery, _) {
         data: this.options.data || {}
       };
     },
-    request: function(method, options) {
+    request: function request(method, options) {
-        // set options
+      var params;
+      var deferred;
+      // set options
       this.init(options);
 
-        // set request params
+      // set request params
-      var params = this.getParams();
+      params = this.getParams();
 
-        // remove null values from the data object
+      // remove null values from the data object
       if (_.isObject(params.data)) {
-        params.data = _.pick(params.data, function(value) {
+        params.data = _.pick(params.data, function isNotNull(value) {
           return (value !== null);
         });
       }
 
-        // ajax request
+      // ajax request
-      var deferred = jQuery.post(
+      deferred = jQuery.post(
           this.options.url,
           params,
           null,
           'json'
-        ).then(function(data) {
+        ).then(function resultHandler(data) {
           return data;
         }, _.partial(requestFailed, MailPoet.I18n.t('ajaxFailedErrorMessage')));
 

assets/js/src/analytics_event.js

@@ -17,7 +17,7 @@
  */
 var eventsCache = [];
 
-function track(name, data){
+function track(name, data) {
   if (typeof window.mixpanel.track !== 'function') {
     window.mixpanel.init(window.mixpanelTrackingId);
   }
@@ -31,12 +31,12 @@ function exportMixpanel(mp) {
   if (window.mailpoet_analytics_enabled) {
     MailPoet.trackEvent = track;
   } else {
-    MailPoet.trackEvent = function () {};
+    MailPoet.trackEvent = function emptyFunction() {};
   }
 }
 
 function trackCachedEvents() {
-  eventsCache.map(function (event) {
+  eventsCache.map(function trackIfEnabled(event) {
     if (window.mailpoet_analytics_enabled || event.forced) {
       window.mixpanel.track(event.name, event.data);
     }
@@ -53,7 +53,7 @@ function cacheEvent(forced, name, data) {
 
 define(
   ['mailpoet', 'underscore'],
-  function(mp, _) {
+  function analyticsEvent(mp, _) {
     var MailPoet = mp;
 
     function initializeMixpanelWhenLoaded() {

assets/js/src/date.js

@@ -3,7 +3,7 @@ define('date',
     'mailpoet',
     'jquery',
     'moment'
-  ], function(
+  ], function ( // eslint-disable-line func-names
     mp,
     jQuery,
     Moment
@@ -19,7 +19,7 @@ define('date',
         offset: 0,
         format: 'F, d Y H:i:s'
       },
-      init: function (opts) {
+      init: function init(opts) {
         var options = opts || {};
 
       // set UTC offset
@@ -41,37 +41,43 @@ define('date',
 
         return this;
       },
-      format: function(date, opts) {
+      format: function format(date, opts) {
         var options = opts || {};
+        var momentDate;
         this.init(options);
 
-        var momentDate = Moment(date, this.convertFormat(options.parseFormat));
+        momentDate = Moment(date, this.convertFormat(options.parseFormat));
         if (options.offset === 0) momentDate = momentDate.utc();
         return momentDate.format(this.convertFormat(this.options.format));
       },
-      toDate: function(date, opts) {
+      toDate: function toDate(date, opts) {
         var options = opts || {};
         this.init(options);
 
         return Moment(date, this.convertFormat(options.parseFormat)).toDate();
       },
-      short: function(date) {
+      short: function short(date) {
         return this.format(date, {
           format: 'F, j Y'
         });
       },
-      full: function(date) {
+      full: function full(date) {
         return this.format(date, {
           format: 'F, j Y H:i:s'
         });
       },
-      time: function(date) {
+      time: function time(date) {
         return this.format(date, {
           format: 'H:i:s'
         });
       },
-      convertFormat: function(format) {
+      convertFormat: function convertFormat(format) {
-        var format_mappings = {
+        var replacements;
+        var convertedFormat;
+        var escapeToken;
+        var index;
+        var token;
+        var formatMappings = {
           date: {
             d: 'DD',
             D: 'ddd',
@@ -140,15 +146,14 @@ define('date',
 
         if (!format || format.length <= 0) return format;
 
-        var replacements = format_mappings['date'];
+        replacements = formatMappings.date;
+        convertedFormat = [];
+        escapeToken = false;
 
-        var convertedFormat = [];
+        for (index = 0, token = ''; format.charAt(index); index += 1) {
-        var escapeToken = false;
-
-        for(var index = 0, token = ''; format.charAt(index); index += 1){
           token = format.charAt(index);
           if (escapeToken === true) {
-            convertedFormat.push('['+token+']');
+            convertedFormat.push('[' + token + ']');
             escapeToken = false;
           } else {
             if (token === '\\') {
@@ -158,7 +163,7 @@ define('date',
             } else if (replacements[token] !== undefined) {
               convertedFormat.push(replacements[token]);
             } else {
-              convertedFormat.push('['+token+']');
+              convertedFormat.push('[' + token + ']');
             }
           }
         }

assets/js/src/form/fields/checkbox.jsx

@@ -16,25 +16,23 @@ define([
 
       // isChecked will be true only if the value is "1"
       // it will be false in case value is "0" or empty
-      const isChecked = !!(~~(this.props.item[this.props.field.name]));
+      const isChecked = !!(Number(this.props.item[this.props.field.name]));
       const options = Object.keys(this.props.field.values).map(
-        (value, index) => {
+        (value, index) => (
-          return (
+          <p key={`checkbox-${index}`}>
-            <p key={ 'checkbox-' + index }>
+            <label>
-              <label>
+              <input
-                <input
+                ref="checkbox"
-                  ref="checkbox"
+                type="checkbox"
-                  type="checkbox"
+                value="1"
-                  value="1"
+                checked={isChecked}
-                  checked={ isChecked }
+                onChange={this.onValueChange}
-                  onChange={ this.onValueChange }
+                name={this.props.field.name}
-                  name={ this.props.field.name }
                 />
-                { this.props.field.values[value] }
+              { this.props.field.values[value] }
-              </label>
+            </label>
-            </p>
+          </p>
-          );
+          )
-        }
       );
 
       return (

assets/js/src/form/fields/date.jsx

@@ -12,7 +12,7 @@ define([
 
       if (this.props.placeholder !== undefined) {
         years.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
@@ -20,16 +20,16 @@ define([
       for (let i = currentYear; i >= currentYear - yearsRange; i -= 1) {
         years.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
          >{ i }</option>
         ));
       }
       return (
         <select
-          name={ `${this.props.name}[year]` }
+          name={`${this.props.name}[year]`}
-          value={ this.props.year }
+          value={this.props.year}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { years }
         </select>
@@ -43,23 +43,23 @@ define([
 
       if (this.props.placeholder !== undefined) {
         months.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
       for (let i = 1; i <= 12; i += 1) {
         months.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
          >{ this.props.monthNames[i - 1] }</option>
         ));
       }
       return (
         <select
-          name={ `${this.props.name}[month]` }
+          name={`${this.props.name}[month]`}
-          value={ this.props.month }
+          value={this.props.month}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { months }
         </select>
@@ -73,24 +73,24 @@ define([
 
       if (this.props.placeholder !== undefined) {
         days.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
       for (let i = 1; i <= 31; i += 1) {
         days.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
           >{ i }</option>
         ));
       }
 
       return (
         <select
-          name={ `${this.props.name}[day]` }
+          name={`${this.props.name}[day]`}
-          value={ this.props.day }
+          value={this.props.day}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { days }
         </select>
@@ -123,7 +123,7 @@ define([
         ? this.props.item[this.props.field.name].trim()
         : '';
 
-      if(value === '') {
+      if (value === '') {
         return;
       }
 
@@ -140,7 +140,7 @@ define([
 
       let value;
 
-      switch(dateType) {
+      switch (dateType) {
         case 'year_month_day':
           value = {
             year: this.state.year,
@@ -167,6 +167,11 @@ define([
             year: this.state.year,
           };
           break;
+        default:
+          value = {
+            value: 'invalid type',
+          };
+          break;
       }
 
       return value;
@@ -181,7 +186,7 @@ define([
         field = matches[1];
         property = matches[2];
 
-        const value = ~~(e.target.value);
+        const value = Number(e.target.value);
 
         this.setState({
           [`${property}`]: value,
@@ -202,37 +207,40 @@ define([
       const dateSelects = dateFormats[dateType][0].split('/');
 
       const fields = dateSelects.map((type) => {
-        switch(type) {
+        switch (type) {
           case 'YYYY':
             return (<FormFieldDateYear
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'year' }
+              ref={'year'}
-              key={ 'year' }
+              key={'year'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              year={ this.state.year }
+              year={this.state.year}
-              placeholder={ this.props.field.year_placeholder }
+              placeholder={this.props.field.year_placeholder}
             />);
 
           case 'MM':
             return (<FormFieldDateMonth
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'month' }
+              ref={'month'}
-              key={ 'month' }
+              key={'month'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              month={ this.state.month }
+              month={this.state.month}
-              monthNames={ monthNames }
+              monthNames={monthNames}
-              placeholder={ this.props.field.month_placeholder }
+              placeholder={this.props.field.month_placeholder}
             />);
 
           case 'DD':
             return (<FormFieldDateDay
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'day' }
+              ref={'day'}
-              key={ 'day' }
+              key={'day'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              day={ this.state.day }
+              day={this.state.day}
-              placeholder={ this.props.field.day_placeholder }
+              placeholder={this.props.field.day_placeholder}
             />);
+
+          default:
+            return <div>Invalid date type</div>;
         }
       });
 

assets/js/src/form/fields/field.jsx

@@ -23,7 +23,7 @@ define([
   const FormField = React.createClass({
     renderField: function (data, inline = false) {
       let description = false;
-      if(data.field.description) {
+      if (data.field.description) {
         description = (
           <p className="description">{ data.field.description }</p>
         );
@@ -32,11 +32,11 @@ define([
       let field = false;
       let dataField = data.field;
 
-      if(data.field['field'] !== undefined) {
+      if (data.field.field !== undefined) {
         dataField = jQuery.merge(dataField, data.field.field);
       }
 
-      switch(dataField.type) {
+      switch (dataField.type) {
         case 'text':
           field = (<FormFieldText {...data} />);
           break;
@@ -68,52 +68,53 @@ define([
         case 'reactComponent':
           field = (<data.field.component {...data} />);
           break;
+
+        default:
+          field = 'invalid';
+          break;
       }
 
-      if(inline === true) {
+      if (inline === true) {
         return (
-          <span key={ 'field-' + (data.index || 0) }>
+          <span key={`field-${data.index || 0}`}>
             { field }
             { description }
           </span>
         );
-      } else {
-        return (
-          <div key={ 'field-' + (data.index || 0) }>
-            { field }
-            { description }
-          </div>
-        );
       }
+      return (
+        <div key={`field-${data.index || 0}`}>
+          { field }
+          { description }
+        </div>
+      );
     },
     render: function () {
       let field = false;
 
-      if(this.props.field['fields'] !== undefined) {
+      if (this.props.field.fields !== undefined) {
-        field = this.props.field.fields.map((subfield, index) => {
+        field = this.props.field.fields.map((subfield, index) => this.renderField({
-          return this.renderField({
+          index: index,
-            index: index,
+          field: subfield,
-            field: subfield,
+          item: this.props.item,
-            item: this.props.item,
+          onValueChange: this.props.onValueChange || false,
-            onValueChange: this.props.onValueChange || false,
+        }));
-          });
-        });
       } else {
         field = this.renderField(this.props);
       }
 
       let tip = false;
-      if(this.props.field.tip) {
+      if (this.props.field.tip) {
         tip = (
           <p className="description">{ this.props.field.tip }</p>
         );
       }
 
       return (
-        <tr>
+        <tr className={`form-field-row-${this.props.field.name}`}>
           <th scope="row">
             <label
-              htmlFor={ 'field_'+this.props.field.name }
+              htmlFor={`field_${this.props.field.name}`}
             >
               { this.props.field.label }
               { tip }

assets/js/src/form/fields/radio.jsx

@@ -10,23 +10,21 @@ define([
         return false;
       }
 
-      const selected_value = this.props.item[this.props.field.name];
+      const selectedValue = this.props.item[this.props.field.name];
       const options = Object.keys(this.props.field.values).map(
-        (value, index) => {
+        (value, index) => (
-          return (
+          <p key={`radio-${index}`}>
-            <p key={ 'radio-' + index }>
+            <label>
-              <label>
+              <input
-                <input
+                type="radio"
-                  type="radio"
+                checked={selectedValue === value}
-                  checked={ selected_value === value }
+                value={value}
-                  value={ value }
+                onChange={this.props.onValueChange}
-                  onChange={ this.props.onValueChange }
+                name={this.props.field.name} />
-                  name={ this.props.field.name } />
+              { this.props.field.values[value] }
-                { this.props.field.values[value] }
+            </label>
-              </label>
+          </p>
-            </p>
+          )
-          );
-        }
       );
 
       return (

assets/js/src/form/fields/select.jsx

@@ -17,7 +17,7 @@ const FormFieldSelect = React.createClass({
       );
     }
 
-    if (this.props.field['filter'] !== undefined) {
+    if (this.props.field.filter !== undefined) {
       filter = this.props.field.filter;
     }
 
@@ -41,29 +41,27 @@ const FormFieldSelect = React.createClass({
       keys = Object.keys(this.props.field.values);
     }
 
-    const options = keys.map(
+    const options = keys
-      (value, index) => {
+      .filter((value) => {
-
+        if (filter === false) return true;
-        if (filter !== false && filter(this.props.item, value) === false) {
+        return filter(this.props.item, value);
-          return;
+      })
-        }
+      .map(
-
+        (value, index) => (
-        return (
           <option
-            key={ 'option-' + index }
+            key={`option-${index}`}
-            value={ value }>
+            value={value}>
             { this.props.field.values[value] }
           </option>
-        );
+          )
-      }
+      );
-    );
 
     return (
       <select
-        name={ this.props.field.name }
+        name={this.props.field.name}
-        id={ 'field_'+this.props.field.name }
+        id={`field_${this.props.field.name}`}
-        value={ this.props.item[this.props.field.name] }
+        value={this.props.item[this.props.field.name]}
-        onChange={ this.props.onValueChange }
+        onChange={this.props.onValueChange}
         {...this.props.field.validation}
       >
         {placeholder}

assets/js/src/form/fields/selection.jsx

@@ -26,47 +26,44 @@ define([
       return (this.state.select2 === true);
     },
     componentDidMount: function () {
-      if(this.allowMultipleValues()) {
+      if (this.allowMultipleValues() || this.props.field.forceSelect2) {
         this.setupSelect2();
       }
     },
     componentDidUpdate: function (prevProps) {
-      if(
+      if (
         (this.props.item !== undefined && prevProps.item !== undefined)
         && (this.props.item.id !== prevProps.item.id)
       ) {
-        jQuery('#'+this.refs.select.id)
+        jQuery(`#${this.refs.select.id}`)
           .val(this.getSelectedValues())
           .trigger('change');
       }
     },
     componentWillUnmount: function () {
-      if(this.allowMultipleValues()) {
+      if (this.allowMultipleValues() || this.props.field.forceSelect2) {
         this.destroySelect2();
       }
     },
     destroySelect2: function () {
-      if(this.isSelect2Initialized()) {
+      if (this.isSelect2Initialized()) {
-        jQuery('#'+this.refs.select.id).select2('destroy');
+        jQuery(`#${this.refs.select.id}`).select2('destroy');
       }
     },
     setupSelect2: function () {
-      if(this.isSelect2Initialized()) {
+      if (this.isSelect2Initialized()) {
         return;
       }
 
-      const select2 = jQuery('#'+this.refs.select.id).select2({
+      const select2 = jQuery(`#${this.refs.select.id}`).select2({
         width: (this.props.width || ''),
         templateResult: function (item) {
-          if(item.element && item.element.selected) {
+          if (item.element && item.element.selected) {
             return null;
-          } else {
+          } else if (item.title) {
-            if(item.title) {
+            return item.title;
-              return item.title;
-            } else {
-              return item.text;
-            }
           }
+          return item.text;
         },
       });
 
@@ -75,7 +72,7 @@ define([
         hasRemoved = true;
       });
       select2.on('select2:opening', (e) => {
-        if(hasRemoved === true) {
+        if (hasRemoved === true) {
           hasRemoved = false;
           e.preventDefault();
         }
@@ -86,14 +83,12 @@ define([
       this.setState({ select2: true });
     },
     getSelectedValues: function () {
-      if(this.props.field['selected'] !== undefined) {
+      if (this.props.field.selected !== undefined) {
-        return this.props.field['selected'](this.props.item);
+        return this.props.field.selected(this.props.item);
-      } else if(this.props.item !== undefined && this.props.field.name !== undefined) {
+      } else if (this.props.item !== undefined && this.props.field.name !== undefined) {
         if (this.allowMultipleValues()) {
           if (Array.isArray(this.props.item[this.props.field.name])) {
-            return this.props.item[this.props.field.name].map((item) => {
+            return this.props.item[this.props.field.name].map(item => item.id);
-              return item.id;
-            });
           }
         } else {
           return this.props.item[this.props.field.name];
@@ -102,11 +97,15 @@ define([
       return null;
     },
     loadCachedItems: function () {
-      if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
+      let items;
-        let items = window['mailpoet_'+this.props.field.endpoint];
+      if (typeof (window[`mailpoet_${this.props.field.endpoint}`]) !== 'undefined') {
+        items = window[`mailpoet_${this.props.field.endpoint}`];
+      } else if (this.props.field.values !== undefined) {
+        items = this.props.field.values;
+      }
 
-
+      if (Array.isArray(items)) {
-        if(this.props.field['filter'] !== undefined) {
+        if (this.props.field.filter !== undefined) {
           items = items.filter(this.props.field.filter);
         }
 
@@ -117,9 +116,9 @@ define([
     },
     handleChange: function (e) {
       let value;
-      if(this.props.onValueChange !== undefined) {
+      if (this.props.onValueChange !== undefined) {
-        if(this.props.field.multiple) {
+        if (this.props.field.multiple) {
-          value = jQuery('#'+this.refs.select.id).val();
+          value = jQuery(`#${this.refs.select.id}`).val();
         } else {
           value = e.target.value;
         }
@@ -133,19 +132,19 @@ define([
       }
     },
     getLabel: function (item) {
-      if(this.props.field['getLabel'] !== undefined) {
+      if (this.props.field.getLabel !== undefined) {
         return this.props.field.getLabel(item, this.props.item);
       }
       return item.name;
     },
     getSearchLabel: function (item) {
-      if(this.props.field['getSearchLabel'] !== undefined) {
+      if (this.props.field.getSearchLabel !== undefined) {
         return this.props.field.getSearchLabel(item, this.props.item);
       }
       return null;
     },
     getValue: function (item) {
-      if(this.props.field['getValue'] !== undefined) {
+      if (this.props.field.getValue !== undefined) {
         return this.props.field.getValue(item, this.props.item);
       }
       return item.id;
@@ -154,11 +153,18 @@ define([
     // this function may be used to transform the placeholder value into
     // desired value.
     transformChangedValue: function (value) {
-      if(typeof this.props.field['transformChangedValue'] === 'function') {
+      if (typeof this.props.field.transformChangedValue === 'function') {
         return this.props.field.transformChangedValue.call(this, value);
-      } else {
-        return value;
       }
+      return value;
+    },
+    insertEmptyOption: function () {
+      // https://select2.org/placeholders
+      // For single selects only, in order for the placeholder value to appear,
+      // we must have a blank <option> as the first option in the <select> control.
+      if (this.allowMultipleValues()) return undefined;
+      if (this.props.field.placeholder) return (<option />);
+      return undefined;
     },
     render: function () {
       const options = this.state.items.map((item, index) => {
@@ -168,9 +174,9 @@ define([
 
         return (
           <option
-            key={ 'option-'+index }
+            key={`option-${index}`}
-            value={ value }
+            value={value}
-            title={ searchLabel }
+            title={searchLabel}
           >
             { label }
           </option>
@@ -179,14 +185,17 @@ define([
 
       return (
         <select
-          id={ this.props.field.id || this.props.field.name }
+          id={this.props.field.id || this.props.field.name}
           ref="select"
           disabled={this.props.field.disabled}
-          data-placeholder={ this.props.field.placeholder }
+          data-placeholder={this.props.field.placeholder}
-          multiple={ this.props.field.multiple }
+          multiple={this.props.field.multiple}
-          defaultValue={ this.getSelectedValues() }
+          defaultValue={this.getSelectedValues()}
           {...this.props.field.validation}
-        >{ options }</select>
+        >
+          { this.insertEmptyOption() }
+          { options }
+        </select>
       );
     },
   });

assets/js/src/form/fields/text.jsx

@@ -11,21 +11,21 @@ const FormFieldText = React.createClass({
       <input
         type="text"
         disabled={
-          (this.props.field['disabled'] !== undefined)
+          (this.props.field.disabled !== undefined)
           ? this.props.field.disabled(this.props.item)
           : false
         }
-        className={ (this.props.field.size) ? '' : 'regular-text' }
+        className={(this.props.field.size) ? '' : 'regular-text'}
         size={
           (this.props.field.size !== 'auto' && this.props.field.size > 0)
           ? this.props.field.size
           : false
         }
-        name={ this.props.field.name }
+        name={this.props.field.name}
-        id={ 'field_'+this.props.field.name }
+        id={`field_${this.props.field.name}`}
-        value={ value }
+        value={value}
-        placeholder={ this.props.field.placeholder }
+        placeholder={this.props.field.placeholder}
-        onChange={ this.props.onValueChange }
+        onChange={this.props.onValueChange}
         {...this.props.field.validation}
       />
     );

assets/js/src/form/fields/textarea.jsx

@@ -10,12 +10,12 @@ define([
         <textarea
           type="text"
           className="regular-text"
-          name={ this.props.field.name }
+          name={this.props.field.name}
-          id={ 'field_'+this.props.field.name }
+          id={`field_${this.props.field.name}`}
-          value={ this.props.item[this.props.field.name] }
+          value={this.props.item[this.props.field.name]}
-          placeholder={ this.props.field.placeholder }
+          placeholder={this.props.field.placeholder}
-          defaultValue={ this.props.field.defaultValue }
+          defaultValue={this.props.field.defaultValue}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
           {...this.props.field.validation}
         />
       );

assets/js/src/form/form.jsx

@@ -15,7 +15,6 @@ define(
     FormField,
     jQuery
   ) => {
-
     const Form = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
@@ -39,18 +38,18 @@ define(
         return this.props.errors ? this.props.errors : this.state.errors;
       },
       componentDidMount: function () {
-        if(this.isMounted()) {
+        if (this.isMounted()) {
-          if(this.props.params.id !== undefined) {
+          if (this.props.params.id !== undefined) {
             this.loadItem(this.props.params.id);
           } else {
             this.setState({
-              item: jQuery('.mailpoet_form').serializeObject(),
+              item: jQuery('.mailpoet_form').mailpoetSerializeObject(),
             });
           }
         }
       },
       componentWillReceiveProps: function (props) {
-        if(props.params.id === undefined) {
+        if (props.params.id === undefined) {
           this.setState({
             loading: false,
             item: {},
@@ -58,8 +57,6 @@ define(
           if (props.item === undefined) {
             this.refs.form.reset();
           }
-        } else {
-          this.loadItem(props.params.id);
         }
       },
       loadItem: function (id) {
@@ -77,6 +74,9 @@ define(
             loading: false,
             item: response.data,
           });
+          if (typeof this.props.onItemLoad === 'function') {
+            this.props.onItemLoad(response.data);
+          }
         }).fail(() => {
           this.setState({
             loading: false,
@@ -90,8 +90,8 @@ define(
         e.preventDefault();
 
         // handle validation
-        if(this.props.isValid !== undefined) {
+        if (this.props.isValid !== undefined) {
-          if(this.props.isValid() === false) {
+          if (this.props.isValid() === false) {
             return;
           }
         }
@@ -100,9 +100,9 @@ define(
 
         // only get values from displayed fields
         const item = {};
-        this.props.fields.map((field) => {
+        this.props.fields.forEach((field) => {
-          if(field['fields'] !== undefined) {
+          if (field.fields !== undefined) {
-            field.fields.map((subfield) => {
+            field.fields.forEach((subfield) => {
               item[subfield.name] = this.state.item[subfield.name];
             });
           } else {
@@ -110,7 +110,7 @@ define(
           }
         });
         // set id if specified
-        if(this.props.params.id !== undefined) {
+        if (this.props.params.id !== undefined) {
           item.id = this.props.params.id;
         }
 
@@ -122,19 +122,19 @@ define(
         }).always(() => {
           this.setState({ loading: false });
         }).done(() => {
-          if(this.props.onSuccess !== undefined) {
+          if (this.props.onSuccess !== undefined) {
             this.props.onSuccess();
           } else {
             this.context.router.push('/');
           }
 
-          if(this.props.params.id !== undefined) {
+          if (this.props.params.id !== undefined) {
             this.props.messages.onUpdate();
           } else {
             this.props.messages.onCreate();
           }
         }).fail((response) => {
-          if(response.errors.length > 0) {
+          if (response.errors.length > 0) {
             this.setState({ errors: response.errors });
           }
         });
@@ -142,28 +142,25 @@ define(
       handleValueChange: function (e) {
         if (this.props.onChange) {
           return this.props.onChange(e);
-        } else {
-          const item = this.state.item;
-          const field = e.target.name;
-
-          item[field] = e.target.value;
-
-          this.setState({
-            item: item,
-          });
-          return true;
         }
+        const item = this.state.item;
+        const field = e.target.name;
+
+        item[field] = e.target.value;
+
+        this.setState({
+          item: item,
+        });
+        return true;
       },
       render: function () {
         let errors;
-        if(this.getErrors() !== undefined) {
+        if (this.getErrors() !== undefined) {
-          errors = this.getErrors().map((error, index) => {
+          errors = this.getErrors().map((error, index) => (
-            return (
+            <p key={`error-${index}`} className="mailpoet_error">
-              <p key={ 'error-'+index } className="mailpoet_error">
+              { error.message }
-                { error.message }
+            </p>
-              </p>
+            ));
-            );
-          });
         }
 
         const formClasses = classNames(
@@ -194,15 +191,15 @@ define(
 
           return (
             <FormField
-              field={ field }
+              field={field}
-              item={ this.getValues() }
+              item={this.getValues()}
-              onValueChange={ onValueChange }
+              onValueChange={onValueChange}
-              key={ 'field-'+i } />
+              key={`field-${i}`} />
           );
         });
 
         let actions = false;
-        if(this.props.children) {
+        if (this.props.children) {
           actions = this.props.children;
         } else {
           actions = (
@@ -218,9 +215,9 @@ define(
           <div>
             { beforeFormContent }
             <form
-              id={ this.props.id }
+              id={this.props.id}
               ref="form"
-              className={ formClasses }
+              className={formClasses}
               onSubmit={
                 (this.props.onSubmit !== undefined)
                 ? this.props.onSubmit

assets/js/src/forms/forms.jsx

@@ -14,12 +14,12 @@ const App = React.createClass({
 
 const container = document.getElementById('forms_container');
 
-if(container) {
+if (container) {
   ReactDOM.render((
-    <Router history={ history }>
+    <Router history={history}>
-      <Route path="/" component={ App }>
+      <Route path="/" component={App}>
-        <IndexRoute component={ FormList } />
+        <IndexRoute component={FormList} />
-        <Route path="*" component={ FormList } />
+        <Route path="*" component={FormList} />
       </Route>
     </Router>
   ), container);

assets/js/src/forms/list.jsx

@@ -27,7 +27,7 @@ const columns = [
 
 const messages = {
   onTrash: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -42,7 +42,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onDelete: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -57,7 +57,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onRestore: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -73,7 +73,7 @@ const messages = {
   },
 };
 
-const bulk_actions = [
+const bulkActions = [
   {
     name: 'trash',
     label: MailPoet.I18n.t('moveToTrash'),
@@ -81,13 +81,13 @@ const bulk_actions = [
   },
 ];
 
-const item_actions = [
+const itemActions = [
   {
     name: 'edit',
     label: MailPoet.I18n.t('edit'),
     link: function (item) {
       return (
-        <a href={ `admin.php?page=mailpoet-form-editor&id=${item.id}` }>{MailPoet.I18n.t('edit')}</a>
+        <a href={`admin.php?page=mailpoet-form-editor&id=${item.id}`}>{MailPoet.I18n.t('edit')}</a>
       );
     },
   },
@@ -110,7 +110,7 @@ const item_actions = [
       }).fail((response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map((error) => { return error.message; }),
+            response.errors.map(error => error.message),
             { scroll: true }
           );
         }
@@ -133,36 +133,35 @@ const FormList = React.createClass({
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map((error) => { return error.message; }),
+          response.errors.map(error => error.message),
           { scroll: true }
         );
       }
     });
   },
   renderItem(form, actions) {
-    const row_classes = classNames(
+    const rowClasses = classNames(
       'manage-column',
       'column-primary',
       'has-row-actions'
     );
 
-    let segments = window.mailpoet_segments.filter((segment) => {
+    let segments = window.mailpoet_segments
-      return (jQuery.inArray(segment.id, form.segments) !== -1);
+      .filter(segment => (jQuery.inArray(segment.id, form.segments) !== -1))
-    }).map((segment) => {
+      .map(segment => segment.name)
-      return segment.name;
+      .join(', ');
-    }).join(', ');
 
     if (form.settings.segments_selected_by === 'user') {
-      segments = MailPoet.I18n.t('userChoice') + ' ' + segments;
+      segments = `${MailPoet.I18n.t('userChoice')} ${segments}`;
     }
 
     return (
       <div>
-        <td className={ row_classes }>
+        <td className={rowClasses}>
           <strong>
             <a
               className="row-title"
-              href={ `admin.php?page=mailpoet-form-editor&id=${form.id}` }
+              href={`admin.php?page=mailpoet-form-editor&id=${form.id}`}
             >{ form.name }</a>
           </strong>
           { actions }
@@ -186,21 +185,21 @@ const FormList = React.createClass({
           {MailPoet.I18n.t('pageTitle')} <a
             className="page-title-action"
             href="javascript:;"
-            onClick={ this.createForm }
+            onClick={this.createForm}
           >{MailPoet.I18n.t('new')}</a>
         </h1>
 
         <Listing
-          limit={ window.mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
-          messages={ messages }
+          messages={messages}
-          search={ false }
+          search={false}
           endpoint="forms"
-          onRenderItem={ this.renderItem }
+          onRenderItem={this.renderItem}
-          columns={ columns }
+          columns={columns}
-          bulk_actions={ bulk_actions }
+          bulk_actions={bulkActions}
-          item_actions={ item_actions }
+          item_actions={itemActions}
         />
       </div>
     );

assets/js/src/handlebars_helpers.js

@@ -1,37 +1,38 @@
-define('handlebars_helpers', ['handlebars'], function(Handlebars) {
+/* eslint-disable func-names */
+define('handlebars_helpers', ['handlebars'], function (Handlebars) {
   // Handlebars helpers
-  Handlebars.registerHelper('concat', function() {
+  Handlebars.registerHelper('concat', function () {
-    var size = (arguments.length - 1),
+    var size = (arguments.length - 1);
-      output = '';
+    var output = '';
-    for(var i = 0; i < size; i++) {
+    var i;
+    for (i = 0; i < size; i++) {
       output += arguments[i];
     }
     return output;
   });
 
-  Handlebars.registerHelper('number_format', function(value, block) {
+  Handlebars.registerHelper('number_format', function (value) {
     return Number(value).toLocaleString();
   });
-  Handlebars.registerHelper('date_format', function(timestamp, block) {
+  Handlebars.registerHelper('date_format', function (timestamp, block) {
-    if(window.moment) {
+    var f;
-      if(timestamp === undefined || isNaN(timestamp) || timestamp <= 0) {
+    if (window.moment) {
-        return;
+      if (timestamp === undefined || isNaN(timestamp) || timestamp <= 0) {
+        return undefined;
       }
 
-          // set date format
+      // set date format
-      var f = block.hash.format || 'MMM Do, YYYY';
+      f = block.hash.format || 'MMM Do, YYYY';
-          // check if we passed a timestamp
+      // check if we passed a timestamp
-      if(parseInt(timestamp, 10) == timestamp) {
+      if (parseInt(timestamp, 10) == timestamp) {
         return window.moment.unix(timestamp).format(f);
-      } else {
-        return window.moment.utc(timestamp).format(f);
       }
-    } else {
+      return window.moment.utc(timestamp).format(f);
-      return timestamp;
     }
+    return timestamp;
   });
 
-  Handlebars.registerHelper('cycle', function(value, block) {
+  Handlebars.registerHelper('cycle', function (value, block) {
     var values = value.split(' ');
     return values[block.data.index % (values.length + 1)];
   });
@@ -59,47 +60,46 @@ define('handlebars_helpers', ['handlebars'], function(Handlebars) {
       case '||':
         return (v1 || v2) ? options.fn(this) : options.inverse(this);
       case 'in':
-        var values = v2.split(',');
         return (v2.indexOf(v1) !== -1) ? options.fn(this) : options.inverse(this);
       default:
         return options.inverse(this);
     }
   });
 
-  Handlebars.registerHelper('nl2br', function(value, block) {
+  Handlebars.registerHelper('nl2br', function (value) {
     return value.gsub('\n', '<br />');
   });
 
-  Handlebars.registerHelper('json_encode', function(value, block) {
+  Handlebars.registerHelper('json_encode', function (value) {
     return JSON.stringify(value);
   });
 
-  Handlebars.registerHelper('json_decode', function(value, block) {
+  Handlebars.registerHelper('json_decode', function (value) {
     return JSON.parse(value);
   });
-  Handlebars.registerHelper('url', function(value, block) {
+  Handlebars.registerHelper('url', function (value) {
     var url = window.location.protocol + '//' + window.location.host + window.location.pathname;
 
     return url + value;
   });
-  Handlebars.registerHelper('emailFromMailto', function(value) {
+  Handlebars.registerHelper('emailFromMailto', function (value) {
     var mailtoMatchingRegex = /^mailto\:/i;
     if (typeof value === 'string' && value.match(mailtoMatchingRegex)) {
       return value.replace(mailtoMatchingRegex, '');
-    } else {
-      return value;
     }
+    return value;
   });
-  Handlebars.registerHelper('lookup', function(obj, field, options) {
+  Handlebars.registerHelper('lookup', function (obj, field) {
     return obj && obj[field];
   });
 
 
-  Handlebars.registerHelper('rsa_key', function(value, block) {
+  Handlebars.registerHelper('rsa_key', function (value) {
-      // extract all lines into an array
+    var lines;
-    if(value === undefined) return '';
+    // extract all lines into an array
+    if (value === undefined) return '';
 
-    var lines = value.trim().split('\n');
+    lines = value.trim().split('\n');
 
       // remove header & footer
     lines.shift();
@@ -109,8 +109,8 @@ define('handlebars_helpers', ['handlebars'], function(Handlebars) {
     return lines.join('');
   });
 
-  Handlebars.registerHelper('trim', function(value, block) {
+  Handlebars.registerHelper('trim', function (value) {
-    if(value === null || value === undefined) return '';
+    if (value === null || value === undefined) return '';
     return value.trim();
   });
 
@@ -126,23 +126,22 @@ define('handlebars_helpers', ['handlebars'], function(Handlebars) {
    */
   Handlebars.registerHelper('ellipsis', function (str, limit, append) {
     var strAppend = append;
+    var sanitized = str.replace(/(<([^>]+)>)/g, '');
     if (strAppend === undefined) {
       strAppend = '';
     }
-    var sanitized = str.replace(/(<([^>]+)>)/g, '');
     if (sanitized.length > limit) {
       return sanitized.substr(0, limit - strAppend.length) + strAppend;
-    } else {
-      return sanitized;
     }
+    return sanitized;
   });
 
   Handlebars.registerHelper('getNumber', function (string) {
     return parseInt(string, 10);
   });
 
-  Handlebars.registerHelper('fontWithFallback', function(font) {
+  Handlebars.registerHelper('fontWithFallback', function (font) {
-    switch(font) {
+    switch (font) {
       case 'Arial': return new Handlebars.SafeString("Arial, 'Helvetica Neue', Helvetica, sans-serif");
       case 'Comic Sans MS': return new Handlebars.SafeString("'Comic Sans MS', 'Marker Felt-Thin', Arial, sans-serif");
       case 'Courier New': return new Handlebars.SafeString("'Courier New', Courier, 'Lucida Sans Typewriter', 'Lucida Typewriter', monospace");

assets/js/src/help-tooltip.js

@@ -1,12 +1,11 @@
 define('helpTooltip', ['mailpoet', 'react', 'react-dom', 'help-tooltip.jsx'],
-  function (mp, React, ReactDOM, TooltipComponent) {
+  function helpTooltip(mp, React, ReactDOM, TooltipComponent) {
     'use strict';
 
     var MailPoet = mp;
 
     MailPoet.helpTooltip = {
-      show: function (domContainerNode, opts) {
+      show: function show(domContainerNode, opts) {
-
         ReactDOM.render(React.createElement(
           TooltipComponent, {
             tooltip: opts.tooltip,
@@ -16,7 +15,6 @@ define('helpTooltip', ['mailpoet', 'react', 'react-dom', 'help-tooltip.jsx'],
         ), domContainerNode);
       }
     };
-
   }
 );
 

assets/js/src/help-tooltip.jsx

@@ -6,11 +6,11 @@ function Tooltip(props) {
   let tooltipId = props.tooltipId;
   let tooltip = props.tooltip;
   // tooltip ID must be unique, defaults to tooltip text
-  if(!props.tooltipId && typeof props.tooltip === 'string') {
+  if (!props.tooltipId && typeof props.tooltip === 'string') {
     tooltipId = props.tooltip;
   }
 
-  if(typeof props.tooltip === 'string') {
+  if (typeof props.tooltip === 'string') {
     tooltip = (<span
       style={{
         pointerEvents: 'all',

assets/js/src/help/help.jsx

@@ -3,8 +3,9 @@ import ReactDOM from 'react-dom';
 import { Router, Route, IndexRedirect, useRouterHistory } from 'react-router';
 import { createHashHistory } from 'history';
 
-import KnowledgeBase from 'help/knowledge_base.jsx';
+import SystemStatus from 'help/system_status.jsx';
 import SystemInfo from 'help/system_info.jsx';
+import KnowledgeBase from 'help/knowledge_base.jsx';
 
 const history = useRouterHistory(createHashHistory)({ queryKey: false });
 
@@ -16,17 +17,16 @@ const App = React.createClass({
 
 const container = document.getElementById('help_container');
 
-if(container) {
+if (container) {
-
   ReactDOM.render((
-    <Router history={ history }>
+    <Router history={history}>
-      <Route path="/" component={ App }>
+      <Route path="/" component={App}>
-        <IndexRedirect to="knowledgeBase" />
+        <IndexRedirect to="systemStatus" />
         {/* Pages */}
-        <Route path="knowledgeBase(/)**" params={{ tab: 'knowledgeBase' }} component={ KnowledgeBase } />
+        <Route path="systemStatus(/)**" params={{ tab: 'systemStatus' }} component={SystemStatus} />
-        <Route path="systemInfo(/)**" params={{ tab: 'systemInfo' }} component={ SystemInfo } />
+        <Route path="systemInfo(/)**" params={{ tab: 'systemInfo' }} component={SystemInfo} />
+        <Route path="knowledgeBase(/)**" params={{ tab: 'knowledgeBase' }} component={KnowledgeBase} />
       </Route>
     </Router>
   ), container);
-
 }

assets/js/src/help/knowledge_base.jsx

@@ -4,7 +4,6 @@ import MailPoet from 'mailpoet';
 import Tabs from './tabs.jsx';
 
 function KnowledgeBase() {
-
   return (
     <div>
 

assets/js/src/help/system_info.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import MailPoet from 'mailpoet';
 import _ from 'underscore';
-
 import Tabs from './tabs.jsx';
 
 function handleFocus(event) {
@@ -10,9 +9,7 @@ function handleFocus(event) {
 
 function printData(data) {
   if (_.isObject(data)) {
-    const printableData = Object.keys(data).map((key) => {
+    const printableData = Object.keys(data).map(key => `${key}: ${data[key]}`);
-      return `${key}: ${data[key]}`;
-    });
 
     return (<textarea
       readOnly={true}
@@ -23,25 +20,24 @@ function printData(data) {
         height: '400px',
       }}
     />);
-  } else {
-    return (<p>{MailPoet.I18n.t('systemInfoDataError')}</p>);
   }
+  return (<p>{MailPoet.I18n.t('systemInfoDataError')}</p>);
 }
 
-function KnowledgeBase() {
+function SystemInfo() {
-  const data = window.help_scout_data;
+  const systemInfoData = window.systemInfoData;
   return (
     <div>
 
       <Tabs tab="systemInfo" />
 
-      <div className="mailpoet_notice notice inline notice-success" style={{ marginTop: '1em' }}>
+      <div className="mailpoet_notice notice inline" style={{ marginTop: '1em' }}>
         <p>{MailPoet.I18n.t('systemInfoIntro')}</p>
       </div>
 
-      {printData(data)}
+      {printData(systemInfoData)}
     </div>
   );
 }
 
-module.exports = KnowledgeBase;
+module.exports = SystemInfo;

assets/js/src/help/system_status.jsx

@@ -0,0 +1,71 @@
+import MailPoet from 'mailpoet';
+import React from 'react';
+import ReactStringReplace from 'react-string-replace';
+import Tabs from './tabs.jsx';
+
+function renderStatusMessage(status, error, link) {
+  const noticeType = (status) ? 'success' : 'error';
+  let noticeMessage = (status) ?
+    MailPoet.I18n.t('systemStatusConnectionSuccessful') :
+    `${MailPoet.I18n.t('systemStatusConnectionUnsuccessful')} ${error}`;
+
+  if (link) {
+    noticeMessage = ReactStringReplace(
+      noticeMessage,
+      /\[link\](.*?)\[\/link\]/g,
+      match => (
+        <a href={`${link}`} key="kb-link">{ match }</a>
+      )
+    );
+  }
+
+  return (
+    <div className={`mailpoet_notice notice inline notice-${noticeType}`} style={{ marginTop: '1em' }}>
+      <p>{noticeMessage}</p>
+    </div>
+  );
+}
+
+function renderCronSection(data) {
+  const status = data.cron.isReachable;
+  const url = data.cron.url;
+
+  return (
+    <div>
+      <h2>{MailPoet.I18n.t('systemStatusCronTitle')}</h2>
+      <p>
+        <a href={url} target="_blank">{url}</a>
+      </p>
+      {renderStatusMessage(status, MailPoet.I18n.t('systemStatusCronConnectionUnsuccessfulInfo'), '//beta.docs.mailpoet.com/article/231-sending-does-not-work')}
+    </div>
+  );
+}
+
+function renderMSSSection(data) {
+  if (!data.mss.enabled) return undefined;
+
+  const status = data.mss.enabled.isReachable;
+
+  return (
+    <div>
+      <h2>{MailPoet.I18n.t('systemStatusMSSTitle')}</h2>
+      {renderStatusMessage(status, MailPoet.I18n.t('systemStatusMSSConnectionUnsuccessfulInfo'), false)}
+    </div>
+  );
+}
+
+function SystemStatus() {
+  const systemStatusData = window.systemStatusData;
+
+  return (
+    <div>
+      <Tabs tab="systemStatus" />
+      <div className="mailpoet_notice notice inline" style={{ marginTop: '1em' }}>
+        <p>{systemStatusData.mss.enabled ? MailPoet.I18n.t('systemStatusIntroCronMSS') : MailPoet.I18n.t('systemStatusIntroCron')}</p>
+      </div>
+      {renderCronSection(systemStatusData)}
+      {renderMSSSection(systemStatusData)}
+    </div>
+  );
+}
+module.exports = SystemStatus;

assets/js/src/help/tabs.jsx

@@ -5,19 +5,23 @@ import MailPoet from 'mailpoet';
 
 const tabs = [
   {
-    name: 'knowledgeBase',
+    name: 'systemStatus',
-    label: MailPoet.I18n.t('tabKnowledgeBaseTitle'),
+    label: MailPoet.I18n.t('tabSystemStatusTitle'),
-    link: '/knowledgeBase',
+    link: '/systemStatus',
   },
   {
     name: 'systemInfo',
     label: MailPoet.I18n.t('tabSystemInfoTitle'),
     link: '/systemInfo',
   },
+  {
+    name: 'knowledgeBase',
+    label: MailPoet.I18n.t('tabKnowledgeBaseTitle'),
+    link: '/knowledgeBase',
+  },
 ];
 
 function Tabs(props) {
-
   const tabLinks = tabs.map((tab, index) => {
     const tabClasses = classNames(
       'nav-tab',
@@ -26,9 +30,9 @@ function Tabs(props) {
 
     return (
       <Link
-        key={ 'tab-'+index }
+        key={`tab-${index}`}
-        className={ tabClasses }
+        className={tabClasses}
-        to={ tab.link }
+        to={tab.link}
       >{ tab.label }</Link>
     );
   });
@@ -41,6 +45,6 @@ function Tabs(props) {
 }
 
 Tabs.propTypes = { tab: React.PropTypes.string };
-Tabs.defaultProps = { tab: 'knowledgeBase' };
+Tabs.defaultProps = { tab: 'systemStatus' };
 
 module.exports = Tabs;

assets/js/src/i18n.js

@@ -1,7 +1,7 @@
 define('i18n',
   [
     'mailpoet'
-  ], function(
+  ], function i18n(
     mp
 ) {
     'use strict';
@@ -11,15 +11,14 @@ define('i18n',
     var translations = {};
 
     MailPoet.I18n = {
-      add: function(key, value) {
+      add: function add(key, value) {
         translations[key] = value;
       },
-      t: function(key) {
+      t: function t(key) {
         return translations[key] || 'TRANSLATION "%$1s" NOT FOUND'.replace('%$1s', key);
       },
-      all: function() {
+      all: function all() {
         return translations;
       }
     };
-
   });

assets/js/src/iframe.js

@@ -1,20 +1,20 @@
-define('iframe', ['mailpoet'], function(mp) {
+define('iframe', ['mailpoet'], function iframeModule(mp) {
   'use strict';
 
   var MailPoet = mp;
   MailPoet.Iframe = {
     marginY: 20,
-    autoSize: function(iframe) {
+    autoSize: function autoSize(iframe) {
-      if(!iframe) return;
+      if (!iframe) return;
 
       this.setSize(
         iframe,
         iframe.contentWindow.document.body.scrollHeight
       );
     },
-    setSize: function(sizeIframe, i) {
+    setSize: function setSize(sizeIframe, i) {
       var iframe = sizeIframe;
-      if(!iframe) return;
+      if (!iframe) return;
 
       iframe.style.height = (
         parseInt(i, 10) + this.marginY

assets/js/src/jquery.serialize_object.js

@@ -2,7 +2,7 @@ define(
   [
     'jquery'
   ],
-  function(
+  function ( // eslint-disable-line func-names
     jQuery
   ) {
     var $ = jQuery;
@@ -23,47 +23,47 @@ define(
      * Dual licensed under the MIT and GPL licenses.
      * http://benalman.com/about/license/
      */
-    $.fn.serializeObject = function(coerce) {
+    $.fn.mailpoetSerializeObject = function (coerce) { // eslint-disable-line func-names
-      var obj = {},
+      var obj = {};
-        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){
+      $.each(this.serializeArray(), function (j, v) { // eslint-disable-line func-names
-        var key = v.name,
+        var key = v.name;
-          val = v.value,
+        var val = v.value;
-          cur = obj,
+        var cur = obj;
-          i = 0,
+        var i = 0;
 
-          // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+        // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
-          // into its component parts.
+        // into its component parts.
-          keys = key.split( '][' ),
+        var keys = key.split('][');
-          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 = 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 ) {
+        if (coerce) {
-          val = val && !isNaN(val)            ? +val              // number
+          val = val && !isNaN(val) ? +val              // number
-            : val === 'undefined'             ? undefined         // undefined
+            : 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,27 +73,24 @@ 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] ) ? {} : [] )
+              ? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
               : val;
             cur = cur[key];
           }
-
         } else {
           // Simple key, even simpler rules, since only scalars and shallow
           // arrays are allowed.
 
-          if ( $.isArray( obj[key] ) ) {
+          if ($.isArray(obj[key])) {
             // val is already an array, so push on the next value.
-            obj[key].push( val );
+            obj[key].push(val);
-
+          } else if (obj[key] !== undefined) {
-          } else if ( obj[key] !== undefined ) {
             // val isn't an array, but since a second value has been specified,
             // convert val into an array.
-            obj[key] = [ obj[key], val ];
+            obj[key] = [obj[key], val];
-
           } else {
             // val is a scalar.
             obj[key] = val;
@@ -106,4 +103,4 @@ define(
 
     return $;
   }
-);
+);

assets/js/src/listing/bulk_actions.jsx

@@ -21,7 +21,7 @@ define([
         const action = this.getSelectedAction();
 
         // action on select callback
-        if(action !== null && action['onSelect'] !== undefined) {
+        if (action !== null && action.onSelect !== undefined) {
           this.setState({
             extra: action.onSelect(e),
           });
@@ -33,27 +33,27 @@ define([
 
       const action = this.getSelectedAction();
 
-      if(action === null) {
+      if (action === null) {
         return;
       }
 
-      const selected_ids = (this.props.selection !== 'all')
+      const selectedIds = (this.props.selection !== 'all')
         ? this.props.selected_ids
         : [];
 
-      const data = (action['getData'] !== undefined)
+      const data = (action.getData !== undefined)
         ? action.getData()
         : {};
 
       data.action = this.state.action;
 
       let onSuccess = function () {};
-      if(action['onSuccess'] !== undefined) {
+      if (action.onSuccess !== undefined) {
         onSuccess = action.onSuccess;
       }
 
-      if(data.action) {
+      if (data.action) {
-        const promise = this.props.onBulkAction(selected_ids, data);
+        const promise = this.props.onBulkAction(selectedIds, data);
         if (promise !== false) {
           promise.then(onSuccess);
         }
@@ -65,20 +65,18 @@ define([
       });
     },
     getSelectedAction: function () {
-      const selected_action = this.refs.action.value;
+      const selectedAction = this.refs.action.value;
-      if(selected_action.length > 0) {
+      if (selectedAction.length > 0) {
-        const action = this.props.bulk_actions.filter((action) => {
+        const action = this.props.bulk_actions.filter(act => (act.name === selectedAction));
-          return (action.name === selected_action);
-        });
 
-        if(action.length > 0) {
+        if (action.length > 0) {
           return action[0];
         }
       }
       return null;
     },
     render: function () {
-      if(this.props.bulk_actions.length === 0) {
+      if (this.props.bulk_actions.length === 0) {
         return null;
       }
 
@@ -93,21 +91,19 @@ define([
           <select
             name="bulk_actions"
             ref="action"
-            value={ this.state.action }
+            value={this.state.action}
             onChange={this.handleChangeAction}
           >
             <option value="">{MailPoet.I18n.t('bulkActions')}</option>
-            { this.props.bulk_actions.map((action, index) => {
+            { this.props.bulk_actions.map((action, index) => (
-              return (
+              <option
-                <option
+                value={action.name}
-                  value={ action.name }
+                key={`action-${index}`}
-                  key={ 'action-' + index }
                 >{ action.label }</option>
-              );
+              )) }
-            }) }
           </select>
           <input
-            onClick={ this.handleApplyAction }
+            onClick={this.handleApplyAction}
             type="submit"
             defaultValue={MailPoet.I18n.t('apply')}
             className="button action" />

assets/js/src/listing/filters.jsx

@@ -11,8 +11,8 @@ define([
   const ListingFilters = React.createClass({
     handleFilterAction: function () {
       const filters = {};
-      this.getAvailableFilters().map((filter, i) => {
+      this.getAvailableFilters().forEach((filter, i) => {
-        filters[this.refs['filter-'+i].name] = this.refs['filter-'+i].value;
+        filters[this.refs[`filter-${i}`].name] = this.refs[`filter-${i}`].value;
       });
       if (this.props.onBeforeSelectFilter) {
         this.props.onBeforeSelectFilter(filters);
@@ -24,23 +24,21 @@ define([
     },
     getAvailableFilters: function () {
       const filters = this.props.filters;
-      return Object.keys(filters).filter((filter) => {
+      return Object.keys(filters).filter(filter => !(
-        return !(
           filters[filter].length === 0
           || (
             filters[filter].length === 1
             && !filters[filter][0].value
           )
-        );
+        ));
-      });
     },
     componentDidUpdate: function () {
-      const selected_filters = this.props.filter;
+      const selectedFilters = this.props.filter;
-      this.getAvailableFilters().map(
+      this.getAvailableFilters().forEach(
         (filter, i) => {
-          if (selected_filters[filter] !== undefined && selected_filters[filter]) {
+          if (selectedFilters[filter] !== undefined && selectedFilters[filter]) {
-            jQuery(this.refs['filter-'+i])
+            jQuery(this.refs[`filter-${i}`])
-              .val(selected_filters[filter])
+              .val(selectedFilters[filter])
               .trigger('change');
           }
         }
@@ -48,44 +46,40 @@ define([
     },
     render: function () {
       const filters = this.props.filters;
-      const available_filters = this.getAvailableFilters()
+      const availableFilters = this.getAvailableFilters()
-        .map((filter, i) => {
+        .map((filter, i) => (
-          return (
+          <select
-            <select
+            ref={`filter-${i}`}
-              ref={ `filter-${i}` }
+            key={`filter-${i}`}
-              key={ `filter-${i}` }
+            name={filter}
-              name={ filter }
             >
-              { filters[filter].map((option, j) => {
+            { filters[filter].map((option, j) => (
-                return (
+              <option
-                  <option
+                value={option.value}
-                    value={ option.value }
+                key={`filter-option-${j}`}
-                    key={ 'filter-option-' + j }
                 >{ option.label }</option>
-                );
+                )) }
-              }) }
+          </select>
-            </select>
+          ));
-          );
-        });
 
       let button;
 
-      if (available_filters.length > 0) {
+      if (availableFilters.length > 0) {
         button = (
           <input
             id="post-query-submit"
-            onClick={ this.handleFilterAction }
+            onClick={this.handleFilterAction}
             type="submit"
             defaultValue={MailPoet.I18n.t('filter')}
             className="button" />
         );
       }
 
-      let empty_trash;
+      let emptyTrash;
       if (this.props.group === 'trash') {
-        empty_trash = (
+        emptyTrash = (
           <input
-            onClick={ this.handleEmptyTrash }
+            onClick={this.handleEmptyTrash}
             type="submit"
             value={MailPoet.I18n.t('emptyTrash')}
             className="button"
@@ -95,9 +89,9 @@ define([
 
       return (
         <div className="alignleft actions actions">
-          { available_filters }
+          { availableFilters }
           { button }
-          { empty_trash }
+          { emptyTrash }
         </div>
       );
     },

assets/js/src/listing/groups.jsx

@@ -1,17 +1,16 @@
 define(['react', 'classnames'], (React, classNames) => {
-
   const ListingGroups = React.createClass({
     handleSelect: function (group) {
       return this.props.onSelectGroup(group);
     },
     render: function () {
       const groups = this.props.groups.map((group, index) => {
-        if(group.name === 'trash' && group.count === 0) {
+        if (group.name === 'trash' && group.count === 0) {
           return false;
         }
 
         const classes = classNames(
-            { current : (group.name === this.props.group) }
+            { current: (group.name === this.props.group) }
           );
 
         return (
@@ -21,7 +20,8 @@ define(['react', 'classnames'], (React, classNames) => {
               href="javascript:;"
               className={classes}
               onClick={this.handleSelect.bind(this, group.name)} >
-              {group.label} <span className="count">({ group.count.toLocaleString() })</span>
+              {group.label}
+              <span className="count">({ parseInt(group.count, 10).toLocaleString() })</span>
             </a>
           </li>
         );

assets/js/src/listing/header.jsx

@@ -19,14 +19,14 @@ const ListingHeader = React.createClass({
         <ListingColumn
           onSort={this.props.onSort}
           sort_by={this.props.sort_by}
-          key={ 'column-' + index }
+          key={`column-${index}`}
           column={renderColumn} />
       );
     });
 
     let checkbox;
 
-    if(this.props.is_selectable === true) {
+    if (this.props.is_selectable === true) {
       checkbox = (
         <th
           className="manage-column column-cb check-column">
@@ -37,8 +37,8 @@ const ListingHeader = React.createClass({
             type="checkbox"
             name="select_all"
             ref="toggle"
-            checked={ this.props.selection }
+            checked={this.props.selection}
-            onChange={ this.handleSelectItems } />
+            onChange={this.handleSelectItems} />
         </th>
       );
     }
@@ -54,9 +54,9 @@ const ListingHeader = React.createClass({
 
 const ListingColumn = React.createClass({
   handleSort: function () {
-    const sort_by = this.props.column.name;
+    const sortBy = this.props.column.name;
-    const sort_order = (this.props.column.sorted === 'asc') ? 'desc' : 'asc';
+    const sortOrder = (this.props.column.sorted === 'asc') ? 'desc' : 'asc';
-    this.props.onSort(sort_by, sort_order);
+    this.props.onSort(sortBy, sortOrder);
   },
   render: function () {
     const classes = classNames(
@@ -68,9 +68,9 @@ const ListingColumn = React.createClass({
     );
     let label;
 
-    if(this.props.column.sortable === true) {
+    if (this.props.column.sortable === true) {
       label = (
-        <a onClick={ this.handleSort }>
+        <a onClick={this.handleSort}>
           <span>{ this.props.column.label }</span>
           <span className="sorting-indicator"></span>
         </a>
@@ -80,10 +80,10 @@ const ListingColumn = React.createClass({
     }
     return (
       <th
-        className={ classes }
+        className={classes}
-        id={this.props.column.name }
+        id={this.props.column.name}
         scope="col"
-        width={ this.props.column.width || null }
+        width={this.props.column.width || null}
       >{label}</th>
     );
   },

assets/js/src/listing/listing.jsx

@@ -44,70 +44,66 @@ const ListingItem = React.createClass({
       checkbox = (
         <th className="check-column" scope="row">
           <label className="screen-reader-text">{
-            'Select ' + this.props.item[this.props.columns[0].name]
+            `Select ${this.props.item[this.props.columns[0].name]}`
           }</label>
           <input
             type="checkbox"
-            value={ this.props.item.id }
+            value={this.props.item.id}
             checked={
               this.props.item.selected || this.props.selection === 'all'
             }
-            onChange={ this.handleSelectItem }
+            onChange={this.handleSelectItem}
-            disabled={ this.props.selection === 'all' } />
+            disabled={this.props.selection === 'all'} />
         </th>
       );
     }
 
-    const custom_actions = this.props.item_actions;
+    const customActions = this.props.item_actions;
-    let item_actions = false;
+    let itemActions = false;
 
-    if (custom_actions.length > 0) {
+    if (customActions.length > 0) {
-      let is_first = true;
+      let isFirst = true;
-      item_actions = custom_actions.map((action, index) => {
+      itemActions = customActions
-        if (action.display !== undefined) {
+      .filter(action => action.display === undefined || action.display(this.props.item))
-          if (action.display(this.props.item) === false) {
+      .map((action, index) => {
-            return;
+        let customAction = null;
-          }
-        }
-
-        let custom_action = null;
 
         if (action.name === 'trash') {
-          custom_action = (
+          customAction = (
-            <span key={ 'action-'+index } className="trash">
+            <span key={`action-${index}`} className="trash">
-              {(!is_first) ? ' | ' : ''}
+              {(!isFirst) ? ' | ' : ''}
               <a
                 href="javascript:;"
-                onClick={ this.handleTrashItem.bind(
+                onClick={this.handleTrashItem.bind(
                   null,
                   this.props.item.id
-                ) }>
+                )}>
                 {MailPoet.I18n.t('moveToTrash')}
               </a>
             </span>
           );
         } else if (action.refresh) {
-          custom_action = (
+          customAction = (
             <span
-              onClick={ this.props.onRefreshItems }
+              onClick={this.props.onRefreshItems}
-              key={ 'action-'+index } className={ action.name }>
+              key={`action-${index}`} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              {(!isFirst) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
           );
         } else if (action.link) {
-          custom_action = (
+          customAction = (
             <span
-              key={ 'action-'+index } className={ action.name }>
+              key={`action-${index}`} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              {(!isFirst) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
           );
         } else {
-          custom_action = (
+          customAction = (
             <span
-              key={ 'action-'+index } className={ action.name }>
+              key={`action-${index}`} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              {(!isFirst) ? ' | ' : ''}
               <a href="javascript:;" onClick={
                 (action.onClick !== undefined)
                 ? action.onClick.bind(null,
@@ -120,16 +116,16 @@ const ListingItem = React.createClass({
           );
         }
 
-        if (custom_action !== null && is_first === true) {
+        if (customAction !== null && isFirst === true) {
-          is_first = false;
+          isFirst = false;
         }
 
-        return custom_action;
+        return customAction;
       });
     } else {
-      item_actions = (
+      itemActions = (
         <span className="edit">
-          <Link to={ `/edit/${ this.props.item.id }` }>{MailPoet.I18n.t('edit')}</Link>
+          <Link to={`/edit/${this.props.item.id}`}>{MailPoet.I18n.t('edit')}</Link>
         </span>
       );
     }
@@ -143,7 +139,7 @@ const ListingItem = React.createClass({
             <span>
               <a
                 href="javascript:;"
-                onClick={ this.handleRestoreItem.bind(
+                onClick={this.handleRestoreItem.bind(
                   null,
                   this.props.item.id
                 )}
@@ -154,7 +150,7 @@ const ListingItem = React.createClass({
               <a
                 className="submitdelete"
                 href="javascript:;"
-                onClick={ this.handleDeleteItem.bind(
+                onClick={this.handleDeleteItem.bind(
                   null,
                   this.props.item.id
                 )}
@@ -162,7 +158,7 @@ const ListingItem = React.createClass({
             </span>
           </div>
           <button
-            onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
+            onClick={this.handleToggleItem.bind(null, this.props.item.id)}
             className="toggle-row" type="button">
             <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
           </button>
@@ -172,10 +168,10 @@ const ListingItem = React.createClass({
       actions = (
         <div>
           <div className="row-actions">
-            { item_actions }
+            { itemActions }
           </div>
           <button
-            onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
+            onClick={this.handleToggleItem.bind(null, this.props.item.id)}
             className="toggle-row" type="button">
             <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
           </button>
@@ -183,10 +179,10 @@ const ListingItem = React.createClass({
       );
     }
 
-    const row_classes = classNames({ 'is-expanded': this.state.expanded });
+    const rowClasses = classNames({ 'is-expanded': this.state.expanded });
 
     return (
-      <tr className={ row_classes }>
+      <tr className={rowClasses} data-automation-id={`listing_item_${this.props.item.id}`}>
         { checkbox }
         { this.props.onRenderItem(this.props.item, actions) }
       </tr>
@@ -223,24 +219,24 @@ const ListingItems = React.createClass({
           </tr>
         </tbody>
       );
-    } else {
+    }
-      const select_all_classes = classNames(
+    const selectAllClasses = classNames(
         'mailpoet_select_all',
-        { mailpoet_hidden: (
+      { mailpoet_hidden: (
             this.props.selection === false
             || (this.props.count <= this.props.limit)
           ),
-        }
+      }
       );
 
-      return (
+    return (
-        <tbody>
+      <tbody>
-          <tr className={ select_all_classes }>
+        <tr className={selectAllClasses}>
-            <td colSpan={
+          <td colSpan={
                 this.props.columns.length
                 + (this.props.is_selectable ? 1 : 0)
               }>
-              {
+            {
                 (this.props.selection !== 'all')
                 ? MailPoet.I18n.t('selectAllLabel')
                 : MailPoet.I18n.t('selectedAllLabel').replace(
@@ -249,41 +245,40 @@ const ListingItems = React.createClass({
                 )
               }
               &nbsp;
-              <a
+            <a
-                onClick={ this.props.onSelectAll }
+              onClick={this.props.onSelectAll}
-                href="javascript:;">{
+              href="javascript:;">{
                   (this.props.selection !== 'all')
                   ? MailPoet.I18n.t('selectAllLink')
                   : MailPoet.I18n.t('clearSelection')
                 }</a>
-            </td>
+          </td>
-          </tr>
+        </tr>
 
-          {this.props.items.map((item, index) => {
+        {this.props.items.map((item, index) => {
-            const renderItem = item;
+          const renderItem = item;
-            renderItem.id = parseInt(item.id, 10);
+          renderItem.id = parseInt(item.id, 10);
-            renderItem.selected = (this.props.selected_ids.indexOf(renderItem.id) !== -1);
+          renderItem.selected = (this.props.selected_ids.indexOf(renderItem.id) !== -1);
 
-            return (
+          return (
-              <ListingItem
+            <ListingItem
-                columns={ this.props.columns }
+              columns={this.props.columns}
-                onSelectItem={ this.props.onSelectItem }
+              onSelectItem={this.props.onSelectItem}
-                onRenderItem={ this.props.onRenderItem }
+              onRenderItem={this.props.onRenderItem}
-                onDeleteItem={ this.props.onDeleteItem }
+              onDeleteItem={this.props.onDeleteItem}
-                onRestoreItem={ this.props.onRestoreItem }
+              onRestoreItem={this.props.onRestoreItem}
-                onTrashItem={ this.props.onTrashItem }
+              onTrashItem={this.props.onTrashItem}
-                onRefreshItems={ this.props.onRefreshItems }
+              onRefreshItems={this.props.onRefreshItems}
-                selection={ this.props.selection }
+              selection={this.props.selection}
-                is_selectable={ this.props.is_selectable }
+              is_selectable={this.props.is_selectable}
-                item_actions={ this.props.item_actions }
+              item_actions={this.props.item_actions}
-                group={ this.props.group }
+              group={this.props.group}
-                key={ `item-${renderItem.id}-${index}` }
+              key={`item-${renderItem.id}-${index}`}
-                item={ renderItem } />
+              item={renderItem} />
-            );
+          );
-          })}
+        })}
-        </tbody>
+      </tbody>
-      );
+    );
-    }
   },
 });
 
@@ -319,16 +314,15 @@ const Listing = React.createClass({
     const state = this.getInitialState();
      // check for url params
     if (params.splat) {
-      params.splat.split('/').map((param) => {
+      params.splat.split('/').forEach((param) => {
         const [key, value] = this.getParam(param);
-        switch(key) {
+        const filters = {};
+        switch (key) {
           case 'filter':
-            const filters = {};
+            value.split('&').forEach((pair) => {
-            value.split('&').map((pair) => {
               const [k, v] = pair.split('=');
               filters[k] = v;
-            }
+            });
-            );
 
             state.filter = filters;
             break;
@@ -340,7 +334,7 @@ const Listing = React.createClass({
 
     // limit per page
     if (this.props.limit !== undefined) {
-      state.limit = Math.abs(~~this.props.limit);
+      state.limit = Math.abs(Number(this.props.limit));
     }
 
     // sort by
@@ -371,8 +365,7 @@ const Listing = React.createClass({
   setParams: function () {
     if (this.props.location) {
       const params = Object.keys(this.state)
-        .filter((key) => {
+        .filter(key => (
-          return (
             [
               'group',
               'filter',
@@ -381,8 +374,7 @@ const Listing = React.createClass({
               'sort_by',
               'sort_order',
             ].indexOf(key) !== -1
-          );
+          ))
-        })
         .map((key) => {
           let value = this.state[key];
           if (value === Object(value)) {
@@ -390,12 +382,13 @@ const Listing = React.createClass({
           } else if (value === Boolean(value)) {
             value = value.toString();
           }
-
+          return {
-          if (value !== '' && value !== null) {
+            key,
-            return `${key}[${value}]`;
+            value,
-          }
+          };
         })
-        .filter((key) => { return (key !== undefined); })
+        .filter(({ value }) => value !== '' && value !== null)
+        .map(({ key, value }) => `${key}[${value}]`)
         .join('/');
 
       // set url
@@ -407,24 +400,23 @@ const Listing = React.createClass({
     }
   },
   getUrlWithParams: function (params) {
-    let base_url = (this.props.base_url !== undefined)
+    let baseUrl = (this.props.base_url !== undefined)
       ? this.props.base_url
       : null;
 
-    if (base_url !== null) {
+    if (baseUrl !== null) {
-      base_url = this.setBaseUrlParams(base_url);
+      baseUrl = this.setBaseUrlParams(baseUrl);
-      return `/${ base_url }/${ params }`;
+      return `/${baseUrl}/${params}`;
-    } else {
-      return `/${ params }`;
     }
+    return `/${params}`;
   },
-  setBaseUrlParams: function (base_url) {
+  setBaseUrlParams: function (baseUrl) {
-    let ret = base_url;
+    let ret = baseUrl;
     if (ret.indexOf(':') !== -1) {
       const params = this.getParams();
-      Object.keys(params).map((key) => {
+      Object.keys(params).forEach((key) => {
-        if (ret.indexOf(':'+key) !== -1) {
+        if (ret.indexOf(`:${key}`) !== -1) {
-          ret = ret.replace(':'+key, params[key]);
+          ret = ret.replace(`:${key}`, params[key]);
         }
       });
     }
@@ -489,9 +481,9 @@ const Listing = React.createClass({
           }
         });
       }).fail((response) => {
-        if(response.errors.length > 0) {
+        if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map((error) => { return error.message; }),
+            response.errors.map(error => error.message),
             { scroll: true }
           );
         }
@@ -514,14 +506,14 @@ const Listing = React.createClass({
     }).done((response) => {
       if (
         this.props.messages !== undefined
-        && this.props.messages['onRestore'] !== undefined
+        && this.props.messages.onRestore !== undefined
       ) {
         this.props.messages.onRestore(response);
       }
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map((error) => { return error.message; }),
+        response.errors.map(error => error.message),
         { scroll: true }
       );
     });
@@ -542,14 +534,14 @@ const Listing = React.createClass({
     }).done((response) => {
       if (
         this.props.messages !== undefined
-        && this.props.messages['onTrash'] !== undefined
+        && this.props.messages.onTrash !== undefined
       ) {
         this.props.messages.onTrash(response);
       }
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map((error) => { return error.message; }),
+        response.errors.map(error => error.message),
         { scroll: true }
       );
     });
@@ -570,14 +562,14 @@ const Listing = React.createClass({
     }).done((response) => {
       if (
         this.props.messages !== undefined
-        && this.props.messages['onDelete'] !== undefined
+        && this.props.messages.onDelete !== undefined
       ) {
         this.props.messages.onDelete(response);
       }
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map((error) => { return error.message; }),
+        response.errors.map(error => error.message),
         { scroll: true }
       );
     });
@@ -594,16 +586,16 @@ const Listing = React.createClass({
       this.handleGroup('all');
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map((error) => { return error.message; }),
+        response.errors.map(error => error.message),
         { scroll: true }
       );
     });
   },
-  handleBulkAction: function (selected_ids, params) {
+  handleBulkAction: function (selectedIds, params) {
     if (
       this.state.selection === false
       && this.state.selected_ids.length === 0
-      && selected_ids !== 'all'
+      && selectedIds !== 'all'
     ) {
       return false;
     }
@@ -619,8 +611,8 @@ const Listing = React.createClass({
       group: this.state.group,
       search: this.state.search,
     };
-    if (selected_ids !== 'all') {
+    if (selectedIds !== 'all') {
-      data.listing.selection = selected_ids;
+      data.listing.selection = selectedIds;
     }
 
     return MailPoet.Ajax.post({
@@ -631,9 +623,9 @@ const Listing = React.createClass({
     }).done(() => {
       this.getItems();
     }).fail((response) => {
-      if(response.errors.length > 0) {
+      if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map((error) => { return error.message; }),
+          response.errors.map(error => error.message),
           { scroll: true }
         );
       }
@@ -649,20 +641,20 @@ const Listing = React.createClass({
       this.setParams();
     });
   },
-  handleSort: function (sort_by, sort_order = 'asc') {
+  handleSort: function (sortBy, sortOrder = 'asc') {
     this.setState({
-      sort_by: sort_by,
+      sort_by: sortBy,
-      sort_order: (sort_order === 'asc') ? 'asc' : 'desc',
+      sort_order: (sortOrder === 'asc') ? 'asc' : 'desc',
     }, () => {
       this.setParams();
     });
   },
-  handleSelectItem: function (id, is_checked) {
+  handleSelectItem: function (id, isChecked) {
-    let selected_ids = this.state.selected_ids,
+    let selectedIds = this.state.selected_ids;
-      selection = false;
+    let selection = false;
 
-    if (is_checked) {
+    if (isChecked) {
-      selected_ids = jQuery.merge(selected_ids, [ id ]);
+      selectedIds = jQuery.merge(selectedIds, [id]);
       // check whether all items on the page are selected
       if (
         jQuery('tbody .check-column :checkbox:not(:checked)').length === 0
@@ -670,24 +662,22 @@ const Listing = React.createClass({
         selection = 'page';
       }
     } else {
-      selected_ids.splice(selected_ids.indexOf(id), 1);
+      selectedIds.splice(selectedIds.indexOf(id), 1);
     }
 
     this.setState({
       selection: selection,
-      selected_ids: selected_ids,
+      selected_ids: selectedIds,
     });
   },
-  handleSelectItems: function (is_checked) {
+  handleSelectItems: function (isChecked) {
-    if (is_checked === false) {
+    if (isChecked === false) {
       this.clearSelection();
     } else {
-      const selected_ids = this.state.items.map((item) => {
+      const selectedIds = this.state.items.map(item => Number(item.id));
-        return ~~item.id;
-      });
 
       this.setState({
-        selected_ids: selected_ids,
+        selected_ids: selectedIds,
         selection: 'page',
       });
     }
@@ -747,20 +737,20 @@ const Listing = React.createClass({
   },
   render: function () {
     const items = this.state.items;
-    const sort_by = this.state.sort_by;
+    const sortBy = this.state.sort_by;
-    const sort_order = this.state.sort_order;
+    const sortOrder = this.state.sort_order;
 
     // columns
     let columns = this.props.columns || [];
-    columns = columns.filter((column) => {
+    columns = columns.filter(
-      return (column.display === undefined || !!(column.display) === true);
+      column => (column.display === undefined || !!(column.display) === true)
-    });
+    );
 
     // bulk actions
-    let bulk_actions = this.props.bulk_actions || [];
+    let bulkActions = this.props.bulk_actions || [];
 
-    if (this.state.group === 'trash' && bulk_actions.length > 0) {
+    if (this.state.group === 'trash' && bulkActions.length > 0) {
-      bulk_actions = [
+      bulkActions = [
         {
           name: 'restore',
           label: MailPoet.I18n.t('restore'),
@@ -775,9 +765,9 @@ const Listing = React.createClass({
     }
 
     // item actions
-    const item_actions = this.props.item_actions || [];
+    const itemActions = this.props.item_actions || [];
 
-    const table_classes = classNames(
+    const tableClasses = classNames(
       'mailpoet_listing_table',
       'wp-list-table',
       'widefat',
@@ -789,8 +779,8 @@ const Listing = React.createClass({
     // search
     let search = (
       <ListingSearch
-        onSearch={ this.handleSearch }
+        onSearch={this.handleSearch}
-        search={ this.state.search }
+        search={this.state.search}
       />
     );
     if (this.props.search === false) {
@@ -800,9 +790,9 @@ const Listing = React.createClass({
     // groups
     let groups = (
       <ListingGroups
-        groups={ this.state.groups }
+        groups={this.state.groups}
-        group={ this.state.group }
+        group={this.state.group}
-        onSelectGroup={ this.handleGroup }
+        onSelectGroup={this.handleGroup}
       />
     );
     if (this.props.groups === false) {
@@ -821,81 +811,81 @@ const Listing = React.createClass({
         { search }
         <div className="tablenav top clearfix">
           <ListingBulkActions
-            count={ this.state.count }
+            count={this.state.count}
-            bulk_actions={ bulk_actions }
+            bulk_actions={bulkActions}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            onBulkAction={ this.handleBulkAction } />
+            onBulkAction={this.handleBulkAction} />
           <ListingFilters
-            filters={ this.state.filters }
+            filters={this.state.filters}
-            filter={ this.state.filter }
+            filter={this.state.filter}
-            group={ this.state.group }
+            group={this.state.group}
-            onBeforeSelectFilter={ this.props.onBeforeSelectFilter || null }
+            onBeforeSelectFilter={this.props.onBeforeSelectFilter || null}
-            onSelectFilter={ this.handleFilter }
+            onSelectFilter={this.handleFilter}
-            onEmptyTrash={ this.handleEmptyTrash }
+            onEmptyTrash={this.handleEmptyTrash}
           />
           <ListingPages
-            count={ this.state.count }
+            count={this.state.count}
-            page={ this.state.page }
+            page={this.state.page}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            onSetPage={ this.handleSetPage } />
+            onSetPage={this.handleSetPage} />
         </div>
-        <table className={ table_classes }>
+        <table className={tableClasses}>
           <thead>
             <ListingHeader
-              onSort={ this.handleSort }
+              onSort={this.handleSort}
-              onSelectItems={ this.handleSelectItems }
+              onSelectItems={this.handleSelectItems}
-              selection={ this.state.selection }
+              selection={this.state.selection}
-              sort_by={ sort_by }
+              sort_by={sortBy}
-              sort_order={ sort_order }
+              sort_order={sortOrder}
-              columns={ columns }
+              columns={columns}
-              is_selectable={ bulk_actions.length > 0 } />
+              is_selectable={bulkActions.length > 0} />
           </thead>
 
           <ListingItems
-            onRenderItem={ this.handleRenderItem }
+            onRenderItem={this.handleRenderItem}
-            onDeleteItem={ this.handleDeleteItem }
+            onDeleteItem={this.handleDeleteItem}
-            onRestoreItem={ this.handleRestoreItem }
+            onRestoreItem={this.handleRestoreItem}
-            onTrashItem={ this.handleTrashItem }
+            onTrashItem={this.handleTrashItem}
-            onRefreshItems={ this.handleRefreshItems }
+            onRefreshItems={this.handleRefreshItems}
-            columns={ columns }
+            columns={columns}
-            is_selectable={ bulk_actions.length > 0 }
+            is_selectable={bulkActions.length > 0}
-            onSelectItem={ this.handleSelectItem }
+            onSelectItem={this.handleSelectItem}
-            onSelectAll={ this.handleSelectAll }
+            onSelectAll={this.handleSelectAll}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            loading={ this.state.loading }
+            loading={this.state.loading}
-            group={ this.state.group }
+            group={this.state.group}
-            count={ this.state.count }
+            count={this.state.count}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            item_actions={ item_actions }
+            item_actions={itemActions}
-            messages={ messages }
+            messages={messages}
-            items={ items } />
+            items={items} />
 
           <tfoot>
             <ListingHeader
-              onSort={ this.handleSort }
+              onSort={this.handleSort}
-              onSelectItems={ this.handleSelectItems }
+              onSelectItems={this.handleSelectItems}
-              selection={ this.state.selection }
+              selection={this.state.selection}
-              sort_by={ sort_by }
+              sort_by={sortBy}
-              sort_order={ sort_order }
+              sort_order={sortOrder}
-              columns={ columns }
+              columns={columns}
-              is_selectable={ bulk_actions.length > 0 } />
+              is_selectable={bulkActions.length > 0} />
           </tfoot>
 
         </table>
         <div className="tablenav bottom">
           <ListingBulkActions
-            count={ this.state.count }
+            count={this.state.count}
-            bulk_actions={ bulk_actions }
+            bulk_actions={bulkActions}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            onBulkAction={ this.handleBulkAction } />
+            onBulkAction={this.handleBulkAction} />
           <ListingPages
-            count={ this.state.count }
+            count={this.state.count}
-            page={ this.state.page }
+            page={this.state.page}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            onSetPage={ this.handleSetPage } />
+            onSetPage={this.handleSetPage} />
         </div>
       </div>
     );

assets/js/src/listing/pages.jsx

@@ -7,7 +7,6 @@ define([
     classNames,
     MailPoet
   ) => {
-
   const ListingPages = React.createClass({
     getInitialState: function () {
       return {
@@ -38,10 +37,10 @@ define([
       );
     },
     constrainPage: function (page) {
-      return Math.min(Math.max(1, Math.abs(~~page)), this.getLastPage());
+      return Math.min(Math.max(1, Math.abs(Number(page))), this.getLastPage());
     },
     handleSetManualPage: function (e) {
-      if(e.which === 13) {
+      if (e.which === 13) {
         this.setPage(this.state.page);
       }
     },
@@ -57,127 +56,127 @@ define([
       return Math.ceil(this.props.count / this.props.limit);
     },
     render: function () {
-      if(this.props.count === 0) {
+      if (this.props.count === 0) {
         return false;
-      } else {
+      }
-        let pagination = false;
+      let pagination = false;
-        let firstPage = (
+      let firstPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">«</span>
+        <span aria-hidden="true" className="tablenav-pages-navspan">«</span>
         );
-        let previousPage = (
+      let previousPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">‹</span>
+        <span aria-hidden="true" className="tablenav-pages-navspan">‹</span>
         );
-        let nextPage = (
+      let nextPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">›</span>
+        <span aria-hidden="true" className="tablenav-pages-navspan">›</span>
         );
-        let lastPage = (
+      let lastPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">»</span>
+        <span aria-hidden="true" className="tablenav-pages-navspan">»</span>
         );
 
-        if(this.props.limit > 0 && this.props.count > this.props.limit) {
+      if (this.props.limit > 0 && this.props.count > this.props.limit) {
-          if(this.props.page > 1) {
+        if (this.props.page > 1) {
-            previousPage = (
+          previousPage = (
-              <a href="javascript:;"
+            <a href="javascript:;"
-                onClick={ this.setPreviousPage }
+              onClick={this.setPreviousPage}
-                className="prev-page">
+              className="prev-page">
-                <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
+              <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
-                <span aria-hidden="true">‹</span>
+              <span aria-hidden="true">‹</span>
-              </a>
+            </a>
             );
-          }
-
-          if(this.props.page > 2) {
-            firstPage = (
-              <a href="javascript:;"
-                onClick={ this.setFirstPage }
-                className="first-page">
-                <span className="screen-reader-text">{MailPoet.I18n.t('firstPage')}</span>
-                <span aria-hidden="true">«</span>
-              </a>
-            );
-          }
-
-          if(this.props.page < this.getLastPage()) {
-            nextPage = (
-              <a href="javascript:;"
-                onClick={ this.setNextPage }
-                className="next-page">
-                <span className="screen-reader-text">{MailPoet.I18n.t('nextPage')}</span>
-                <span aria-hidden="true">›</span>
-              </a>
-            );
-          }
-
-          if(this.props.page < this.getLastPage() - 1) {
-            lastPage = (
-              <a href="javascript:;"
-                onClick={ this.setLastPage }
-                className="last-page">
-                <span className="screen-reader-text">{MailPoet.I18n.t('lastPage')}</span>
-                <span aria-hidden="true">»</span>
-              </a>
-            );
-          }
-
-          let pageValue =  this.props.page;
-          if(this.state.page !== null) {
-            pageValue = this.state.page;
-          }
-
-          pagination = (
-            <span className="pagination-links">
-              {firstPage}
-              &nbsp;
-              {previousPage}
-              &nbsp;
-              <span className="paging-input">
-                <label
-                  className="screen-reader-text"
-                  htmlFor="current-page-selector">{MailPoet.I18n.t('currentPage')}</label>
-                <input
-                  type="text"
-                  onChange={ this.handleChangeManualPage }
-                  onKeyUp={ this.handleSetManualPage }
-                  onBlur={ this.handleBlurManualPage }
-                  aria-describedby="table-paging"
-                  size="2"
-                  ref="page"
-                  value={ pageValue }
-                  name="paged"
-                  id="current-page-selector"
-                  className="current-page" />
-                &nbsp;{MailPoet.I18n.t('pageOutOf')}&nbsp;
-                <span className="total-pages">
-                  {Math.ceil(this.props.count / this.props.limit).toLocaleString()}
-                </span>
-              </span>
-              &nbsp;
-              {nextPage}
-              &nbsp;
-              {lastPage}
-            </span>
-          );
         }
 
-        const classes = classNames(
+        if (this.props.page > 2) {
+          firstPage = (
+            <a href="javascript:;"
+              onClick={this.setFirstPage}
+              className="first-page">
+              <span className="screen-reader-text">{MailPoet.I18n.t('firstPage')}</span>
+              <span aria-hidden="true">«</span>
+            </a>
+            );
+        }
+
+        if (this.props.page < this.getLastPage()) {
+          nextPage = (
+            <a href="javascript:;"
+              onClick={this.setNextPage}
+              className="next-page">
+              <span className="screen-reader-text">{MailPoet.I18n.t('nextPage')}</span>
+              <span aria-hidden="true">›</span>
+            </a>
+            );
+        }
+
+        if (this.props.page < this.getLastPage() - 1) {
+          lastPage = (
+            <a href="javascript:;"
+              onClick={this.setLastPage}
+              className="last-page">
+              <span className="screen-reader-text">{MailPoet.I18n.t('lastPage')}</span>
+              <span aria-hidden="true">»</span>
+            </a>
+            );
+        }
+
+        let pageValue = this.props.page;
+        if (this.state.page !== null) {
+          pageValue = this.state.page;
+        }
+
+        pagination = (
+          <span className="pagination-links">
+            {firstPage}
+              &nbsp;
+            {previousPage}
+              &nbsp;
+            <span className="paging-input">
+              <label
+                className="screen-reader-text"
+                htmlFor="current-page-selector">{MailPoet.I18n.t('currentPage')}</label>
+              <input
+                type="text"
+                onChange={this.handleChangeManualPage}
+                onKeyUp={this.handleSetManualPage}
+                onBlur={this.handleBlurManualPage}
+                aria-describedby="table-paging"
+                size="2"
+                ref="page"
+                value={pageValue}
+                name="paged"
+                id="current-page-selector"
+                className="current-page" />
+              {MailPoet.I18n.t('pageOutOf')}&nbsp;
+              <span className="total-pages">
+                {Math.ceil(this.props.count / this.props.limit).toLocaleString()}
+              </span>
+            </span>
+              &nbsp;
+            {nextPage}
+              &nbsp;
+            {lastPage}
+          </span>
+          );
+      }
+
+      const classes = classNames(
           'tablenav-pages',
           { 'one-page': (this.props.count <= this.props.limit) }
         );
 
-        let numberOfItemsLabel;
+      let numberOfItemsLabel;
-        if (this.props.count == 1) {
+      if (Number(this.props.count) === 1) {
-          numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsSingular');
+        numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsSingular');
-        } else {
+      } else {
-          numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsMultiple')
+        numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsMultiple')
-            .replace('%$1d', this.props.count.toLocaleString());
+          .replace('%$1d', parseInt(this.props.count, 10).toLocaleString());
-        }
-        return (
-          <div className={ classes }>
-            <span className="displaying-num">{ numberOfItemsLabel }</span>
-            { pagination }
-          </div>
-        );
       }
+
+      return (
+        <div className={classes}>
+          <span className="displaying-num">{ numberOfItemsLabel }</span>
+          { pagination }
+        </div>
+      );
     },
   });
 

assets/js/src/listing/search.jsx

@@ -5,41 +5,39 @@ define([
     MailPoet,
     React
   ) => {
-
   const ListingSearch = React.createClass({
     handleSearch: function (e) {
       e.preventDefault();
       this.props.onSearch(
-        this.refs.search.value
+        this.refs.search.value.trim()
       );
     },
     componentWillReceiveProps: function (nextProps) {
       this.refs.search.value = nextProps.search;
     },
     render: function () {
-      if(this.props.search === false) {
+      if (this.props.search === false) {
         return false;
-      } else {
-        return (
-          <form name="search" onSubmit={this.handleSearch}>
-            <p className="search-box">
-              <label htmlFor="search_input" className="screen-reader-text">
-                {MailPoet.I18n.t('searchLabel')}
-              </label>
-              <input
-                type="search"
-                id="search_input"
-                ref="search"
-                name="s"
-                defaultValue={this.props.search} />
-              <input
-                type="submit"
-                defaultValue={MailPoet.I18n.t('searchLabel')}
-                className="button" />
-            </p>
-          </form>
-        );
       }
+      return (
+        <form name="search" onSubmit={this.handleSearch}>
+          <p className="search-box">
+            <label htmlFor="search_input" className="screen-reader-text">
+              {MailPoet.I18n.t('searchLabel')}
+            </label>
+            <input
+              type="search"
+              id="search_input"
+              ref="search"
+              name="s"
+              defaultValue={this.props.search} />
+            <input
+              type="submit"
+              defaultValue={MailPoet.I18n.t('searchLabel')}
+              className="button" />
+          </p>
+        </form>
+      );
     },
   });
 

assets/js/src/mailpoet.js

@@ -1,4 +1,4 @@
-define('mailpoet', [], function() {
+define('mailpoet', [], function mailpoet() {
   // A placeholder for MailPoet object
   var MailPoet = {};
 

assets/js/src/modal.js

@@ -1,9 +1,10 @@
+/* eslint-disable func-names */
 define('modal', ['mailpoet', 'jquery'],
-  function(mp, jQuery) {
+  function (mp, jQuery) {
     'use strict';
 
     var MailPoet = mp;
-    /***************************************************************************
+    /** *************************************************************************
     MailPoet Modal:
 
       version: 0.9
@@ -20,7 +21,7 @@ define('modal', ['mailpoet', 'jquery'],
 
       // loading mode
       MailPoet.Modal.loading(bool);
-    ***************************************************************************/
+    ************************************************************************** */
 
     MailPoet.Modal = {
       version: 0.9,
@@ -79,44 +80,44 @@ define('modal', ['mailpoet', 'jquery'],
       options: {},
       templates: {
         overlay: '<div id="mailpoet_modal_overlay" style="display:none;"></div>',
-        popup: '<div id="mailpoet_popup" tabindex="-1">'+
+        popup: '<div id="mailpoet_popup" tabindex="-1">' +
-        '<div class="mailpoet_popup_wrapper">'+
+        '<div class="mailpoet_popup_wrapper">' +
-        '<a href="javascript:;" id="mailpoet_modal_close"></a>'+
+        '<a href="javascript:;" id="mailpoet_modal_close"></a>' +
-        '<div id="mailpoet_popup_title"><h2></h2></div>'+
+        '<div id="mailpoet_popup_title"><h2></h2></div>' +
-        '<div class="mailpoet_popup_body clearfix"></div>'+
+        '<div class="mailpoet_popup_body clearfix"></div>' +
-        '</div>'+
+        '</div>' +
         '</div>',
-        loading: '<div id="mailpoet_loading" style="display:none;">'+
+        loading: '<div id="mailpoet_loading" style="display:none;">' +
-        '<div id="mailpoet_modal_loading_1" class="mailpoet_modal_loading"></div>'+
+        '<div id="mailpoet_modal_loading_1" class="mailpoet_modal_loading"></div>' +
-        '<div id="mailpoet_modal_loading_2" class="mailpoet_modal_loading"></div>'+
+        '<div id="mailpoet_modal_loading_2" class="mailpoet_modal_loading"></div>' +
-        '<div id="mailpoet_modal_loading_3" class="mailpoet_modal_loading"></div>'+
+        '<div id="mailpoet_modal_loading_3" class="mailpoet_modal_loading"></div>' +
         '</div>',
-        panel: '<div id="mailpoet_panel">'+
+        panel: '<div id="mailpoet_panel">' +
-        '<a href="javascript:;" id="mailpoet_modal_close"></a>'+
+        '<a href="javascript:;" id="mailpoet_modal_close"></a>' +
-        '<div class="mailpoet_panel_wrapper" tabindex="-1">'+
+        '<div class="mailpoet_panel_wrapper" tabindex="-1">' +
-        '<div class="mailpoet_panel_body clearfix"></div>'+
+        '<div class="mailpoet_panel_body clearfix"></div>' +
-        '</div>'+
+        '</div>' +
         '</div>',
-        subpanel: '<div class="mailpoet_panel_wrapper" tabindex="-1">'+
+        subpanel: '<div class="mailpoet_panel_wrapper" tabindex="-1">' +
-        '<div class="mailpoet_panel_body clearfix"></div>'+
+        '<div class="mailpoet_panel_body clearfix"></div>' +
         '</div>'
       },
-      getContentContainer: function() {
+      getContentContainer: function () {
-        return jQuery('.mailpoet_'+this.options.type+'_body');
+        return jQuery('.mailpoet_' + this.options.type + '_body');
       },
-      setRenderer: function(renderer) {
+      setRenderer: function (renderer) {
         this.renderer = renderer;
         return this;
       },
-      compileTemplate: function(template) {
+      compileTemplate: function (template) {
-        if(this.renderer === 'html') {
+        if (this.renderer === 'html') {
-          return function() { return template; };
+          return function () { return template; };
-        } else {
-          return window.Handlebars.compile(template);
         }
+        return window.Handlebars.compile(template);
       },
-      init: function(options) {
+      init: function (options) {
-        if(this.initialized === true) {
+        var modal;
+        if (this.initialized === true) {
           this.close();
         }
         // merge options
@@ -131,10 +132,10 @@ define('modal', ['mailpoet', 'jquery'],
         // toggle overlay
         this.toggleOverlay(this.options.overlay);
 
-        if(this.options.type !== null) {
+        if (this.options.type !== null) {
           // insert modal depending on its type
-          if(this.options.type === 'popup') {
+          if (this.options.type === 'popup') {
-            var modal = this.compileTemplate(
+            modal = this.compileTemplate(
               this.templates[this.options.type]
             );
             // create modal
@@ -143,7 +144,7 @@ define('modal', ['mailpoet', 'jquery'],
             // set title
             jQuery('#mailpoet_popup_title h2')
               .html(this.options.title);
-          } else if(this.options.type === 'panel') {
+          } else if (this.options.type === 'panel') {
             // create panel
             jQuery('#mailpoet_modal_overlay')
               .after(this.templates[this.options.type]);
@@ -152,16 +153,16 @@ define('modal', ['mailpoet', 'jquery'],
           // add proper overlay class
           jQuery('#mailpoet_modal_overlay')
             .removeClass('mailpoet_popup_overlay mailpoet_panel_overlay')
-            .addClass('mailpoet_'+this.options.type+'_overlay');
+            .addClass('mailpoet_' + this.options.type + '_overlay');
         }
 
         // set "success" callback if specified
-        if(options.onSuccess !== undefined) {
+        if (options.onSuccess !== undefined) {
           this.options.onSuccess = options.onSuccess;
         }
 
         // set "cancel" callback if specified
-        if(options.onCancel !== undefined) {
+        if (options.onCancel !== undefined) {
           this.options.onCancel = options.onCancel;
         }
 
@@ -178,8 +179,8 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      initOverlay: function(toggle) {
+      initOverlay: function () {
-        if(jQuery('#mailpoet_modal_overlay').length === 0) {
+        if (jQuery('#mailpoet_modal_overlay').length === 0) {
             // insert overlay into the DOM
           jQuery('body').append(this.templates.overlay);
             // insert loading indicator into overlay
@@ -187,8 +188,8 @@ define('modal', ['mailpoet', 'jquery'],
         }
         return this;
       },
-      toggleOverlay: function(toggle) {
+      toggleOverlay: function (toggle) {
-        if(toggle === true) {
+        if (toggle === true) {
           jQuery('#mailpoet_modal_overlay')
               .removeClass('mailpoet_overlay_hidden');
         } else {
@@ -198,77 +199,78 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      setupEvents: function() {
+      setupEvents: function () {
         // close popup when user clicks on close button
         jQuery('#mailpoet_modal_close').on('click', this.cancel.bind(this));
 
         // close popup when user clicks on overlay
-        jQuery('#mailpoet_modal_overlay').on('click', function(e) {
+        jQuery('#mailpoet_modal_overlay').on('click', function (e) {
           // we need to make sure that we are actually clicking on the overlay
           // because when clicking on the popup content, it will trigger
           // the click event on the overlay
-          if(e.target.id === 'mailpoet_modal_overlay') { this.cancel(); }
+          if (e.target.id === 'mailpoet_modal_overlay') { this.cancel(); }
         }.bind(this));
 
         // close popup when user presses ESC key
-        jQuery(document).on('keyup.mailpoet_modal', function(e) {
+        jQuery(document).on('keyup.mailpoet_modal', function (e) {
-          if(this.opened === false) { return false; }
+          if (this.opened === false) { return false; }
-          if(e.keyCode === 27) { this.cancel(); }
+          if (e.keyCode === 27) { this.cancel(); }
+          return true;
         }.bind(this));
 
         // make sure the popup is repositioned when the window is resized
-        jQuery(window).on('resize.mailpoet_modal', function() {
+        jQuery(window).on('resize.mailpoet_modal', function () {
           this.setPosition();
         }.bind(this));
 
         return this;
       },
-      removeEvents: function() {
+      removeEvents: function () {
         jQuery(document).unbind('keyup.mailpoet_modal');
         jQuery(window).unbind('resize.mailpoet_modal');
         jQuery('#mailpoet_modal_close').off('click');
-        if(this.options.overlay === true) {
+        if (this.options.overlay === true) {
           jQuery('#mailpoet_modal_overlay').off('click');
         }
 
         return this;
       },
-      lock: function() {
+      lock: function () {
         this.locked = true;
 
         return this;
       },
-      unlock: function() {
+      unlock: function () {
         this.locked = false;
 
         return this;
       },
-      isLocked: function() {
+      isLocked: function () {
         return this.locked;
       },
-      loadTemplate: function() {
+      loadTemplate: function () {
-        if(this.subpanels.length > 0) {
+        if (this.subpanels.length > 0) {
             // hide panel
-          jQuery('.mailpoet_'+this.options.type+'_wrapper').hide();
+          jQuery('.mailpoet_' + this.options.type + '_wrapper').hide();
 
             // add sub panel wrapper
-          jQuery('#mailpoet_'+this.options.type)
+          jQuery('#mailpoet_' + this.options.type)
-              .append(this.templates['subpanel']);
+              .append(this.templates.subpanel);
 
             // add sub panel content
-          jQuery('.mailpoet_'+this.options.type+'_body').last()
+          jQuery('.mailpoet_' + this.options.type + '_body').last()
               .html(this.subpanels[(this.subpanels.length - 1)].element);
 
             // focus on sub panel
-          if(this.options.focus) {
+          if (this.options.focus) {
             this.focus();
           }
         } else if (this.options.element) {
-          jQuery('.mailpoet_'+this.options.type+'_body').empty();
+          jQuery('.mailpoet_' + this.options.type + '_body').empty();
-          jQuery('.mailpoet_'+this.options.type+'_body')
+          jQuery('.mailpoet_' + this.options.type + '_body')
               .append(this.options.element);
         } else {
-          jQuery('.mailpoet_'+this.options.type+'_body')
+          jQuery('.mailpoet_' + this.options.type + '_body')
               .html(
                 this.options.body_template(
                   this.options.data
@@ -278,11 +280,11 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      loadUrl: function() {
+      loadUrl: function () {
-        if(this.options.method === 'get') {
+        if (this.options.method === 'get') {
             // make ajax request
           jQuery.getJSON(this.options.url,
-              function(data) {
+              function (data) {
                 this.options.data = jQuery.extend({}, this.options.data, data);
                 // load template using fetched data
                 this.loadTemplate();
@@ -290,10 +292,10 @@ define('modal', ['mailpoet', 'jquery'],
                 this.showModal();
               }.bind(this)
             );
-        } else if(this.options.method === 'post') {
+        } else if (this.options.method === 'post') {
             // make ajax request
           jQuery.post(this.options.url, JSON.stringify(this.options.params),
-              function(data) {
+              function (data) {
                 this.options.data = jQuery.extend({}, this.options.data, data);
                 // load template using fetched data
                 this.loadTemplate();
@@ -306,8 +308,8 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      setDimensions: function() {
+      setDimensions: function () {
-        switch(this.options.type) {
+        switch (this.options.type) {
           case 'popup':
               // set popup dimensions
             jQuery('#mailpoet_popup').css({
@@ -321,14 +323,14 @@ define('modal', ['mailpoet', 'jquery'],
             break;
           case 'panel':
               // set dimensions
-            if(this.options.position === 'right') {
+            if (this.options.position === 'right') {
               jQuery('#mailpoet_panel').css({
                 width: this.options.width,
                 right: 0,
                 marginRight: '-' + this.options.width,
                 left: 'auto'
               });
-            } else if(this.options.position === 'left') {
+            } else if (this.options.position === 'left') {
               jQuery('#mailpoet_panel').css({
                 width: this.options.width,
                 left: 0,
@@ -342,31 +344,32 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      setPosition: function() {
+      setPosition: function () {
-        switch(this.options.type) {
+        var screenWidth;
+        var screenHeight;
+        var modalWidth;
+        var modalHeight;
+        switch (this.options.type) {
           case 'popup':
-            var screenWidth = jQuery(window).width(),
+            screenWidth = jQuery(window).width();
-              screenHeight = jQuery(window).height(),
+            screenHeight = jQuery(window).height();
-              modalWidth = jQuery('.mailpoet_'+ this.options.type +'_wrapper').width(),
+            modalWidth = jQuery('.mailpoet_'+ this.options.type +'_wrapper').width();
-              modalHeight = jQuery('.mailpoet_'+ this.options.type +'_wrapper').height();
+            modalHeight = jQuery('.mailpoet_'+ this.options.type +'_wrapper').height();
 
-            var top = Math.max(48, parseInt((screenHeight / 2) - (modalHeight / 2))),
+            // set position of popup depending on screen dimensions.
-              left = Math.max(0, parseInt((screenWidth / 2) - (modalWidth / 2)));
-
-              // set position of popup depending on screen dimensions.
             jQuery('#mailpoet_popup').css({
-              top: top,
+              top: Math.max(48, parseInt((screenHeight / 2) - (modalHeight / 2))),
-              left: left
+              left: Math.max(0, parseInt((screenWidth / 2) - (modalWidth / 2)))
             });
             break;
           case 'panel':
-            setTimeout(function() {
+            setTimeout(function () {
                 // set position of popup depending on screen dimensions.
-              if(this.options.position === 'right') {
+              if (this.options.position === 'right') {
                 jQuery('#mailpoet_panel').css({
                   marginRight: 0
                 });
-              } else if(this.options.position === 'left') {
+              } else if (this.options.position === 'left') {
                 jQuery('#mailpoet_panel').css({
                   marginLeft: 0
                 });
@@ -377,18 +380,15 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      showModal: function() {
+      showModal: function () {
           // set modal dimensions
         this.setDimensions();
 
           // remember the previously focused element
         this.prevFocus = jQuery(':focus');
 
-          // add a flag on the body so that we can prevent scrolling
-        jQuery('body').addClass('mailpoet_modal_opened');
-
           // show popup
-        jQuery('#mailpoet_'+this.options.type).show();
+        jQuery('#mailpoet_' + this.options.type).show();
 
           // display overlay
         this.showOverlay();
@@ -397,13 +397,13 @@ define('modal', ['mailpoet', 'jquery'],
         this.setPosition();
 
           // add class on highlighted elements
-        if(this.options.highlight !== null) {
+        if (this.options.highlight !== null) {
-          if(this.options.highlight.length > 0) {
+          if (this.options.highlight.length > 0) {
             this.highlightOn(this.options.highlight);
           }
         }
 
-        if(this.options.focus) {
+        if (this.options.focus) {
           this.focus();
         }
 
@@ -411,55 +411,52 @@ define('modal', ['mailpoet', 'jquery'],
         this.opened = true;
 
           // trigger init event if specified
-        if(this.options.onInit !== null) {
+        if (this.options.onInit !== null) {
           this.options.onInit(this);
         }
 
         return this;
       },
-      focus: function() {
+      focus: function () {
-        if(this.options.type == 'popup') {
+        if (this.options.type == 'popup') {
-          jQuery('#mailpoet_'+this.options.type).focus();
+          jQuery('#mailpoet_' + this.options.type).focus();
         } else {
             // panel and subpanel
-          jQuery('#mailpoet_'+this.options.type+' .mailpoet_panel_wrapper')
+          jQuery('#mailpoet_' + this.options.type + ' .mailpoet_panel_wrapper')
               .filter(':visible').focus();
         }
         return this;
       },
-      highlightOn: function(element) {
+      highlightOn: function (element) {
         jQuery(element).addClass('mailpoet_modal_highlight');
         return this;
       },
-      highlightOff: function() {
+      highlightOff: function () {
         jQuery('.mailpoet_modal_highlight')
             .removeClass('mailpoet_modal_highlight');
         return this;
       },
-      hideModal: function(callback) {
+      hideModal: function () {
           // set modal as closed
         this.opened = false;
 
           // hide modal
-        jQuery('#mailpoet_'+this.options.type).hide();
+        jQuery('#mailpoet_' + this.options.type).hide();
 
            // remove class on highlighted elements
         this.highlightOff();
 
-          // remove class from body to let it be scrollable
-        jQuery('body').removeClass('mailpoet_modal_opened');
-
         return this;
       },
-      showOverlay: function(force) {
+      showOverlay: function () {
         jQuery('#mailpoet_modal_overlay').show();
         return this;
       },
-      hideOverlay: function() {
+      hideOverlay: function () {
         jQuery('#mailpoet_modal_overlay').hide();
         return this;
       },
-      popup: function(opts) {
+      popup: function (opts) {
           // get options
         var options = opts || {};
           // set modal type
@@ -473,7 +470,7 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      panel: function(opts) {
+      panel: function (opts) {
           // get options
         var options = opts || {};
           // reset subpanels
@@ -494,8 +491,8 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      subpanel: function(options) {
+      subpanel: function (options) {
-        if(this.opened === false) {
+        if (this.opened === false) {
             // if no panel is already opened, let's create one instead
           this.panel(options);
         } else {
@@ -506,11 +503,11 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      loading: function(toggle) {
+      loading: function (toggle) {
           // make sure the overlay is initialized and that it's visible
         this.initOverlay(true);
 
-        if(toggle === true) {
+        if (toggle === true) {
           this.showLoading();
         } else {
           this.hideLoading();
@@ -518,7 +515,7 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      showLoading: function() {
+      showLoading: function () {
         jQuery('#mailpoet_loading').show();
 
           // add loading class to overlay
@@ -527,7 +524,7 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      hideLoading: function() {
+      hideLoading: function () {
         jQuery('#mailpoet_loading').hide();
 
           // remove loading class from overlay
@@ -536,11 +533,11 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      open: function() {
+      open: function () {
           // load template if specified
-        if(this.options.template !== null) {
+        if (this.options.template !== null) {
             // check if a url was specified to get extra data
-          if(this.options.url !== null) {
+          if (this.options.url !== null) {
             this.loadUrl();
           } else {
               // load template
@@ -555,13 +552,13 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      success: function() {
+      success: function () {
-        if(this.subpanels.length > 0) {
+        if (this.subpanels.length > 0) {
-          if(this.subpanels[(this.subpanels.length - 1)].onSuccess !== undefined) {
+          if (this.subpanels[(this.subpanels.length - 1)].onSuccess !== undefined) {
             this.subpanels[(this.subpanels.length - 1)].onSuccess(this.subpanels[(this.subpanels.length - 1)].data);
           }
         } else {
-          if(this.options.onSuccess !== null) {
+          if (this.options.onSuccess !== null) {
             this.options.onSuccess(this.options.data);
           }
         }
@@ -569,13 +566,13 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      cancel: function() {
+      cancel: function () {
-        if(this.subpanels.length > 0) {
+        if (this.subpanels.length > 0) {
-          if(this.subpanels[(this.subpanels.length - 1)].onCancel !== undefined) {
+          if (this.subpanels[(this.subpanels.length - 1)].onCancel !== undefined) {
             this.subpanels[(this.subpanels.length - 1)].onCancel(this.subpanels[(this.subpanels.length - 1)].data);
           }
         } else {
-          if(this.options.onCancel !== null) {
+          if (this.options.onCancel !== null) {
             this.options.onCancel(this.options.data);
           }
         }
@@ -583,33 +580,33 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      destroy: function() {
+      destroy: function () {
         this.hideOverlay();
 
           // remove extra modal
-        if(jQuery('#mailpoet_'+this.options.type).length > 0) {
+        if (jQuery('#mailpoet_' + this.options.type).length > 0) {
-          jQuery('#mailpoet_'+this.options.type).remove();
+          jQuery('#mailpoet_' + this.options.type).remove();
         }
 
         this.initialized = false;
 
         return this;
       },
-      close: function() {
+      close: function () {
-        if(this.isLocked() === true) { return this; }
+        if (this.isLocked() === true) { return this; }
 
-        if(this.subpanels.length > 0) {
+        if (this.subpanels.length > 0) {
             // close subpanel
-          jQuery('.mailpoet_'+this.options.type+'_wrapper').last().remove();
+          jQuery('.mailpoet_' + this.options.type + '_wrapper').last().remove();
 
             // show previous panel
-          jQuery('.mailpoet_'+this.options.type+'_wrapper').last().show();
+          jQuery('.mailpoet_' + this.options.type + '_wrapper').last().show();
 
             // remove last subpanels
           this.subpanels.pop();
 
             // focus on previous panel
-          if(this.options.focus) {
+          if (this.options.focus) {
             this.focus();
           }
 
@@ -626,7 +623,7 @@ define('modal', ['mailpoet', 'jquery'],
         this.destroy();
 
           // restore the previously focused element
-        if(this.prevFocus !== undefined){
+        if (this.prevFocus !== undefined) {
           this.prevFocus.focus();
         }
 

assets/js/src/mp2migrator.js

@@ -1,4 +1,5 @@
-define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
+/* eslint-disable func-names */
+define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
   'use strict';
 
   var MailPoet = mp;
@@ -32,20 +33,19 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
         jQuery('#logger').html('');
         result.split('\n').forEach(function (resultRow) {
           var row = resultRow;
-          if(row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === MailPoet.I18n.t('import_stopped_by_user')) {
+          if (row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === MailPoet.I18n.t('import_stopped_by_user')) {
             row = '<span class="error_msg">' + row + '</span>'; // Mark the errors in red
           }
           // Test if the import is complete
-          else if(row === MailPoet.I18n.t('import_complete')) {
+          else if (row === MailPoet.I18n.t('import_complete')) {
             jQuery('#import-actions').hide();
             jQuery('#upgrade-completed').show();
           }
           jQuery('#logger').append(row + '<br />\n');
-
         });
         jQuery('#logger').append('<span class="error_msg">' + MailPoet.MP2Migrator.fatal_error + '</span>' + '<br />\n');
       }).always(function () {
-        if(MailPoet.MP2Migrator.is_logging) {
+        if (MailPoet.MP2Migrator.is_logging) {
           MailPoet.MP2Migrator.displayLogs_timeout = setTimeout(MailPoet.MP2Migrator.displayLogs, 1000);
         }
       });
@@ -59,17 +59,17 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
       }).always(function (result) {
         // Move the progress bar
         var progress = 0;
-        if((result.total !== undefined) && (Number(result.total) !== 0)) {
+        if ((result.total !== undefined) && (Number(result.total) !== 0)) {
           progress = Math.round(Number(result.current) / Number(result.total) * 100);
         }
         jQuery('#progressbar').progressbar('option', 'value', progress);
         jQuery('#progresslabel').html(progress + '%');
-        if(Number(result.current) !== 0) {
+        if (Number(result.current) !== 0) {
           jQuery('#skip-import').hide();
           jQuery('#progressbar').show();
           jQuery('#logger-container').show();
         }
-        if(MailPoet.MP2Migrator.is_logging) {
+        if (MailPoet.MP2Migrator.is_logging) {
           MailPoet.MP2Migrator.updateProgressbar_timeout = setTimeout(MailPoet.MP2Migrator.updateProgressbar, 1000);
         }
       });
@@ -100,16 +100,16 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
         MailPoet.MP2Migrator.updateDisplay(); // Get the latest information after the import was stopped
         MailPoet.MP2Migrator.reactivateImportButton();
       }).done(function (response) {
-        if(response) {
+        if (response) {
           MailPoet.MP2Migrator.fatal_error = response.data;
         }
       }).fail(function (response) {
-        if(response.errors.length > 0) {
+        if (response.errors.length > 0) {
           MailPoet.Notice.error(
             response.errors.map(function (error) {
               return error.message;
             }),
-            {scroll: true}
+            { scroll: true }
           );
         }
       });
@@ -135,12 +135,12 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
         MailPoet.MP2Migrator.reactivateImportButton();
         MailPoet.MP2Migrator.updateDisplay(); // Get the latest information after the import was stopped
       }).fail(function (response) {
-        if(response.errors.length > 0) {
+        if (response.errors.length > 0) {
           MailPoet.Notice.error(
             response.errors.map(function (error) {
               return error.message;
             }),
-            {scroll: true}
+            { scroll: true }
           );
         }
       });
@@ -158,12 +158,12 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
       }).done(function () {
         MailPoet.MP2Migrator.gotoWelcomePage();
       }).fail(function (response) {
-        if(response.errors.length > 0) {
+        if (response.errors.length > 0) {
           MailPoet.Notice.error(
             response.errors.map(function (error) {
               return error.message;
             }),
-            {scroll: true}
+            { scroll: true }
           );
         }
       });
@@ -176,35 +176,34 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(mp, jQuery) {
     }
 
   };
-  
+
   /**
    * Actions to run when the DOM is ready
    */
   jQuery(function () {
-    jQuery('#progressbar').progressbar({value: 0});
+    jQuery('#progressbar').progressbar({ value: 0 });
 
     // Import button
-    jQuery('#import').click(function() {
+    jQuery('#import').click(function () {
       MailPoet.MP2Migrator.startImport();
     });
-      
+
     // Stop import button
-    jQuery('#stop-import').click(function() {
+    jQuery('#stop-import').click(function () {
       MailPoet.MP2Migrator.stopImport();
     });
 
     // Skip import link
-    jQuery('#skip-import').click(function() {
+    jQuery('#skip-import').click(function () {
       MailPoet.MP2Migrator.skipImport();
     });
 
     // Go to welcome page
-    jQuery('#goto-welcome').click(function() {
+    jQuery('#goto-welcome').click(function () {
       MailPoet.MP2Migrator.gotoWelcomePage();
     });
-    
+
     // Update the display
     MailPoet.MP2Migrator.updateDisplay();
   });
-
 });

assets/js/src/newsletter_editor/App.js

@@ -1,12 +1,8 @@
 define([
   'backbone',
   'backbone.marionette',
-  'backbone.radio',
+  'backbone.radio'
-  'jquery',
+], function (Backbone, Marionette, BackboneRadio) { // eslint-disable-line func-names
-  'underscore',
-  'handlebars',
-  'handlebars_helpers'
-], function(Backbone, Marionette, BackboneRadio, jQuery, _, Handlebars) {
   var Radio = BackboneRadio;
 
   var AppView = Marionette.View.extend({
@@ -23,12 +19,12 @@ define([
   var EditorApplication = Marionette.Application.extend({
     region: '#mailpoet_editor',
 
-    onStart: function() {
+    onStart: function () { // eslint-disable-line func-names
       this._appView = new AppView();
       this.showView(this._appView);
     },
 
-    getChannel: function(channel) {
+    getChannel: function (channel) { // eslint-disable-line func-names
       if (channel === undefined) {
         return Radio.channel('global');
       }
@@ -40,5 +36,4 @@ define([
   window.EditorApplication = app;
 
   return app;
-
 });

assets/js/src/newsletter_editor/behaviors/BehaviorsLookup.js

@@ -6,10 +6,10 @@
  */
 define([
   'backbone.marionette'
-], function(BackboneMarionette) {
+], function (BackboneMarionette) { // eslint-disable-line func-names
   var Marionette = BackboneMarionette;
   var BehaviorsLookup = {};
-  Marionette.Behaviors.behaviorsLookup = function() {
+  Marionette.Behaviors.behaviorsLookup = function () { // eslint-disable-line func-names
     return BehaviorsLookup;
   };
 

assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js

@@ -8,17 +8,17 @@ define([
   'newsletter_editor/behaviors/BehaviorsLookup',
   'mailpoet',
   'spectrum'
-], function(Marionette, BehaviorsLookup, MailPoet, Spectrum) {
+], function (Marionette, BehaviorsLookup, MailPoet) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.ColorPickerBehavior = Marionette.Behavior.extend({
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
-      var that = this, 
+      var that = this;
-        preferredFormat = 'hex6';
+      var preferredFormat = 'hex6';
-      this.view.$('.mailpoet_color').each(function () {
+      this.view.$('.mailpoet_color').each(function () { // eslint-disable-line func-names
         var $input = that.view.$(this);
-        var updateColorInput = function(color) {
+        var updateColorInput = function (color) { // eslint-disable-line func-names
-          if(color && color.getAlpha() > 0) {
+          if (color && color.getAlpha() > 0) {
             $input.val(color.toString(preferredFormat));
           } else {
             $input.val('');
@@ -41,7 +41,7 @@ define([
           move: updateColorInput,
           hide: updateColorInput
         });
-      });        
+      });
     }
   });
 });

assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js

@@ -1,4 +1,4 @@
-
+/* eslint-disable func-names */
 /**
  * ContainerDropZoneBehavior
  *
@@ -12,24 +12,24 @@ define([
   'jquery',
   'newsletter_editor/behaviors/BehaviorsLookup',
   'interact'
-], function(Marionette, _, jQuery, BL, interact) {
+], function (Marionette, _, jQuery, BL, interact) {
   var BehaviorsLookup = BL;
 
   BehaviorsLookup.ContainerDropZoneBehavior = Marionette.Behavior.extend({
     defaults: {
       columnLimit: 3
     },
-    onRender: function() {
+    onRender: function () {
       var dragAndDropDisabled = _.isObject(this.view.options.renderOptions) && this.view.options.renderOptions.disableDragAndDrop === true;
       if (!dragAndDropDisabled) {
         this.addDropZone();
       }
     },
-    addDropZone: function(_event) {
+    addDropZone: function () {
-      var that = this,
+      var that = this;
-        view = this.view,
+      var view = this.view;
-        domElement = that.$el.get(0),
+      var domElement = that.$el.get(0);
-        acceptableElementSelector;
+      var acceptableElementSelector;
 
       // TODO: Extract this limitation code to be controlled from containers
       if (this.view.renderOptions.depth === 0) {
@@ -47,36 +47,42 @@ define([
       interact(domElement).dropzone({
         accept: acceptableElementSelector,
         overlap: 'pointer', // Mouse pointer denotes location of a droppable
-        ondragenter: function(event) {
+        ondragenter: function () {
           // 1. Visually mark block as active for dropping
           view.$el.addClass('mailpoet_drop_active');
         },
-        ondragleave: function(event) {
+        ondragleave: function () {
           // 1. Remove visual markings of active dropping container
           // 2. Remove visual markings of drop position visualization
           that.cleanup();
         },
-        ondropmove: function(event) {
+        ondropmove: function (event) {
           // 1. Compute actual location of the mouse within the container
           // 2. Check if insertion is regular (between blocks) or special (with container insertion)
           // 3a. If insertion is regular, compute position where insertion should happen
           // 3b. If insertion is special, compute position (which side) and which cell the insertion belongs to
           // 4. If insertion at that position is not visualized, display position visualization there, remove other visualizations from this container
           var dropPosition = that.getDropPosition(
-              event.dragmove.pageX,
+            event.dragmove.pageX,
-              event.dragmove.pageY,
+            event.dragmove.pageY,
-              view.$el,
+            view.$el,
-              view.model.get('orientation'),
+            view.model.get('orientation'),
-              view.model.get('blocks').length
+            view.model.get('blocks').length
-            ),
+          );
-            element = view.$el,
+          var element = view.$el;
-            markerWidth = '',
+          var markerWidth = '';
-            markerHeight = '',
+          var markerHeight = '';
-            containerOffset = element.offset(),
+          var containerOffset = element.offset();
-            viewCollection = that.getCollection(),
+          var viewCollection = that.getCollection();
-            marker, targetModel, targetView, targetElement,
+          var marker;
-            topOffset, leftOffset, isLastBlockInsertion,
+          var targetModel;
-            $targetBlock, margin;
+          var targetView;
+          var targetElement;
+          var topOffset;
+          var leftOffset;
+          var isLastBlockInsertion;
+          var $targetBlock;
+          var margin;
 
           if (dropPosition === undefined) return;
 
@@ -150,7 +156,7 @@ define([
           // compensated for to position marker right in the middle of two
           // blocks
           if (dropPosition.position === 'before') {
-            $targetBlock = that.getChildren().findByModel(viewCollection.at(dropPosition.index-1)).$el;
+            $targetBlock = that.getChildren().findByModel(viewCollection.at(dropPosition.index - 1)).$el;
           } else {
             $targetBlock = that.getChildren().findByModel(viewCollection.at(dropPosition.index)).$el;
           }
@@ -163,7 +169,7 @@ define([
 
           element.append(marker);
         },
-        ondrop: function(event) {
+        ondrop: function (event) {
           // 1. Compute actual location of the mouse
           // 2. Check if insertion is regular (between blocks) or special (with container insertion)
           // 3a. If insertion is regular
@@ -178,15 +184,19 @@ define([
           // 4. Perform cleanup actions
 
           var dropPosition = that.getDropPosition(
-              event.dragEvent.pageX,
+            event.dragEvent.pageX,
-              event.dragEvent.pageY,
+            event.dragEvent.pageY,
-              view.$el,
+            view.$el,
-              view.model.get('orientation'),
+            view.model.get('orientation'),
-              view.model.get('blocks').length
+            view.model.get('blocks').length
-            ),
+          );
-            droppableModel = event.draggable.getDropModel(),
+          var droppableModel = event.draggable.getDropModel();
-            viewCollection = that.getCollection(),
+          var viewCollection = that.getCollection();
-            droppedView, droppedModel, index, tempCollection, tempCollection2;
+          var droppedView;
+          var index;
+          var tempCollection;
+          var tempCollection2;
+          var tempModel;
 
           if (dropPosition === undefined) return;
 
@@ -201,16 +211,16 @@ define([
                 orientation: 'vertical'
               });
               tempCollection.get('blocks').add(droppableModel);
-              viewCollection.add(tempCollection, {at: index});
+              viewCollection.add(tempCollection, { at: index });
             } else {
-              viewCollection.add(droppableModel, {at: index});
+              viewCollection.add(droppableModel, { at: index });
             }
 
             droppedView = that.getChildren().findByModel(droppableModel);
           } else {
             // Special insertion by replacing target block with collection
             // and inserting dropModel into that
-            var tempModel = viewCollection.at(dropPosition.index);
+            tempModel = viewCollection.at(dropPosition.index);
 
             tempCollection = new (window.EditorApplication.getBlockTypeModel('container'))({
               orientation: (view.model.get('orientation') === 'vertical') ? 'horizontal' : 'vertical'
@@ -247,7 +257,7 @@ define([
                 tempCollection.get('blocks').add(droppableModel);
               }
             }
-            viewCollection.add(tempCollection, {at: dropPosition.index});
+            viewCollection.add(tempCollection, { at: dropPosition.index });
 
             // Call post add actions
             droppedView = that.getChildren().findByModel(tempCollection).children.findByModel(droppableModel);
@@ -264,36 +274,40 @@ define([
         }
       });
     },
-    cleanup: function() {
+    cleanup: function () {
       // 1. Remove visual markings of active dropping container
       this.view.$el.removeClass('mailpoet_drop_active');
 
       // 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 SPECIAL_AREA_INSERTION_WIDTH = 0.00; // Disable special insertion. Default: 0.3
 
-        element = this.view.$el,
+      var element = this.view.$el;
-        orientation = this.view.model.get('orientation'),
+      var orientation = this.view.model.get('orientation');
 
-        elementOffset = element.offset(),
+      var elementOffset = element.offset();
-        elementPageX = elementOffset.left,
+      var elementPageX = elementOffset.left;
-        elementPageY = elementOffset.top,
+      var elementPageY = elementOffset.top;
-        elementWidth = element.outerWidth(true),
+      var elementWidth = element.outerWidth(true);
-        elementHeight = element.outerHeight(true),
+      var elementHeight = element.outerHeight(true);
 
-        relativeX = eventX - elementPageX,
+      var relativeX = eventX - elementPageX;
-        relativeY = eventY - elementPageY,
+      var relativeY = eventY - elementPageY;
 
-        relativeOffset, elementLength,
+      var relativeOffset;
+      var elementLength;
 
-        canAcceptNormalInsertion = this._canAcceptNormalInsertion(),
+      var canAcceptNormalInsertion = this._canAcceptNormalInsertion();
-        canAcceptSpecialInsertion = this._canAcceptSpecialInsertion(),
+      var canAcceptSpecialInsertion = this._canAcceptSpecialInsertion();
 
-        insertionType, index, position, indexAndPosition;
+      var insertionType;
+      var index;
+      var position;
+      var indexAndPosition;
 
-      var unsafe = !!is_unsafe;
+      var unsafe = !!isUnsafe;
 
       if (this.getCollection().length === 0) {
         return {
@@ -344,7 +358,7 @@ define([
 
       if (orientation === 'horizontal' && insertionType === 'special') {
         // Disable special insertion for horizontal containers
-        return;
+        return undefined;
       }
 
       return {
@@ -353,18 +367,20 @@ define([
         position: position // 'inside'|'before'|'after'
       };
     },
-    _computeNormalIndex: function(eventX, eventY) {
+    _computeNormalIndex: function (eventX, eventY) {
       // Normal insertion inserts dropModel before target element if
       // event happens on the first half of the element and after the
       // target element if event happens on the second half of the element.
       // Halves depend on orientation.
 
-      var index = this._computeCellIndex(eventX, eventY),
+      var index = this._computeCellIndex(eventX, eventY);
-        // TODO: Handle case when there are no children, container is empty
+      // TODO: Handle case when there are no children, container is empty
-        targetView = this.getChildren().findByModel(this.getCollection().at(index)),
+      var targetView = this.getChildren().findByModel(this.getCollection().at(index));
-        orientation = this.view.model.get('orientation'),
+      var orientation = this.view.model.get('orientation');
-        element = targetView.$el,
+      var element = targetView.$el;
-        eventOffset, closeOffset, elementDimension;
+      var eventOffset;
+      var closeOffset;
+      var elementDimension;
 
       if (orientation === 'vertical') {
         eventOffset = eventY;
@@ -382,60 +398,60 @@ define([
           index: index,
           position: 'before'
         };
-      } else {
-        // Second half of the element
-        return {
-          index: index,
-          position: 'after'
-        };
       }
+        // Second half of the element
+      return {
+        index: index,
+        position: 'after'
+      };
     },
-    _computeSpecialIndex: function(eventX, eventY) {
+    _computeSpecialIndex: function (eventX, eventY) {
       return this._computeCellIndex(eventX, eventY);
     },
-    _computeCellIndex: function(eventX, eventY) {
+    _computeCellIndex: function (eventX, eventY) {
-      var orientation = this.view.model.get('orientation'),
+      var orientation = this.view.model.get('orientation');
-        eventOffset = (orientation === 'vertical') ? eventY : eventX,
+      var eventOffset = (orientation === 'vertical') ? eventY : eventX;
-        resultView = this.getChildren().find(function(view) {
+      var resultView = this.getChildren().find(function (view) {
-          var element = view.$el,
+        var element = view.$el;
-            closeOffset, farOffset;
+        var closeOffset;
+        var farOffset;
 
-          if (orientation === 'vertical') {
+        if (orientation === 'vertical') {
-            closeOffset = element.offset().top;
+          closeOffset = element.offset().top;
-            farOffset = element.outerHeight(true);
+          farOffset = element.outerHeight(true);
-          } else {
+        } else {
-            closeOffset = element.offset().left;
+          closeOffset = element.offset().left;
-            farOffset = element.outerWidth(true);
+          farOffset = element.outerWidth(true);
-          }
+        }
-          farOffset += closeOffset;
+        farOffset += closeOffset;
 
-          return closeOffset <= eventOffset && eventOffset <= farOffset;
+        return closeOffset <= eventOffset && eventOffset <= farOffset;
-        });
+      });
 
       var index = (typeof resultView === 'object') ? resultView._index : 0;
 
       return index;
     },
-    _canAcceptNormalInsertion: function() {
+    _canAcceptNormalInsertion: function () {
-      var orientation = this.view.model.get('orientation'),
+      var orientation = this.view.model.get('orientation');
-        depth = this.view.renderOptions.depth,
+      var depth = this.view.renderOptions.depth;
-        childCount = this.getChildren().length;
+      var childCount = this.getChildren().length;
       // Note that depth is zero indexed. Root container has depth=0
       return orientation === 'vertical' || (orientation === 'horizontal' && depth === 1 && childCount < this.options.columnLimit);
     },
-    _canAcceptSpecialInsertion: function() {
+    _canAcceptSpecialInsertion: function () {
-      var orientation = this.view.model.get('orientation'),
+      var orientation = this.view.model.get('orientation');
-        depth = this.view.renderOptions.depth,
+      var depth = this.view.renderOptions.depth;
-        childCount = this.getChildren().length;
+      var childCount = this.getChildren().length;
       return depth === 0 || (depth === 1 && orientation === 'horizontal' && childCount <= this.options.columnLimit);
     },
-    getCollectionView: function() {
+    getCollectionView: function () {
       return this.view.getChildView('blocks');
     },
-    getChildren: function() {
+    getChildren: function () {
       return this.getCollectionView().children;
     },
-    getCollection: function() {
+    getCollection: function () {
       return this.getCollectionView().collection;
     }
   });

assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js

@@ -10,7 +10,7 @@ define([
   'jquery',
   'newsletter_editor/behaviors/BehaviorsLookup',
   'interact'
-], function(Marionette, _, jQuery, BehaviorsLookup, interact) {
+], function (Marionette, _, jQuery, BehaviorsLookup, interact) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.DraggableBehavior = Marionette.Behavior.extend({
@@ -24,16 +24,16 @@ define([
        *
        * @return Backbone.Model A model that will be passed to the receiver
        */
-      getDropModel: function() {
+      getDropModel: function () { // eslint-disable-line func-names
         throw "Missing 'drop' function for DraggableBehavior";
       },
 
-      onDrop: function(model, view) {},
+      onDrop: function () {}, // eslint-disable-line func-names
-      testAttachToInstance: function(model, view) { return true; }
+      testAttachToInstance: function () { return true; } // eslint-disable-line func-names
     },
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
-      var that = this,
+      var that = this;
-        interactable;
+      var interactable;
 
       // Give instances more control over whether Draggable should be applied
       if (!this.options.testAttachToInstance(this.view.model, this.view)) return;
@@ -47,18 +47,21 @@ define([
         // Scroll when dragging near edges of a window
         autoScroll: true,
 
-        onstart: function(startEvent) {
+        onstart: function (startEvent) { // eslint-disable-line func-names
           var event = startEvent;
+          var centerXOffset;
+          var centerYOffset;
+          var tempClone;
+          var clone;
+          var $clone;
 
           if (that.options.cloneOriginal === true) {
             // Use substitution instead of a clone
-            var tempClone = (_.isFunction(that.options.onDragSubstituteBy)) ? that.options.onDragSubstituteBy(that) : undefined,
+            tempClone = (_.isFunction(that.options.onDragSubstituteBy)) ? that.options.onDragSubstituteBy(that) : undefined;
-              // Or use a clone
+            // Or use a clone
-              clone = tempClone || event.target.cloneNode(true),
+            clone = tempClone || event.target.cloneNode(true);
-
+            jQuery(event.target);
-              $original = jQuery(event.target),
+            $clone = jQuery(clone);
-              $clone = jQuery(clone),
-              centerXOffset, centerYOffset, parentOffset;
 
             $clone.addClass('mailpoet_droppable_active');
             $clone.css('position', 'absolute');
@@ -71,7 +74,7 @@ define([
             // Accurate dimensions can only be taken after insertion to document
             centerXOffset = $clone.width() / 2;
             centerYOffset = $clone.height() / 2;
-            $clone.css('top',  event.pageY - centerYOffset);
+            $clone.css('top', event.pageY - centerYOffset);
             $clone.css('left', event.pageX - centerXOffset);
 
             event.interaction.element = clone;
@@ -81,14 +84,13 @@ define([
               that.view.$el.addClass('mailpoet_hidden');
             }
           }
-
         },
         // call this function on every dragmove event
-        onmove: function (event) {
+        onmove: function (event) { // eslint-disable-line func-names
-          var target = event.target,
+          var target = event.target;
-            // keep the dragged position in the data-x/data-y attributes
+          // keep the dragged position in the data-x/data-y attributes
-            x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
+          var x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx;
-            y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+          var y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
 
           // translate the element
           target.style.transform = 'translate(' + x + 'px, ' + y + 'px)';
@@ -98,7 +100,7 @@ define([
           target.setAttribute('data-x', x);
           target.setAttribute('data-y', y);
         },
-        onend: function (event) {
+        onend: function (event) { // eslint-disable-line func-names
           var target = event.target;
           target.style.transform = '';
           target.style.webkitTransform = target.style.transform;
@@ -117,7 +119,7 @@ define([
       })
       .preventDefault('auto')
       .styleCursor(false)
-      .actionChecker(function (pointer, event, action) {
+      .actionChecker(function (pointer, event, action) { // eslint-disable-line func-names
         // Disable dragging with right click
         if (event.button !== 0) {
           return null;
@@ -131,7 +133,7 @@ define([
       } else {
         interactable.getDropModel = this.view.getDropFunc();
       }
-      interactable.onDrop = function(opts) {
+      interactable.onDrop = function (opts) { // eslint-disable-line func-names
         var options = opts;
         if (_.isObject(options)) {
           // Inject Draggable behavior if possible

assets/js/src/newsletter_editor/behaviors/HighlightContainerBehavior.js

@@ -6,7 +6,7 @@
 define([
   'backbone.marionette',
   'newsletter_editor/behaviors/BehaviorsLookup'
-], function(Marionette, BehaviorsLookup) {
+], function (Marionette, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.HighlightContainerBehavior = Marionette.Behavior.extend({
@@ -14,10 +14,10 @@ define([
       'mouseenter @ui.tools': 'enableHighlight',
       'mouseleave @ui.tools': 'disableHighlight'
     },
-    enableHighlight: function() {
+    enableHighlight: function () { // eslint-disable-line func-names
       this.$el.addClass('mailpoet_highlight');
     },
-    disableHighlight: function() {
+    disableHighlight: function () { // eslint-disable-line func-names
       if (!this.view._isBeingEdited) {
         this.$el.removeClass('mailpoet_highlight');
       }

assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js

@@ -6,7 +6,7 @@
 define([
   'backbone.marionette',
   'newsletter_editor/behaviors/BehaviorsLookup'
-], function(Marionette, BehaviorsLookup) {
+], function (Marionette, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.HighlightEditingBehavior = Marionette.Behavior.extend({
@@ -14,11 +14,11 @@ define([
       startEditing: 'enableHighlight',
       stopEditing: 'disableHighlight'
     },
-    enableHighlight: function() {
+    enableHighlight: function () { // eslint-disable-line func-names
       this.view._isBeingEdited = true;
       this.$el.addClass('mailpoet_highlight');
     },
-    disableHighlight: function() {
+    disableHighlight: function () { // eslint-disable-line func-names
       this.view._isBeingEdited = false;
       this.$el.removeClass('mailpoet_highlight');
     }

assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js

@@ -7,61 +7,65 @@ define([
   'backbone.marionette',
   'newsletter_editor/behaviors/BehaviorsLookup',
   'interact'
-], function(Marionette, BehaviorsLookup, interact) {
+], function (Marionette, BehaviorsLookup, interact) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.ResizableBehavior = Marionette.Behavior.extend({
     defaults: {
       elementSelector: null,
       resizeHandleSelector: true, // true will use edges of the element itself
-      transformationFunction: function(y) { return y; },
+      transformationFunction: function transformationFunction(y) { return y; },  // for blocks that use the default onResize function
       minLength: 0,
-      modelField: 'styles.block.height'
+      maxLength: Infinity,
+      modelField: 'styles.block.height',
+      onResize: function (event) { // eslint-disable-line func-names
+        var currentLength = parseFloat(this.view.model.get(this.options.modelField));
+        var newLength = currentLength + this.options.transformationFunction(event.dy);
+        newLength = Math.min(this.options.maxLength, Math.max(this.options.minLength, newLength));
+        this.view.model.set(this.options.modelField, newLength + 'px');
+      }
     },
     events: {
       mouseenter: 'showResizeHandle',
       mouseleave: 'hideResizeHandle'
     },
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       this.attachResize();
 
       if (this.isBeingResized !== true) {
         this.hideResizeHandle();
       }
     },
-    attachResize: function() {
+    attachResize: function () { // eslint-disable-line func-names
-      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0),
+      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0);
-        that = this;
+      var that = this;
       interact(domElement).resizable({
-        //axis: 'y',
+        // axis: 'y',
         edges: {
           top: false,
           left: false,
           right: false,
           bottom: (typeof this.options.resizeHandleSelector === 'string') ? this.view.$(this.options.resizeHandleSelector).get(0) : this.options.resizeHandleSelector
         }
-      }).on('resizestart', function(event) {
+      })
+      .on('resizestart', function () { // eslint-disable-line func-names
         that.isBeingResized = true;
         that.$el.addClass('mailpoet_resize_active');
-      }).on('resizemove', function(event) {
+      }).on('resizemove', function (event) { // eslint-disable-line func-names
-        var currentLength = parseFloat(that.view.model.get(that.options.modelField)),
+        var onResize = that.options.onResize.bind(that);
-          newLength = currentLength + that.options.transformationFunction(event.dy);
+        return onResize(event);
-
-        if (newLength < that.options.minLength) newLength = that.options.minLength;
-
-        that.view.model.set(that.options.modelField, newLength + 'px');
       })
-      .on('resizeend', function(event) {
+      .on('resizeend', function () { // eslint-disable-line func-names
         that.isBeingResized = null;
         that.$el.removeClass('mailpoet_resize_active');
       });
     },
-    showResizeHandle: function() {
+    showResizeHandle: function () { // eslint-disable-line func-names
       if (typeof this.options.resizeHandleSelector === 'string') {
         this.view.$(this.options.resizeHandleSelector).removeClass('mailpoet_hidden');
       }
     },
-    hideResizeHandle: function() {
+    hideResizeHandle: function () { // eslint-disable-line func-names
       if (typeof this.options.resizeHandleSelector === 'string') {
         this.view.$(this.options.resizeHandleSelector).addClass('mailpoet_hidden');
       }

assets/js/src/newsletter_editor/behaviors/ShowSettingsBehavior.js

@@ -7,7 +7,7 @@ define([
   'backbone.marionette',
   'jquery',
   'newsletter_editor/behaviors/BehaviorsLookup'
-], function(Marionette, jQuery, BehaviorsLookup) {
+], function (Marionette, jQuery, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.ShowSettingsBehavior = Marionette.Behavior.extend({
@@ -17,12 +17,12 @@ define([
     events: {
       'click .mailpoet_content': 'showSettings'
     },
-    showSettings: function(event) {
+    showSettings: function (event) { // eslint-disable-line func-names
-      if(!this.isIgnoredElement(event.target)) {
+      if (!this.isIgnoredElement(event.target)) {
         this.view.triggerMethod('showSettings');
       }
     },
-    isIgnoredElement: function(element) {
+    isIgnoredElement: function (element) { // eslint-disable-line func-names
       return this.options.ignoreFrom
         && this.options.ignoreFrom.length > 0
         && jQuery(element).is(this.options.ignoreFrom);

assets/js/src/newsletter_editor/behaviors/SortableBehavior.js

@@ -7,26 +7,26 @@ define([
   'backbone.marionette',
   'underscore',
   'newsletter_editor/behaviors/BehaviorsLookup'
-], function(Marionette, _, BehaviorsLookup) {
+], function (Marionette, _, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.SortableBehavior = Marionette.Behavior.extend({
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       var collection = this.view.collection;
 
       if (_.isFunction(this.$el.sortable)) {
         this.$el.sortable({
           cursor: 'move',
-          start: function(event, ui) {
+          start: function (event, ui) { // eslint-disable-line func-names
             ui.item.data('previousIndex', ui.item.index());
           },
-          end: function(event, ui) {
+          end: function (event, ui) { // eslint-disable-line func-names
             ui.item.removeData('previousIndex');
           },
-          update: function(event, ui) {
+          update: function (event, ui) { // eslint-disable-line func-names
-            var previousIndex = ui.item.data('previousIndex'),
+            var previousIndex = ui.item.data('previousIndex');
-              newIndex = ui.item.index(),
+            var newIndex = ui.item.index();
-              model = collection.at(previousIndex);
+            var model = collection.at(previousIndex);
 
             // Replicate DOM changes. Move target model to a new position
             // within the collection

assets/js/src/newsletter_editor/behaviors/TextEditorBehavior.js

@@ -7,7 +7,7 @@ define([
   'backbone.marionette',
   'underscore',
   'newsletter_editor/behaviors/BehaviorsLookup'
-], function(Marionette, _, BehaviorsLookup) {
+], function (Marionette, _, BehaviorsLookup) { // eslint-disable-line func-names
   var BL = BehaviorsLookup;
 
   BL.TextEditorBehavior = Marionette.Behavior.extend({
@@ -19,9 +19,9 @@ define([
       invalidElements: 'script',
       blockFormats: 'Paragraph=p',
       plugins: 'link textcolor colorpicker mailpoet_shortcodes',
-      configurationFilter: function(originalConfig) { return originalConfig; }
+      configurationFilter: function (originalConfig) { return originalConfig; } // eslint-disable-line func-names
     },
-    onDomRefresh: function() {
+    onDomRefresh: function () { // eslint-disable-line func-names
       var that = this;
       if (this.view.disableTextEditor === true) {
         return;
@@ -42,7 +42,7 @@ define([
         relative_urls: false,
         remove_script_host: false,
         convert_urls: true,
-        urlconverter_callback: function(url, node, on_save, name) {
+        urlconverter_callback: function (url) { // eslint-disable-line func-names
           if (url.match(/\[.+\]/g)) {
             // Do not convert URLs with shortcodes
             return url;
@@ -56,12 +56,12 @@ define([
 
         plugins: this.options.plugins,
 
-        setup: function(editor) {
+        setup: function (editor) { // eslint-disable-line func-names
-          editor.on('change', function(e) {
+          editor.on('change', function () { // eslint-disable-line func-names
             that.view.triggerMethod('text:editor:change', editor.getContent());
           });
 
-          editor.on('click', function(e) {
+          editor.on('click', function (e) { // eslint-disable-line func-names
             editor.focus();
             if (that._isActivationClick) {
               editor.selection.setRng(
@@ -71,12 +71,12 @@ define([
             }
           });
 
-          editor.on('focus', function(e) {
+          editor.on('focus', function () { // eslint-disable-line func-names
             that.view.triggerMethod('text:editor:focus');
             that._isActivationClick = true;
           });
 
-          editor.on('blur', function(e) {
+          editor.on('blur', function () { // eslint-disable-line func-names
             that.view.triggerMethod('text:editor:blur');
           });
         }

assets/js/src/newsletter_editor/blocks/automatedLatestContent.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Automated latest content block.
  * Only query parameters can be modified by the user. Posts pulled by this
@@ -16,7 +17,7 @@ define([
   'backbone.supermodel',
   'underscore',
   'jquery'
-], function(
+], function (
   App,
   BaseBlock,
   ButtonBlock,
@@ -27,14 +28,13 @@ define([
   _,
   jQuery
   ) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock;
+  var base = BaseBlock;
 
   Module.ALCSupervisor = SuperModel.extend({
-    initialize: function() {
+    initialize: function () {
       var DELAY_REFRESH_FOR_MS = 500;
       this.listenTo(
         App.getChannel(),
@@ -42,13 +42,14 @@ define([
         _.debounce(this.refresh, DELAY_REFRESH_FOR_MS)
       );
     },
-    refresh: function() {
+    refresh: function () {
-      var models = App.findModels(function(model) {
+      var blocks;
+      var models = App.findModels(function (model) {
         return model.get('type') === 'automatedLatestContent';
       }) || [];
 
       if (models.length === 0) return;
-      var blocks = _.map(models, function(model) {
+      blocks = _.map(models, function (model) {
         return model.toJSON();
       });
 
@@ -56,12 +57,12 @@ define([
         blocks: blocks
       }).then(_.partial(this.refreshBlocks, models));
     },
-    refreshBlocks: function(models, renderedBlocks) {
+    refreshBlocks: function (models, renderedBlocks) {
       _.each(
         _.zip(models, renderedBlocks),
-        function(args) {
+        function (args) {
-          var model = args[0],
+          var model = args[0];
-            contents = args[1];
+          var contents = args[1];
           model.trigger('refreshPosts', contents);
         }
       );
@@ -70,7 +71,7 @@ define([
 
   Module.AutomatedLatestContentBlockModel = base.BlockModel.extend({
     stale: ['_container'],
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'automatedLatestContent',
         amount: '5',
@@ -83,7 +84,7 @@ define([
         titleIsLink: false, // false|true
         imageFullWidth: false, // true|false
         featuredImagePosition: 'belowTitle', // 'aboveTitle'|'belowTitle'|'none'
-        //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
+        // imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
         showCategories: 'no', // 'no'|'aboveText'|'belowText'
@@ -100,14 +101,14 @@ define([
         _container: new (App.getBlockTypeModel('container'))()
       }, App.getConfig().get('blockDefaults.automatedLatestContent'));
     },
-    relations: function() {
+    relations: function () {
       return {
         readMoreButton: App.getBlockTypeModel('button'),
         divider: App.getBlockTypeModel('divider'),
         _container: App.getBlockTypeModel('container')
       };
     },
-    initialize: function() {
+    initialize: function () {
       base.BlockView.prototype.initialize.apply(this, arguments);
       this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:featuredImagePosition change:titleAlignment change:titleIsLink change:imageFullWidth change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
       this.listenTo(this.get('readMoreButton'), 'change', this._scheduleFetchPosts);
@@ -115,27 +116,27 @@ define([
       this.on('add remove update reset', this._scheduleFetchPosts);
       this.on('refreshPosts', this.updatePosts, this);
     },
-    updatePosts: function(posts) {
+    updatePosts: function (posts) {
-      this.get('_container.blocks').reset(posts, {parse: true});
+      this.get('_container.blocks').reset(posts, { parse: true });
     },
     /**
      * Batch more changes during a specific time, instead of fetching
      * ALC posts on each model change
      */
-    _scheduleFetchPosts: function() {
+    _scheduleFetchPosts: function () {
       App.getChannel().trigger('automatedLatestContentRefresh');
     }
   });
 
   Module.AutomatedLatestContentBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_automated_latest_content_block mailpoet_droppable_block',
-    initialize: function() {
+    initialize: function () {
       function replaceButtonStylesHandler(data) {
-        this.model.set({readMoreButton: data});
+        this.model.set({ readMoreButton: data });
       }
       App.getChannel().on('replaceAllButtonStyles', replaceButtonStylesHandler.bind(this));
     },
-    getTemplate: function() { return window.templates.automatedLatestContentBlock; },
+    getTemplate: function () { return window.templates.automatedLatestContentBlock; },
     regions: {
       toolsRegion: '.mailpoet_tools',
       postsRegion: '.mailpoet_automated_latest_content_block_posts'
@@ -148,14 +149,14 @@ define([
     events: _.extend(base.BlockView.prototype.events, {
       'click .mailpoet_automated_latest_content_block_overlay': 'showSettings'
     }),
-    onDragSubstituteBy: function() { return Module.AutomatedLatestContentWidgetView; },
+    onDragSubstituteBy: function () { return Module.AutomatedLatestContentWidgetView; },
-    onRender: function() {
+    onRender: function () {
-      var ContainerView = App.getBlockTypeView('container'),
+      var ContainerView = App.getBlockTypeView('container');
-        renderOptions = {
+      var renderOptions = {
-          disableTextEditor: true,
+        disableTextEditor: true,
-          disableDragAndDrop: 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 }));
@@ -163,13 +164,13 @@ define([
   });
 
   Module.AutomatedLatestContentBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.AutomatedLatestContentBlockSettingsView; }
+    getSettingsView: function () { return Module.AutomatedLatestContentBlockSettingsView; }
   });
 
   // Sidebar view container
   Module.AutomatedLatestContentBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.automatedLatestContentBlockSettings; },
+    getTemplate: function () { return window.templates.automatedLatestContentBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'click .mailpoet_automated_latest_content_hide_display_options': 'toggleDisplayOptions',
         'click .mailpoet_automated_latest_content_show_display_options': 'toggleDisplayOptions',
@@ -195,7 +196,7 @@ define([
         'click .mailpoet_done_editing': 'close'
       };
     },
-    onRender: function() {
+    onRender: function () {
       var that = this;
 
       // Dynamically update available post types
@@ -211,35 +212,36 @@ define([
               term: params.term
             };
           },
-          transport: function(options, success, failure) {
+          transport: function (options, success, failure) {
             var taxonomies;
+            var termsPromise;
             var promise = CommunicationComponent.getTaxonomies(
               that.model.get('contentType')
-            ).then(function(tax) {
+            ).then(function (tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = CommunicationComponent.getTerms({
+              termsPromise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
-              }).then(function(terms) {
+              }).then(function (terms) {
                 return {
                   taxonomies: taxonomies,
                   terms: terms
                 };
               });
-              return promise;
+              return termsPromise;
             });
 
             promise.then(success);
             promise.fail(failure);
             return promise;
           },
-          processResults: function(data) {
+          processResults: function (data) {
             // Transform taxonomies and terms into select2 compatible format
             return {
               results: _.map(
                 data.terms,
-                function(item) {
+                function (item) {
                   return _.defaults({
                     text: data.taxonomies[item.taxonomy].labels.singular_name + ': ' + item.name,
                     id: item.term_id
@@ -250,23 +252,23 @@ define([
           }
         }
       }).on({
-        'select2:select': function(event) {
+        'select2:select': function (event) {
           var terms = that.model.get('terms');
           terms.add(event.params.data);
           // Reset whole model in order for change events to propagate properly
           that.model.set('terms', terms.toJSON());
         },
-        'select2:unselect': function(event) {
+        'select2:unselect': function (event) {
           var terms = that.model.get('terms');
           terms.remove(event.params.data);
           // Reset whole model in order for change events to propagate properly
           that.model.set('terms', terms.toJSON());
         }
-      }).trigger( 'change' );
+      }).trigger('change');
     },
-    toggleDisplayOptions: function(event) {
+    toggleDisplayOptions: function () {
-      var el = this.$('.mailpoet_automated_latest_content_display_options'),
+      var el = this.$('.mailpoet_automated_latest_content_display_options');
-        showControl = this.$('.mailpoet_automated_latest_content_show_display_options');
+      var showControl = this.$('.mailpoet_automated_latest_content_show_display_options');
       if (el.hasClass('mailpoet_closed')) {
         el.removeClass('mailpoet_closed');
         showControl.addClass('mailpoet_hidden');
@@ -275,7 +277,7 @@ define([
         showControl.removeClass('mailpoet_hidden');
       }
     },
-    showButtonSettings: function(event) {
+    showButtonSettings: function () {
       var buttonModule = ButtonBlock;
       (new buttonModule.ButtonBlockSettingsView({
         model: this.model.get('readMoreButton'),
@@ -286,7 +288,7 @@ define([
         }
       })).render();
     },
-    showDividerSettings: function(event) {
+    showDividerSettings: function () {
       var dividerModule = DividerBlock;
       (new dividerModule.DividerBlockSettingsView({
         model: this.model.get('divider'),
@@ -296,7 +298,7 @@ define([
         }
       })).render();
     },
-    changeReadMoreType: function(event) {
+    changeReadMoreType: function (event) {
       var value = jQuery(event.target).val();
       if (value == 'link') {
         this.$('.mailpoet_automated_latest_content_read_more_text').removeClass('mailpoet_hidden');
@@ -307,7 +309,7 @@ define([
       }
       this.changeField('readMoreType', event);
     },
-    changeDisplayType: function(event) {
+    changeDisplayType: function (event) {
       var value = jQuery(event.target).val();
 
       if (value == 'titleOnly') {
@@ -334,7 +336,7 @@ define([
       }
       this.changeField('displayType', event);
     },
-    changeTitleFormat: function(event) {
+    changeTitleFormat: function (event) {
       var value = jQuery(event.target).val();
       if (value == 'ul') {
         this.$('.mailpoet_automated_latest_content_non_title_list_options').addClass('mailpoet_hidden');
@@ -348,12 +350,12 @@ define([
       }
       this.changeField('titleFormat', event);
     },
-    _updateContentTypes: function(postTypes) {
+    _updateContentTypes: function (postTypes) {
-      var select = this.$('.mailpoet_automated_latest_content_content_type'),
+      var select = this.$('.mailpoet_automated_latest_content_content_type');
-        selectedValue = this.model.get('contentType');
+      var selectedValue = this.model.get('contentType');
 
       select.find('option').remove();
-      _.each(postTypes, function(type) {
+      _.each(postTypes, function (type) {
         select.append(jQuery('<option>', {
           value: type.name,
           text: type.label
@@ -364,35 +366,35 @@ define([
   });
 
   Module.AutomatedLatestContentWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.automatedLatestContentInsertion; },
+    getTemplate: function () { return window.templates.automatedLatestContentInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.AutomatedLatestContentBlockModel({}, { parse: true });
         },
-        onDrop: function(options) {
+        onDrop: function (options) {
           options.droppedView.triggerMethod('showSettings');
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('automatedLatestContent', {
+    BeforeStartApp.registerBlockType('automatedLatestContent', {
       blockModel: Module.AutomatedLatestContentBlockModel,
       blockView: Module.AutomatedLatestContentBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'automatedLatestContent',
       widgetView: Module.AutomatedLatestContentWidgetView,
       priority: 97
     });
   });
 
-  App.on('start', function(App, options) {
+  App.on('start', function (StartApp) {
-    var Application = App;
+    var Application = StartApp;
     Application._ALCSupervisor = new Module.ALCSupervisor();
     Application._ALCSupervisor.refresh();
   });

assets/js/src/newsletter_editor/blocks/base.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Defines base classes for actual content blocks to extend.
  * Extending content block modules need to at least extend
@@ -12,22 +13,20 @@ define([
   'jquery',
   'mailpoet',
   'modal'
-], function(App, Marionette, SuperModel, _, jQuery, MailPoet, Modal) {
+], function (App, Marionette, SuperModel, _, jQuery, MailPoet) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    AugmentedView = Marionette.View.extend({});
+  var AugmentedView = Marionette.View.extend({});
 
   Module.BlockModel = SuperModel.extend({
     stale: [], // Attributes to be removed upon saving
-    initialize: function() {
+    initialize: function () {
-      var that = this;
+      this.on('change', function () {
-      this.on('change', function() {
         App.getChannel().trigger('autoSave');
       });
     },
-    _getDefaults: function(blockDefaults, configDefaults) {
+    _getDefaults: function (blockDefaults, configDefaults) {
       var defaults = (_.isObject(configDefaults) && _.isFunction(configDefaults.toJSON)) ? configDefaults.toJSON() : configDefaults;
 
       // Patch the resulting JSON object and fix it's constructors to be Object.
@@ -36,11 +35,11 @@ define([
       // TODO: Investigate for a better solution
       return JSON.parse(JSON.stringify(jQuery.extend(blockDefaults, defaults || {})));
     },
-    toJSON: function() {
+    toJSON: function () {
       // Remove stale attributes from resulting JSON object
       return _.omit(SuperModel.prototype.toJSON.call(this), this.stale);
     },
-    getChildren: function() {
+    getChildren: function () {
       return [];
     }
   });
@@ -62,13 +61,14 @@ define([
       DraggableBehavior: {
         cloneOriginal: true,
         hideOriginal: true,
-        onDrop: function(options) {
+        onDrop: function (options) {
           // After a clone of model has been dropped, cleanup
           // and destroy self
           options.dragBehavior.view.model.destroy();
         },
-        onDragSubstituteBy: function(behavior) {
+        onDragSubstituteBy: function (behavior) {
-          var WidgetView, node;
+          var WidgetView;
+          var node;
           // When block is being dragged, display the widget icon instead.
           // This will create an instance of block's widget view and
           // use it's rendered DOM element instead of the content block
@@ -79,80 +79,81 @@ define([
             WidgetView.destroy();
             return node;
           }
+          return undefined;
         }
       },
       HighlightEditingBehavior: {}
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON(),
         viewCid: this.cid
       };
     },
-    constructor: function() {
+    constructor: function () {
       AugmentedView.apply(this, arguments);
       this.$el.addClass('mailpoet_editor_view_' + this.cid);
     },
-    initialize: function() {
+    initialize: function () {
       this.on('showSettings', this.showSettings, this);
       this.on('dom:refresh', this.showBlock, this);
       this._isFirstRender = true;
     },
-    showTools: function(_event) {
+    showTools: function () {
       if (!this.showingToolsDisabled) {
         this.$('> .mailpoet_tools').addClass('mailpoet_display_tools');
         this.toolsView.triggerMethod('showTools');
       }
     },
-    hideTools: function(e) {
+    hideTools: function () {
       this.$('> .mailpoet_tools').removeClass('mailpoet_display_tools');
       this.toolsView.triggerMethod('hideTools');
     },
-    enableShowingTools: function() {
+    enableShowingTools: function () {
       this.showingToolsDisabled = false;
     },
-    disableShowingTools: function() {
+    disableShowingTools: function () {
       this.showingToolsDisabled = true;
       this.hideTools();
     },
-    showSettings: function(options) {
+    showSettings: function (options) {
       this.toolsView.triggerMethod('showSettings', options);
     },
     /**
      * Defines drop behavior of BlockView instance
      */
-    getDropFunc: function() {
+    getDropFunc: function () {
-      return function() {
+      return function () {
         return this.model.clone();
       }.bind(this);
     },
-    disableDragging: function() {
+    disableDragging: function () {
       this.$el.addClass('mailpoet_ignore_drag');
     },
-    enableDragging: function() {
+    enableDragging: function () {
       this.$el.removeClass('mailpoet_ignore_drag');
     },
-    showBlock: function() {
+    showBlock: function () {
       if (this._isFirstRender) {
         this.transitionIn();
         this._isFirstRender = false;
       }
     },
-    deleteBlock: function() {
+    deleteBlock: function () {
-      this.transitionOut().then(function() {
+      this.transitionOut().then(function () {
         this.model.destroy();
       }.bind(this));
     },
-    duplicateBlock: function() {
+    duplicateBlock: function () {
-      this.model.collection.add(this.model.toJSON(), {at: this.model.collection.findIndex(this.model)});
+      this.model.collection.add(this.model.toJSON(), { at: this.model.collection.findIndex(this.model) });
     },
-    transitionIn: function() {
+    transitionIn: function () {
       return this._transition('slideDown', 'fadeIn', 'easeOut');
     },
-    transitionOut: function() {
+    transitionOut: function () {
       return this._transition('slideUp', 'fadeOut', 'easeIn');
     },
-    _transition: function(slideDirection, fadeDirection, easing) {
+    _transition: function (slideDirection, fadeDirection, easing) {
       var promise = jQuery.Deferred();
 
       this.$el.velocity(
@@ -160,7 +161,7 @@ define([
         {
           duration: 250,
           easing: easing,
-          complete: function() {
+          complete: function () {
             promise.resolve();
           }.bind(this)
         }
@@ -178,7 +179,7 @@ define([
   });
 
   Module.BlockToolsView = AugmentedView.extend({
-    getTemplate: function() { return window.templates.genericBlockTools; },
+    getTemplate: function () { return window.templates.genericBlockTools; },
     events: {
       'click .mailpoet_edit_block': 'changeSettings',
       'click .mailpoet_delete_block_activate': 'showDeletionConfirmation',
@@ -193,8 +194,8 @@ define([
       duplicate: true,
       move: true
     },
-    getSettingsView: function() { return Module.BlockSettingsView; },
+    getSettingsView: function () { return Module.BlockSettingsView; },
-    initialize: function(opts) {
+    initialize: function (opts) {
       var options = opts || {};
       if (!_.isUndefined(options.tools)) {
         // Make a new block specific tool config object
@@ -205,29 +206,39 @@ define([
       this.on('hideTools', this.hideDeletionConfirmation, this);
       this.on('showSettings', this.changeSettings);
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON(),
         viewCid: this.cid,
         tools: this.tools
       };
     },
-    changeSettings: function(options) {
+    changeSettings: function (options) {
       var ViewType = this.getSettingsView();
       (new ViewType(_.extend({ model: this.model }, options || {}))).render();
     },
-    showDeletionConfirmation: function() {
+    showDeletionConfirmation: function () {
+      this.$('.mailpoet_delete_block')
+        .closest('.mailpoet_block')
+        .find('> .mailpoet_block_highlight')
+        .css({ background: '#E64047', opacity: 0.5 });
+
       this.$('.mailpoet_delete_block').addClass('mailpoet_delete_block_activated');
     },
-    hideDeletionConfirmation: function() {
+    hideDeletionConfirmation: function () {
+      this.$('.mailpoet_delete_block')
+        .closest('.mailpoet_block')
+        .find('> .mailpoet_block_highlight')
+        .css({ background: 'transparent', opacity: 1 });
+
       this.$('.mailpoet_delete_block').removeClass('mailpoet_delete_block_activated');
     },
-    deleteBlock: function(event) {
+    deleteBlock: function (event) {
       event.preventDefault();
       this.model.trigger('delete');
       return false;
     },
-    duplicateBlock: function(event) {
+    duplicateBlock: function (event) {
       event.preventDefault();
       this.model.trigger('duplicate');
       return false;
@@ -239,14 +250,15 @@ define([
     behaviors: {
       ColorPickerBehavior: {}
     },
-    initialize: function(params) {
+    initialize: function (params) {
+      var panelParams;
       this.model.trigger('startEditing');
-      var panelParams = {
+      panelParams = {
         element: this.$el,
         template: '',
         position: 'right',
         width: App.getConfig().get('sidepanelWidth'),
-        onCancel: function() {
+        onCancel: function () {
           this.destroy();
         }.bind(this)
       };
@@ -257,37 +269,37 @@ define([
         MailPoet.Modal.panel(panelParams);
       }
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON()
       };
     },
-    close: function(event) {
+    close: function () {
       this.destroy();
     },
-    changeField: function(field, event) {
+    changeField: function (field, event) {
       this.model.set(field, jQuery(event.target).val());
     },
-    changePixelField: function(field, event) {
+    changePixelField: function (field, event) {
       this.changeFieldWithSuffix(field, event, 'px');
     },
-    changeFieldWithSuffix: function(field, event, suffix) {
+    changeFieldWithSuffix: function (field, event, suffix) {
       this.model.set(field, jQuery(event.target).val() + suffix);
     },
-    changeBoolField: function(field, event) {
+    changeBoolField: function (field, event) {
       this.model.set(field, (jQuery(event.target).val() === 'true'));
     },
-    changeBoolCheckboxField: function(field, event) {
+    changeBoolCheckboxField: function (field, event) {
       this.model.set(field, (!!jQuery(event.target).prop('checked')));
     },
-    changeColorField: function(field, event) {
+    changeColorField: function (field, event) {
       var value = jQuery(event.target).val();
       if (value === '') {
         value = 'transparent';
       }
       this.model.set(field, value);
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () {
       MailPoet.Modal.close();
       this.model.trigger('stopEditing');
     }
@@ -297,7 +309,7 @@ define([
     className: 'mailpoet_widget mailpoet_droppable_block mailpoet_droppable_widget',
     behaviors: {
       DraggableBehavior: {
-        drop: function() {
+        drop: function () {
           throw 'Unsupported operation';
         }
       }

assets/js/src/newsletter_editor/blocks/button.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Button content block
  */
@@ -7,15 +8,14 @@ define([
   'mailpoet',
   'underscore',
   'jquery'
-], function(App, BaseBlock, MailPoet, _, jQuery) {
+], function (App, BaseBlock, MailPoet, _, jQuery) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock;
+  var base = BaseBlock;
 
   Module.ButtonBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'button',
         text: 'Button',
@@ -42,31 +42,31 @@ define([
 
   Module.ButtonBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_button_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.buttonBlock; },
+    getTemplate: function () { return window.templates.buttonBlock; },
-    onDragSubstituteBy: function() { return Module.ButtonWidgetView; },
+    onDragSubstituteBy: function () { return Module.ButtonWidgetView; },
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
       ShowSettingsBehavior: {}
     }),
-    initialize: function() {
+    initialize: function () {
       base.BlockView.prototype.initialize.apply(this, arguments);
 
       // Listen for attempts to change all dividers in one go
-      this._replaceButtonStylesHandler = function(data) { this.model.set(data); }.bind(this);
+      this._replaceButtonStylesHandler = function (data) { this.model.set(data); }.bind(this);
       App.getChannel().on('replaceAllButtonStyles', this._replaceButtonStylesHandler);
     },
-    onRender: function() {
+    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({
-    getTemplate: function() { return window.templates.buttonBlockSettings; },
+    getTemplate: function () { return window.templates.buttonBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'input .mailpoet_field_button_text': _.partial(this.changeField, 'text'),
         'input .mailpoet_field_button_url': _.partial(this.changeField, 'url'),
@@ -98,20 +98,20 @@ define([
         'click .mailpoet_done_editing': 'close'
       };
     },
-    templateContext: function() {
+    templateContext: function () {
       return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
         availableStyles: App.getAvailableStyles().toJSON(),
         renderOptions: this.renderOptions
       });
     },
-    applyToAll: function() {
+    applyToAll: function () {
       App.getChannel().trigger('replaceAllButtonStyles', _.pick(this.model.toJSON(), 'styles', 'type'));
     },
-    updateValueAndCall: function(fieldToUpdate, callable, event) {
+    updateValueAndCall: function (fieldToUpdate, callable, event) {
       this.$(fieldToUpdate).val(jQuery(event.target).val());
       callable(event);
     },
-    changeFontWeight: function(event) {
+    changeFontWeight: function (event) {
       var checked = !!jQuery(event.target).prop('checked');
       this.model.set(
         'styles.block.fontWeight',
@@ -121,24 +121,24 @@ define([
   });
 
   Module.ButtonWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.buttonInsertion; },
+    getTemplate: function () { return window.templates.buttonInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.ButtonBlockModel();
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('button', {
+    BeforeStartApp.registerBlockType('button', {
       blockModel: Module.ButtonBlockModel,
       blockView: Module.ButtonBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'button',
       widgetView: Module.ButtonWidgetView,
       priority: 92

assets/js/src/newsletter_editor/blocks/container.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Container content block.
  * This is a special kind of block, as it can contain content blocks, as well
@@ -10,25 +11,23 @@ define([
   'jquery',
   'newsletter_editor/App',
   'newsletter_editor/blocks/base'
-], function(Backbone, Marionette, _, jQuery, App, BaseBlock) {
+], function (Backbone, Marionette, _, jQuery, App, BaseBlock) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock,
+  var base = BaseBlock;
-    BlockCollection;
+  var BlockCollection;
 
   BlockCollection = Backbone.Collection.extend({
     model: base.BlockModel,
-    initialize: function() {
+    initialize: function () {
-      this.on('add change remove', function() { App.getChannel().trigger('autoSave'); });
+      this.on('add change remove', function () { App.getChannel().trigger('autoSave'); });
     },
-    parse: function(response) {
+    parse: function (response) {
-      var self = this;
+      return _.map(response, function (block) {
-      return _.map(response, function(block) {
         var Type = App.getBlockTypeModel(block.type);
         // TODO: If type has no registered model, use a backup one
-        return new Type(block, {parse: true});
+        return new Type(block, { parse: true });
       });
     }
   });
@@ -37,7 +36,7 @@ define([
     relations: {
       blocks: BlockCollection
     },
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'container',
         orientation: 'vertical',
@@ -49,14 +48,15 @@ define([
         blocks: new BlockCollection()
       }, App.getConfig().get('blockDefaults.container'));
     },
-    validate: function() {
+    validate: function () {
       // Recursively propagate validation checks to blocks in the tree
-      var invalidBlock =  this.get('blocks').find(function(block) { return !block.isValid(); });
+      var invalidBlock = this.get('blocks').find(function (block) { return !block.isValid(); });
       if (invalidBlock) {
         return invalidBlock.validationError;
       }
+      return undefined;
     },
-    parse: function(response) {
+    parse: function (response) {
       // If container has any blocks - add them to a collection
       if (response.type === 'container' && _.has(response, 'blocks')) {
         response.blocks = new BlockCollection(response.blocks, {
@@ -65,8 +65,8 @@ define([
       }
       return response;
     },
-    getChildren: function() {
+    getChildren: function () {
-      var models = this.get('blocks').map(function(model, index, list) {
+      var models = this.get('blocks').map(function (model) {
         return [model, model.getChildren()];
       });
 
@@ -76,10 +76,10 @@ define([
 
   Module.ContainerBlocksView = Marionette.CollectionView.extend({
     className: 'mailpoet_container',
-    childView: function(model) {
+    childView: function (model) {
       return App.getBlockTypeView(model.get('type'));
     },
-    childViewOptions: function() {
+    childViewOptions: function () {
       var newRenderOptions = _.clone(this.renderOptions);
       if (newRenderOptions.depth !== undefined) {
         newRenderOptions.depth += 1;
@@ -88,9 +88,9 @@ define([
         renderOptions: newRenderOptions
       };
     },
-    emptyView: function() { return Module.ContainerBlockEmptyView; },
+    emptyView: function () { return Module.ContainerBlockEmptyView; },
-    emptyViewOptions: function() { return { renderOptions: this.renderOptions }; },
+    emptyViewOptions: function () { return { renderOptions: this.renderOptions }; },
-    initialize: function(options) {
+    initialize: function (options) {
       this.renderOptions = options.renderOptions;
     }
   });
@@ -103,7 +103,7 @@ define([
       }
     }),
     className: 'mailpoet_block mailpoet_container_block mailpoet_droppable_block mailpoet_droppable_layout_block',
-    getTemplate: function() { return window.templates.containerBlock; },
+    getTemplate: function () { return window.templates.containerBlock; },
     events: _.extend({}, base.BlockView.prototype.events, {
       'click .mailpoet_newsletter_layer_selector': 'toggleEditingLayer'
     }),
@@ -115,13 +115,14 @@ define([
       DraggableBehavior: {
         cloneOriginal: true,
         hideOriginal: true,
-        onDrop: function(options) {
+        onDrop: function (options) {
           // After a clone of model has been dropped, cleanup
           // and destroy self
           options.dragBehavior.view.model.destroy();
         },
-        onDragSubstituteBy: function(behavior) {
+        onDragSubstituteBy: function (behavior) {
-          var WidgetView, node;
+          var WidgetView;
+          var node;
           // When block is being dragged, display the widget icon instead.
           // This will create an instance of block's widget view and
           // use it's rendered DOM element instead of the content block
@@ -132,8 +133,9 @@ define([
             WidgetView.destroy();
             return node;
           }
+          return undefined;
         },
-        testAttachToInstance: function(model, view) {
+        testAttachToInstance: function (model, view) {
           // Attach Draggable only to layout containers and disable it
           // for root and column containers.
           return view.renderOptions.depth === 1;
@@ -141,7 +143,7 @@ define([
       },
       HighlightContainerBehavior: {}
     }),
-    onDragSubstituteBy: function() {
+    onDragSubstituteBy: function () {
       // For two and three column layouts display their respective widgets,
       // otherwise always default to one column layout widget
       if (this.renderOptions.depth === 1) {
@@ -149,14 +151,13 @@ define([
         if (this.model.get('blocks').length === 2) return Module.TwoColumnContainerWidgetView;
       }
       return Module.OneColumnContainerWidgetView;
-
     },
-    initialize: function(options) {
+    initialize: function (options) {
       base.BlockView.prototype.initialize.apply(this, arguments);
 
       this.renderOptions = _.defaults(options.renderOptions || {}, {});
     },
-    onRender: function() {
+    onRender: function () {
       this.toolsView = new Module.ContainerBlockToolsView({
         model: this.model,
         tools: {
@@ -177,37 +178,37 @@ define([
       // Sets child container orientation HTML class here, as child CollectionView won't have access to model and will overwrite existing region element instead
       this.$('> .mailpoet_container').attr('class', 'mailpoet_container mailpoet_container_' + this.model.get('orientation'));
     },
-    showTools: function() {
+    showTools: function () {
       if (this.renderOptions.depth === 1 && !this.$el.hasClass('mailpoet_container_layer_active')) {
         this.$(this.ui.tools).addClass('mailpoet_display_tools');
         this.toolsView.triggerMethod('showTools');
       }
     },
-    hideTools: function() {
+    hideTools: function () {
       if (this.renderOptions.depth === 1 && !this.$el.hasClass('mailpoet_container_layer_active')) {
         this.$(this.ui.tools).removeClass('mailpoet_display_tools');
         this.toolsView.triggerMethod('hideTools');
       }
     },
-    toggleEditingLayer: function(event) {
+    toggleEditingLayer: function (event) {
-      var that = this,
+      var that = this;
-        $toggleButton = this.$('> .mailpoet_tools .mailpoet_newsletter_layer_selector'),
+      var $toggleButton = this.$('> .mailpoet_tools .mailpoet_newsletter_layer_selector');
-        $overlay = jQuery('.mailpoet_layer_overlay'),
+      var $overlay = jQuery('.mailpoet_layer_overlay');
-        $container = this.$('> .mailpoet_container'),
+      var $container = this.$('> .mailpoet_container');
-        enableContainerLayer = function() {
+      var disableContainerLayer = function () {
-          that.$el.addClass('mailpoet_container_layer_active');
+        that.$el.removeClass('mailpoet_container_layer_active');
-          $toggleButton.addClass('mailpoet_container_layer_active');
+        $toggleButton.removeClass('mailpoet_container_layer_active');
-          $container.addClass('mailpoet_layer_highlight');
+        $container.removeClass('mailpoet_layer_highlight');
-          $overlay.click(disableContainerLayer);
+        $overlay.hide();
-          $overlay.show();
+        $overlay.off('click');
-        },
+      };
-        disableContainerLayer = function() {
+      var enableContainerLayer = function () {
-          that.$el.removeClass('mailpoet_container_layer_active');
+        that.$el.addClass('mailpoet_container_layer_active');
-          $toggleButton.removeClass('mailpoet_container_layer_active');
+        $toggleButton.addClass('mailpoet_container_layer_active');
-          $container.removeClass('mailpoet_layer_highlight');
+        $container.addClass('mailpoet_layer_highlight');
-          $overlay.hide();
+        $overlay.click(disableContainerLayer);
-          $overlay.off('click');
+        $overlay.show();
-        };
+      };
       if ($toggleButton.hasClass('mailpoet_container_layer_active')) {
         disableContainerLayer();
       } else {
@@ -218,11 +219,11 @@ define([
   });
 
   Module.ContainerBlockEmptyView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.containerEmpty; },
+    getTemplate: function () { return window.templates.containerEmpty; },
-    initialize: function(options) {
+    initialize: function (options) {
       this.renderOptions = _.defaults(options.renderOptions || {}, {});
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         isRoot: this.renderOptions.depth === 0,
         emptyContainerMessage: this.renderOptions.emptyContainerMessage || ''
@@ -231,12 +232,12 @@ define([
   });
 
   Module.ContainerBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.ContainerBlockSettingsView; }
+    getSettingsView: function () { return Module.ContainerBlockSettingsView; }
   });
 
   Module.ContainerBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.containerBlockSettings; },
+    getTemplate: function () { return window.templates.containerBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'change .mailpoet_field_container_background_color': _.partial(this.changeColorField, 'styles.block.backgroundColor'),
         'click .mailpoet_done_editing': 'close'
@@ -245,21 +246,21 @@ define([
     regions: {
       columnsSettingsRegion: '.mailpoet_container_columns_settings'
     },
-    initialize: function() {
+    initialize: function () {
       base.BlockSettingsView.prototype.initialize.apply(this, arguments);
 
       this._columnsSettingsView = new (Module.ContainerBlockColumnsSettingsView)({
         collection: this.model.get('blocks')
       });
     },
-    onRender: function() {
+    onRender: function () {
       this.showChildView('columnsSettingsRegion', this._columnsSettingsView);
     }
   });
 
   Module.ContainerBlockColumnsSettingsView = Marionette.CollectionView.extend({
-    childView: function() { return Module.ContainerBlockColumnSettingsView; },
+    childView: function () { return Module.ContainerBlockColumnSettingsView; },
-    childViewOptions: function(model, index) {
+    childViewOptions: function (model, index) {
       return {
         columnIndex: index
       };
@@ -267,11 +268,11 @@ define([
   });
 
   Module.ContainerBlockColumnSettingsView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.containerBlockColumnSettings; },
+    getTemplate: function () { return window.templates.containerBlockColumnSettings; },
-    initialize: function(options) {
+    initialize: function (options) {
       this.columnNumber = (options.columnIndex || 0) + 1;
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON(),
         columnNumber: this.columnNumber
@@ -281,11 +282,11 @@ define([
 
   Module.OneColumnContainerWidgetView = base.WidgetView.extend({
     className: base.WidgetView.prototype.className + ' mailpoet_droppable_layout_block',
-    getTemplate: function() { return window.templates.oneColumnLayoutInsertion; },
+    getTemplate: function () { return window.templates.oneColumnLayoutInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.ContainerBlockModel({
             orientation: 'horizontal',
             blocks: [
@@ -299,11 +300,11 @@ define([
 
   Module.TwoColumnContainerWidgetView = base.WidgetView.extend({
     className: base.WidgetView.prototype.className + ' mailpoet_droppable_layout_block',
-    getTemplate: function() { return window.templates.twoColumnLayoutInsertion; },
+    getTemplate: function () { return window.templates.twoColumnLayoutInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.ContainerBlockModel({
             orientation: 'horizontal',
             blocks: [
@@ -318,11 +319,11 @@ define([
 
   Module.ThreeColumnContainerWidgetView = base.WidgetView.extend({
     className: base.WidgetView.prototype.className + ' mailpoet_droppable_layout_block',
-    getTemplate: function() { return window.templates.threeColumnLayoutInsertion; },
+    getTemplate: function () { return window.templates.threeColumnLayoutInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.ContainerBlockModel({
             orientation: 'horizontal',
             blocks: [
@@ -336,25 +337,25 @@ define([
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('container', {
+    BeforeStartApp.registerBlockType('container', {
       blockModel: Module.ContainerBlockModel,
       blockView: Module.ContainerBlockView
     });
 
-    App.registerLayoutWidget({
+    BeforeStartApp.registerLayoutWidget({
       name: 'oneColumnLayout',
       priority: 100,
       widgetView: Module.OneColumnContainerWidgetView
     });
 
-    App.registerLayoutWidget({
+    BeforeStartApp.registerLayoutWidget({
       name: 'twoColumnLayout',
       priority: 100,
       widgetView: Module.TwoColumnContainerWidgetView
     });
 
-    App.registerLayoutWidget({
+    BeforeStartApp.registerLayoutWidget({
       name: 'threeColumnLayout',
       priority: 100,
       widgetView: Module.ThreeColumnContainerWidgetView

assets/js/src/newsletter_editor/blocks/divider.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Divider content block
  */
@@ -5,17 +7,13 @@ define([
   'newsletter_editor/App',
   'newsletter_editor/blocks/base',
   'underscore',
-  'jquery',
+  'jquery'
-  'mailpoet'
+], function (App, BaseBlock, _, jQuery) { // eslint-disable-line func-names
-], function(App, BaseBlock, _, jQuery, MailPoet) {
+  var Module = {};
-
+  var base = BaseBlock;
-  'use strict';
-
-  var Module = {},
-    base = BaseBlock;
 
   Module.DividerBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () { // eslint-disable-line func-names
       return this._getDefaults({
         type: 'divider',
         styles: {
@@ -33,13 +31,13 @@ define([
 
   Module.DividerBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_divider_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.dividerBlock; },
+    getTemplate: function () { return window.templates.dividerBlock; }, // eslint-disable-line func-names
     modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'),
     behaviors: _.defaults({
       ResizableBehavior: {
         elementSelector: '.mailpoet_content',
         resizeHandleSelector: '.mailpoet_resize_handle',
-        transformationFunction: function(y) { return y / 2; },
+        transformationFunction: function (y) { return y / 2; }, // eslint-disable-line func-names
         minLength: 0, // TODO: Move this number to editor configuration
         modelField: 'styles.block.padding'
       },
@@ -47,45 +45,45 @@ define([
         ignoreFrom: '.mailpoet_resize_handle'
       }
     }, base.BlockView.prototype.behaviors),
-    onDragSubstituteBy: function() { return Module.DividerWidgetView; },
+    onDragSubstituteBy: function () { return Module.DividerWidgetView; }, // eslint-disable-line func-names
-    initialize: function() {
+    initialize: function () { // eslint-disable-line func-names
-      base.BlockView.prototype.initialize.apply(this, arguments);
       var that = this;
+      base.BlockView.prototype.initialize.apply(this, arguments);
 
       // Listen for attempts to change all dividers in one go
-      this._replaceDividerHandler = function(data) { that.model.set(data); that.model.trigger('applyToAll'); };
+      this._replaceDividerHandler = function (data) { that.model.set(data); that.model.trigger('applyToAll'); }; // eslint-disable-line func-names
       App.getChannel().on('replaceAllDividers', this._replaceDividerHandler);
 
       this.listenTo(this.model, 'change:src change:styles.block.backgroundColor change:styles.block.borderStyle change:styles.block.borderWidth change:styles.block.borderColor applyToAll', this.render);
       this.listenTo(this.model, 'change:styles.block.padding', this.changePadding);
     },
-    templateContext: function() {
+    templateContext: function () { // eslint-disable-line func-names
       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() {
+    onRender: function () { // eslint-disable-line func-names
       this.toolsView = new Module.DividerBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () { // eslint-disable-line func-names
       App.getChannel().off('replaceAllDividers', this._replaceDividerHandler);
       this.stopListening(this.model);
     },
-    changePadding: function() {
+    changePadding: function () { // eslint-disable-line func-names
       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');
+      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; } // eslint-disable-line func-names
   });
 
   Module.DividerBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.dividerBlockSettings; },
+    getTemplate: function () { return window.templates.dividerBlockSettings; }, // eslint-disable-line func-names
-    events: function() {
+    events: function () { // eslint-disable-line func-names
       return {
         'click .mailpoet_field_divider_style': 'changeStyle',
 
@@ -99,53 +97,53 @@ define([
         'click .mailpoet_done_editing': 'close'
       };
     },
-    modelEvents: function() {
+    modelEvents: function () { // eslint-disable-line func-names
       return {
         'change:styles.block.borderColor': 'repaintDividerStyleOptions'
       };
     },
-    templateContext: function() {
+    templateContext: function () { // eslint-disable-line func-names
       return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
         availableStyles: App.getAvailableStyles().toJSON(),
         renderOptions: this.renderOptions
       });
     },
-    changeStyle: function(event) {
+    changeStyle: function (event) { // eslint-disable-line func-names
       var style = jQuery(event.currentTarget).data('style');
       this.model.set('styles.block.borderStyle', style);
       this.$('.mailpoet_field_divider_style').removeClass('mailpoet_active_divider_style');
       this.$('.mailpoet_field_divider_style[data-style="' + style + '"]').addClass('mailpoet_active_divider_style');
     },
-    repaintDividerStyleOptions: function() {
+    repaintDividerStyleOptions: function () { // eslint-disable-line func-names
       this.$('.mailpoet_field_divider_style > div').css('border-top-color', this.model.get('styles.block.borderColor'));
     },
-    applyToAll: function(event) {
+    applyToAll: function () { // eslint-disable-line func-names
       App.getChannel().trigger('replaceAllDividers', this.model.toJSON());
     },
-    updateValueAndCall: function(fieldToUpdate, callable, event) {
+    updateValueAndCall: function (fieldToUpdate, callable, event) { // eslint-disable-line func-names
       this.$(fieldToUpdate).val(jQuery(event.target).val());
       callable(event);
     }
   });
 
   Module.DividerWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.dividerInsertion; },
+    getTemplate: function () { return window.templates.dividerInsertion; }, // eslint-disable-line func-names
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () { // eslint-disable-line func-names
           return new Module.DividerBlockModel();
         }
       }
     }
   });
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) { // eslint-disable-line func-names
-    App.registerBlockType('divider', {
+    BeforeStartApp.registerBlockType('divider', {
       blockModel: Module.DividerBlockModel,
       blockView: Module.DividerBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'divider',
       widgetView: Module.DividerWidgetView,
       priority: 93

assets/js/src/newsletter_editor/blocks/footer.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Footer content block
  */
@@ -6,15 +8,12 @@ define([
   'newsletter_editor/blocks/base',
   'underscore',
   'mailpoet'
-], function(App, BaseBlock, _, MailPoet) {
+], function (App, BaseBlock, _, MailPoet) { // eslint-disable-line func-names
-
+  var Module = {};
-  'use strict';
+  var base = BaseBlock;
-
-  var Module = {},
-    base = BaseBlock;
 
   Module.FooterBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () { // eslint-disable-line func-names
       return this._getDefaults({
         type: 'footer',
         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>',
@@ -39,13 +38,13 @@ define([
 
   Module.FooterBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_footer_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.footerBlock; },
+    getTemplate: function () { return window.templates.footerBlock; }, // eslint-disable-line func-names
     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'
     }, _.omit(base.BlockView.prototype.modelEvents, 'change')),
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
       TextEditorBehavior: {
-        configurationFilter: function(originalSettings) {
+        configurationFilter: function (originalSettings) { // eslint-disable-line func-names
           return _.extend({}, originalSettings, {
             mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
             mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
@@ -53,37 +52,37 @@ define([
         }
       }
     }),
-    onDragSubstituteBy: function() { return Module.FooterWidgetView; },
+    onDragSubstituteBy: function () { return Module.FooterWidgetView; }, // eslint-disable-line func-names
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       this.toolsView = new Module.FooterBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
     },
-    onTextEditorChange: function(newContent) {
+    onTextEditorChange: function (newContent) { // eslint-disable-line func-names
       this.model.set('text', newContent);
     },
-    onTextEditorFocus: function() {
+    onTextEditorFocus: function () { // eslint-disable-line func-names
       this.disableDragging();
       this.disableShowingTools();
     },
-    onTextEditorBlur: function() {
+    onTextEditorBlur: function () { // eslint-disable-line func-names
       this.enableDragging();
       this.enableShowingTools();
     }
   });
 
   Module.FooterBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.FooterBlockSettingsView; }
+    getSettingsView: function () { return Module.FooterBlockSettingsView; } // eslint-disable-line func-names
   });
 
   Module.FooterBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.footerBlockSettings; },
+    getTemplate: function () { return window.templates.footerBlockSettings; }, // eslint-disable-line func-names
-    events: function() {
+    events: function () { // eslint-disable-line func-names
       return {
         'change .mailpoet_field_footer_text_color': _.partial(this.changeColorField, 'styles.text.fontColor'),
         'change .mailpoet_field_footer_text_font_family': _.partial(this.changeField, 'styles.text.fontFamily'),
         'change .mailpoet_field_footer_text_size': _.partial(this.changeField, 'styles.text.fontSize'),
         'change #mailpoet_field_footer_link_color': _.partial(this.changeColorField, 'styles.link.fontColor'),
-        'change #mailpoet_field_footer_link_underline': function(event) {
+        'change #mailpoet_field_footer_link_underline': function (event) { // eslint-disable-line func-names
           this.model.set('styles.link.textDecoration', (event.target.checked) ? event.target.value : 'none');
         },
         'change .mailpoet_field_footer_background_color': _.partial(this.changeColorField, 'styles.block.backgroundColor'),
@@ -91,7 +90,7 @@ define([
         'click .mailpoet_done_editing': 'close'
       };
     },
-    templateContext: function() {
+    templateContext: function () { // eslint-disable-line func-names
       return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
         availableStyles: App.getAvailableStyles().toJSON()
       });
@@ -99,24 +98,24 @@ define([
   });
 
   Module.FooterWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.footerInsertion; },
+    getTemplate: function () { return window.templates.footerInsertion; }, // eslint-disable-line func-names
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () { // eslint-disable-line func-names
           return new Module.FooterBlockModel();
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) { // eslint-disable-line func-names
-    App.registerBlockType('footer', {
+    BeforeStartApp.registerBlockType('footer', {
       blockModel: Module.FooterBlockModel,
       blockView: Module.FooterBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'footer',
       widgetView: Module.FooterWidgetView,
       priority: 99

assets/js/src/newsletter_editor/blocks/header.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Header content block
  */
@@ -6,15 +8,12 @@ define([
   'newsletter_editor/blocks/base',
   'underscore',
   'mailpoet'
-], function(App, BaseBlock, _, MailPoet) {
+], function (App, BaseBlock, _, MailPoet) { // eslint-disable-line func-names
-
+  var Module = {};
-  'use strict';
+  var base = BaseBlock;
-
-  var Module = {},
-    base = BaseBlock;
 
   Module.HeaderBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () { // eslint-disable-line func-names
       return this._getDefaults({
         type: 'header',
         text: 'Display problems? <a href="[link:newsletter_view_in_browser_url]">View it in your browser</a>',
@@ -39,13 +38,13 @@ define([
 
   Module.HeaderBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_header_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.headerBlock; },
+    getTemplate: function () { return window.templates.headerBlock; }, // eslint-disable-line func-names
     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'
     }, _.omit(base.BlockView.prototype.modelEvents, 'change')),
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
       TextEditorBehavior: {
-        configurationFilter: function(originalSettings) {
+        configurationFilter: function (originalSettings) { // eslint-disable-line func-names
           return _.extend({}, originalSettings, {
             mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
             mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
@@ -53,37 +52,37 @@ define([
         }
       }
     }),
-    onDragSubstituteBy: function() { return Module.HeaderWidgetView; },
+    onDragSubstituteBy: function () { return Module.HeaderWidgetView; }, // eslint-disable-line func-names
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       this.toolsView = new Module.HeaderBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
     },
-    onTextEditorChange: function(newContent) {
+    onTextEditorChange: function (newContent) { // eslint-disable-line func-names
       this.model.set('text', newContent);
     },
-    onTextEditorFocus: function() {
+    onTextEditorFocus: function () { // eslint-disable-line func-names
       this.disableDragging();
       this.disableShowingTools();
     },
-    onTextEditorBlur: function() {
+    onTextEditorBlur: function () { // eslint-disable-line func-names
       this.enableDragging();
       this.enableShowingTools();
     }
   });
 
   Module.HeaderBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.HeaderBlockSettingsView; }
+    getSettingsView: function () { return Module.HeaderBlockSettingsView; } // eslint-disable-line func-names
   });
 
   Module.HeaderBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.headerBlockSettings; },
+    getTemplate: function () { return window.templates.headerBlockSettings; }, // eslint-disable-line func-names
-    events: function() {
+    events: function () { // eslint-disable-line func-names
       return {
         'change .mailpoet_field_header_text_color': _.partial(this.changeColorField, 'styles.text.fontColor'),
         'change .mailpoet_field_header_text_font_family': _.partial(this.changeField, 'styles.text.fontFamily'),
         'change .mailpoet_field_header_text_size': _.partial(this.changeField, 'styles.text.fontSize'),
         'change #mailpoet_field_header_link_color': _.partial(this.changeColorField, 'styles.link.fontColor'),
-        'change #mailpoet_field_header_link_underline': function(event) {
+        'change #mailpoet_field_header_link_underline': function (event) { // eslint-disable-line func-names
           this.model.set('styles.link.textDecoration', (event.target.checked) ? event.target.value : 'none');
         },
         'change .mailpoet_field_header_background_color': _.partial(this.changeColorField, 'styles.block.backgroundColor'),
@@ -91,7 +90,7 @@ define([
         'click .mailpoet_done_editing': 'close'
       };
     },
-    templateContext: function() {
+    templateContext: function () { // eslint-disable-line func-names
       return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
         availableStyles: App.getAvailableStyles().toJSON()
       });
@@ -99,24 +98,24 @@ define([
   });
 
   Module.HeaderWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.headerInsertion; },
+    getTemplate: function () { return window.templates.headerInsertion; }, // eslint-disable-line func-names
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () { // eslint-disable-line func-names
           return new Module.HeaderBlockModel();
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) { // eslint-disable-line func-names
-    App.registerBlockType('header', {
+    BeforeStartApp.registerBlockType('header', {
       blockModel: Module.HeaderBlockModel,
       blockView: Module.HeaderBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'header',
       widgetView: Module.HeaderWidgetView,
       priority: 98

assets/js/src/newsletter_editor/blocks/image.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Image content block
  */
@@ -7,16 +8,15 @@ define([
   'underscore',
   'mailpoet',
   'jquery'
-], function(App, BaseBlock, _, MailPoet, jQuery) {
+], function (App, BaseBlock, _, MailPoet, jQuery) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock,
+  var base = BaseBlock;
-    ImageWidgetView;
+  var ImageWidgetView;
 
   Module.ImageBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'image',
         link: '',
@@ -36,34 +36,45 @@ define([
 
   Module.ImageBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_image_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.imageBlock; },
+    getTemplate: function () { return window.templates.imageBlock; },
-    onDragSubstituteBy: function() { return Module.ImageWidgetView; },
+    onDragSubstituteBy: function () { return Module.ImageWidgetView; },
-    templateContext: function() {
+    templateContext: function () {
       return _.extend({
         imageMissingSrc: App.getConfig().get('urls.imageMissing')
       }, base.BlockView.prototype.templateContext.apply(this));
     },
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
-      ShowSettingsBehavior: {}
+      ResizableBehavior: {
+        elementSelector: '.mailpoet_image',
+        resizeHandleSelector: '.mailpoet_image_resize_handle',
+        onResize: function (event) {
+          var corner = this.$('.mailpoet_image').offset();
+          var width = event.pageX - corner.left;
+          this.view.model.set('width', width + 'px');
+        }
+      },
+      ShowSettingsBehavior: {
+        ignoreFrom: '.mailpoet_image_resize_handle'
+      }
     }),
-    onRender: function() {
+    onRender: function () {
       this.toolsView = new Module.ImageBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
-
       if (this.model.get('fullWidth')) {
         this.$el.addClass('mailpoet_full_image');
       } else {
         this.$el.removeClass('mailpoet_full_image');
       }
+      this.$('.mailpoet_content').css('width', this.model.get('width'));
     }
   });
 
   Module.ImageBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.ImageBlockSettingsView; }
+    getSettingsView: function () { return Module.ImageBlockSettingsView; }
   });
 
   Module.ImageBlockSettingsView = base.BlockSettingsView.extend({
-    onRender: function() {
+    onRender: function () {
       MailPoet.helpTooltip.show(document.getElementById('tooltip-designer-full-width'), {
         tooltipId: 'tooltip-editor-full-width',
         tooltip: MailPoet.I18n.t('helpTooltipDesignerFullWidth')
@@ -73,8 +84,8 @@ define([
         tooltip: MailPoet.I18n.t('helpTooltipDesignerIdealWidth')
       });
     },
-    getTemplate: function() { return window.templates.imageBlockSettings; },
+    getTemplate: function () { return window.templates.imageBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'input .mailpoet_field_image_link': _.partial(this.changeField, 'link'),
         'input .mailpoet_field_image_address': 'changeAddress',
@@ -82,26 +93,52 @@ 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',
+        'input .mailpoet_field_image_width': _.partial(this.updateValueAndCall, '.mailpoet_field_image_width_input', _.partial(this.changePixelField, 'width').bind(this)),
+        'change .mailpoet_field_image_width': _.partial(this.updateValueAndCall, '.mailpoet_field_image_width_input', _.partial(this.changePixelField, 'width').bind(this)),
+        'input .mailpoet_field_image_width_input': _.partial(this.updateValueAndCall, '.mailpoet_field_image_width', _.partial(this.changePixelField, 'width').bind(this))
       };
     },
-    initialize: function(options) {
+    modelEvents: function () {
+      return {
+        'change:maxWidth': 'updateMaxWidth',
+        'change:width': 'updateWidth'
+      };
+    },
+    updateValueAndCall: function (fieldToUpdate, callable, event) {
+      this.$(fieldToUpdate).val(jQuery(event.target).val());
+      callable(event);
+    },
+    updateMaxWidth: function () {
+      var maxWidth = parseInt(this.model.get('maxWidth'));
+      this.$('.mailpoet_field_image_width').attr('max', maxWidth);
+      this.$('.mailpoet_field_image_width_input').attr('max', maxWidth);
+    },
+    updateWidth: function () {
+      var width = parseInt(this.model.get('width'));
+      this.$('.mailpoet_field_image_width').val(width);
+      this.$('.mailpoet_field_image_width_input').val(width);
+    },
+    initialize: function (options) {
       base.BlockSettingsView.prototype.initialize.apply(this, arguments);
 
       if (options.showImageManager) {
         this.showMediaManager();
       }
     },
-    showMediaManager: function() {
+    showMediaManager: function () {
+      var that = this;
+      var MediaManager;
+      var theFrame;
       if (this._mediaManager) {
         this._mediaManager.resetSelections();
         this._mediaManager.open();
         return;
       }
 
-      var MediaManager = window.wp.media.view.MediaFrame.Select.extend({
+      MediaManager = window.wp.media.view.MediaFrame.Select.extend({
 
-        initialize: function() {
+        initialize: function () {
           window.wp.media.view.MediaFrame.prototype.initialize.apply(this, arguments);
 
           _.defaults(this.options, {
@@ -119,16 +156,16 @@ define([
           this.$el.addClass('hide-title');
         },
 
-        resetSelections: function() {
+        resetSelections: function () {
           this.state().get('selection').reset();
         },
 
-        createQuery: function(options) {
+        createQuery: function (options) {
           var query = window.wp.media.query(options);
           return query;
         },
 
-        createStates: function() {
+        createStates: function () {
           var options = this.options;
 
           // Add the default states.
@@ -156,12 +193,13 @@ define([
             })
           ]);
 
-          if(window.wp.media.view.settings.post.featuredImageId) {
+          if (window.wp.media.view.settings.post.featuredImageId) {
             this.states.add(new window.wp.media.controller.FeaturedImage());
           }
         },
 
-        bindHandlers: function() {
+        bindHandlers: function () {
+          var handlers;
           // from Select
           this.on('router:create:browse', this.createRouter, this);
           this.on('router:render:browse', this.browseRouter, this);
@@ -176,7 +214,7 @@ define([
 
           this.on('updateExcluded', this.browseContent, this);
 
-          var handlers = {
+          handlers = {
             content: {
               embed: 'embedContent',
               'edit-selection': 'editSelectionContent'
@@ -186,20 +224,20 @@ define([
             }
           };
 
-          _.each(handlers, function(regionHandlers, region) {
+          _.each(handlers, function (regionHandlers, region) {
-            _.each(regionHandlers, function(callback, handler) {
+            _.each(regionHandlers, function (callback, handler) {
               this.on(region + ':render:' + handler, this[callback], this);
             }, this);
           }, this);
         },
 
-        uploadContent: function() {
+        uploadContent: function () {
           window.wp.media.view.MediaFrame.Select.prototype.uploadContent.apply(this, arguments);
           this.$el.addClass('hide-toolbar');
         },
 
         // Content
-        embedContent: function() {
+        embedContent: function () {
           var view = new window.wp.media.view.Embed({
             controller: this,
             model: this.state()
@@ -209,10 +247,10 @@ define([
           view.url.focus();
         },
 
-        editSelectionContent: function() {
+        editSelectionContent: function () {
-          var state = this.state(),
+          var state = this.state();
-            selection = state.get('selection'),
+          var selection = state.get('selection');
-            view;
+          var view;
 
           view = new window.wp.media.view.AttachmentsBrowser({
             controller: this,
@@ -230,7 +268,7 @@ define([
             text: 'Return to library',
             priority: -100,
 
-            click: function() {
+            click: function () {
               this.controller.content.mode('browse');
             }
           });
@@ -240,7 +278,7 @@ define([
         },
 
         // Toolbars
-        selectionStatusToolbar: function(view) {
+        selectionStatusToolbar: function (view) {
           var editable = this.state().get('editable');
 
           view.set('selection', new window.wp.media.view.Selection({
@@ -250,13 +288,13 @@ define([
 
             // If the selection is editable, pass the callback to
             // switch the content mode.
-            editable: editable && function() {
+            editable: editable && function () {
               this.controller.content.mode('edit-selection');
             }
-          }).render() );
+          }).render());
         },
 
-        mainInsertToolbar: function(view) {
+        mainInsertToolbar: function (view) {
           var controller = this;
 
           this.selectionStatusToolbar(view);
@@ -267,9 +305,9 @@ define([
             text: 'Select Image',
             requires: { selection: true },
 
-            click: function() {
+            click: function () {
-              var state = controller.state(),
+              var state = controller.state();
-                selection = state.get('selection');
+              var selection = state.get('selection');
 
               controller.close();
               state.trigger('insert', selection).reset();
@@ -277,7 +315,7 @@ define([
           });
         },
 
-        mainEmbedToolbar: function(toolbar) {
+        mainEmbedToolbar: function (toolbar) {
           var tbar = toolbar;
           tbar.view = new window.wp.media.view.Toolbar.Embed({
             controller: this,
@@ -287,46 +325,42 @@ define([
 
       });
 
-      var theFrame = new MediaManager({
+      theFrame = new MediaManager({
-          id: 'mailpoet-media-manager',
+        id: 'mailpoet-media-manager',
-          frame: 'select',
+        frame: 'select',
-          title: 'Select image',
+        title: 'Select image',
-          editing: false,
+        editing: false,
-          multiple: false,
+        multiple: false,
-          library: {
+        library: {
-            type: 'image'
+          type: 'image'
-          },
+        },
-          displaySettings: false,
+        displaySettings: false,
-          button: {
+        button: {
-            text: 'Select'
+          text: 'Select'
-          }
+        }
-        }),
+      });
-        that = this;
       this._mediaManager = theFrame;
 
-      this._mediaManager.on('insert', function() {
+      this._mediaManager.on('insert', function () {
         // Append media manager image selections to Images tab
         var selection = theFrame.state().get('selection');
-        selection.each(function(attachment) {
+        selection.each(function (attachment) {
-          var sizes = attachment.get('sizes'),
+          var sizes = attachment.get('sizes');
-            // Following advice from Becs, the target width should
+          // Following advice from Becs, the target width should
-            // be a double of one column width to render well on
+          // be a double of one column width to render well on
-            // retina screen devices
+          // retina screen devices
-            targetImageWidth = 1320,
+          var targetImageWidth = 1320;
 
-            // For main image use the size, that's closest to being 660px in width
+          // Pick the width that is closest to target width
-            sizeKeys = _.keys(sizes),
+          var increasingByWidthDifference = _.sortBy(
+            _.keys(sizes),
+            function (size) { return Math.abs(targetImageWidth - sizes[size].width); }
+          );
+          var bestWidth = sizes[_.first(increasingByWidthDifference)].width;
+          var imagesOfBestWidth = _.filter(_.values(sizes), function (size) { return size.width === bestWidth; });
 
-            // Pick the width that is closest to target width
+          // Maximize the height if there are multiple images with same width
-            increasingByWidthDifference = _.sortBy(
+          var mainSize = _.max(imagesOfBestWidth, function (size) { return size.height; });
-              _.keys(sizes),
-              function(size) { return Math.abs(targetImageWidth - sizes[size].width); }
-            ),
-            bestWidth = sizes[_.first(increasingByWidthDifference)].width,
-            imagesOfBestWidth = _.filter(_.values(sizes), function(size) { return size.width === bestWidth; }),
-
-            // Maximize the height if there are multiple images with same width
-            mainSize = _.max(imagesOfBestWidth, function(size) { return size.height; });
 
           that.model.set({
             height: mainSize.height + 'px',
@@ -341,11 +375,11 @@ define([
 
       this._mediaManager.open();
     },
-    changeAddress: function(event) {
+    changeAddress: function (event) {
       var src = jQuery(event.target).val();
       var image = new Image();
 
-      image.onload = function() {
+      image.onload = function () {
         this.model.set({
           src: src,
           width: image.naturalWidth + 'px',
@@ -355,7 +389,7 @@ define([
 
       image.src = src;
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () {
       base.BlockSettingsView.prototype.onBeforeDestroy.apply(this, arguments);
       if (typeof this._mediaManager === 'object') {
         this._mediaManager.remove();
@@ -364,14 +398,14 @@ define([
   });
 
   ImageWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.imageInsertion; },
+    getTemplate: function () { return window.templates.imageInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.ImageBlockModel();
         },
-        onDrop: function(options) {
+        onDrop: function (options) {
           options.droppedView.triggerMethod('showSettings', { showImageManager: true });
         }
       }
@@ -379,13 +413,13 @@ define([
   });
   Module.ImageWidgetView = ImageWidgetView;
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('image', {
+    BeforeStartApp.registerBlockType('image', {
       blockModel: Module.ImageBlockModel,
       blockView: Module.ImageBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'image',
       widgetView: Module.ImageWidgetView,
       priority: 91

assets/js/src/newsletter_editor/blocks/posts.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Posts block.
  *
@@ -23,7 +24,7 @@ define([
   'newsletter_editor/blocks/button',
   'newsletter_editor/blocks/divider',
   'select2'
-], function(
+], function (
   Backbone,
   Marionette,
   Radio,
@@ -36,15 +37,19 @@ define([
   ButtonBlock,
   DividerBlock
   ) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock;
+  var base = BaseBlock;
+  var PostsDisplayOptionsSettingsView;
+  var SinglePostSelectionSettingsView;
+  var EmptyPostSelectionSettingsView;
+  var PostSelectionSettingsView;
+  var PostsSelectionCollectionView;
 
   Module.PostsBlockModel = base.BlockModel.extend({
     stale: ['_selectedPosts', '_availablePosts', '_transformedPosts'],
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'posts',
         amount: '10',
@@ -60,7 +65,7 @@ define([
         titleIsLink: false, // false|true
         imageFullWidth: false, // true|false
         featuredImagePosition: 'belowTitle', // 'aboveTitle'|'belowTitle'|'none'
-        //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
+        // imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
         showCategories: 'no', // 'no'|'aboveText'|'belowText'
@@ -79,7 +84,7 @@ define([
         _transformedPosts: new (App.getBlockTypeModel('container'))()
       }, App.getConfig().get('blockDefaults.posts'));
     },
-    relations: function() {
+    relations: function () {
       return {
         readMoreButton: App.getBlockTypeModel('button'),
         divider: App.getBlockTypeModel('divider'),
@@ -88,11 +93,10 @@ define([
         _transformedPosts: App.getBlockTypeModel('container')
       };
     },
-    initialize: function() {
+    initialize: function () {
-      var that = this,
+      var POST_REFRESH_DELAY_MS = 500;
-        POST_REFRESH_DELAY_MS = 500,
+      var refreshAvailablePosts = _.debounce(this.fetchAvailablePosts.bind(this), POST_REFRESH_DELAY_MS);
-        refreshAvailablePosts = _.debounce(this.fetchAvailablePosts.bind(this), POST_REFRESH_DELAY_MS),
+      var refreshTransformedPosts = _.debounce(this._refreshTransformedPosts.bind(this), POST_REFRESH_DELAY_MS);
-        refreshTransformedPosts = _.debounce(this._refreshTransformedPosts.bind(this), POST_REFRESH_DELAY_MS);
 
       // Attach Radio.Requests API primarily for highlighting
       _.extend(this, Radio.Requests);
@@ -108,41 +112,42 @@ define([
 
       this.on('insertSelectedPosts', this._insertSelectedPosts, this);
     },
-    fetchAvailablePosts: function() {
+    fetchAvailablePosts: function () {
       var that = this;
       this.set('offset', 0);
-      CommunicationComponent.getPosts(this.toJSON()).done(function(posts) {
+      CommunicationComponent.getPosts(this.toJSON()).done(function (posts) {
         that.get('_availablePosts').reset(posts);
         that.get('_selectedPosts').reset(); // Empty out the collection
         that.trigger('change:_availablePosts');
-      }).fail(function() {
+      }).fail(function () {
         MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchAvailablePosts'));
       });
     },
-    _loadMorePosts: function() {
+    _loadMorePosts: function () {
-      var that = this,
+      var that = this;
-        postCount = this.get('_availablePosts').length,
+      var postCount = this.get('_availablePosts').length;
-        nextOffset = this.get('offset') + Number(this.get('amount'));
+      var nextOffset = this.get('offset') + Number(this.get('amount'));
 
-      if(postCount === 0 || postCount < nextOffset) {
+      if (postCount === 0 || postCount < nextOffset) {
         // No more posts to load
         return false;
       }
       this.set('offset', nextOffset);
       this.trigger('loadingMorePosts');
 
-      CommunicationComponent.getPosts(this.toJSON()).done(function(posts) {
+      CommunicationComponent.getPosts(this.toJSON()).done(function (posts) {
         that.get('_availablePosts').add(posts);
         that.trigger('change:_availablePosts');
-      }).fail(function() {
+      }).fail(function () {
         MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchAvailablePosts'));
-      }).always(function() {
+      }).always(function () {
         that.trigger('morePostsLoaded');
       });
+      return true;
     },
-    _refreshTransformedPosts: function() {
+    _refreshTransformedPosts: function () {
-      var that = this,
+      var that = this;
-        data = this.toJSON();
+      var data = this.toJSON();
 
       data.posts = this.get('_selectedPosts').pluck('ID');
 
@@ -151,25 +156,24 @@ define([
         return;
       }
 
-      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
+      CommunicationComponent.getTransformedPosts(data).done(function (posts) {
-        that.get('_transformedPosts').get('blocks').reset(posts, {parse: true});
+        that.get('_transformedPosts').get('blocks').reset(posts, { parse: true });
-      }).fail(function() {
+      }).fail(function () {
         MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
       });
     },
-    _insertSelectedPosts: function() {
+    _insertSelectedPosts: function () {
-      var that = this,
+      var data = this.toJSON();
-        data = this.toJSON(),
+      var index = this.collection.indexOf(this);
-        index = this.collection.indexOf(this),
+      var collection = this.collection;
-        collection = this.collection;
 
       data.posts = this.get('_selectedPosts').pluck('ID');
 
       if (data.posts.length === 0) return;
 
-      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
+      CommunicationComponent.getTransformedPosts(data).done(function (posts) {
         collection.add(posts, { at: index });
-      }).fail(function() {
+      }).fail(function () {
         MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
       });
     }
@@ -177,46 +181,48 @@ define([
 
   Module.PostsBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_posts_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.postsBlock; },
+    getTemplate: function () { return window.templates.postsBlock; },
     modelEvents: {}, // Forcefully disable all events
     regions: _.extend({
       postsRegion: '.mailpoet_posts_block_posts'
     }, base.BlockView.prototype.regions),
-    onDragSubstituteBy: function() { return Module.PostsWidgetView; },
+    onDragSubstituteBy: function () { return Module.PostsWidgetView; },
-    initialize: function() {
+    initialize: function () {
       base.BlockView.prototype.initialize.apply(this, arguments);
 
       this.toolsView = new Module.PostsBlockToolsView({ model: this.model });
       this.model.reply('blockView', this.notifyAboutSelf, this);
     },
-    onRender: function() {
+    onRender: function () {
+      var ContainerView;
+      var renderOptions;
       if (!this.getRegion('toolsRegion').hasView()) {
         this.showChildView('toolsRegion', this.toolsView);
       }
       this.trigger('showSettings');
 
-      var ContainerView = App.getBlockTypeView('container'),
+      ContainerView = App.getBlockTypeView('container');
-        renderOptions = {
+      renderOptions = {
-          disableTextEditor: true,
+        disableTextEditor: true,
-          disableDragAndDrop: 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 }));
     },
-    notifyAboutSelf: function() {
+    notifyAboutSelf: function () {
       return this;
     },
-    onBeforeDestroy: function() {
+    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 window.templates.postsBlockSettings; },
+    getTemplate: function () { return window.templates.postsBlockSettings; },
     regions: {
       selectionRegion: '.mailpoet_settings_posts_selection',
       displayOptionsRegion: '.mailpoet_settings_posts_display_options'
@@ -226,19 +232,19 @@ define([
       'click .mailpoet_settings_posts_show_post_selection': 'switchToPostSelection',
       'click .mailpoet_settings_posts_insert_selected': 'insertPosts'
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON()
       };
     },
-    initialize: function() {
+    initialize: function () {
       this.model.trigger('startEditing');
       this.selectionView = new PostSelectionSettingsView({ model: this.model });
       this.displayOptionsView = new PostsDisplayOptionsSettingsView({ model: this.model });
     },
-    onRender: function() {
+    onRender: function () {
-      var that = this,
+      var that = this;
-        blockView = this.model.request('blockView');
+      this.model.request('blockView');
 
       this.showChildView('selectionRegion', this.selectionView);
       this.showChildView('displayOptionsRegion', this.displayOptionsView);
@@ -248,7 +254,7 @@ define([
         template: '',
         position: 'right',
         width: App.getConfig().get('sidepanelWidth'),
-        onCancel: function() {
+        onCancel: function () {
           // Self destroy the block if the user closes settings modal
           that.model.destroy();
         }
@@ -258,7 +264,7 @@ define([
       this.selectionView.triggerMethod('attach');
       this.displayOptionsView.triggerMethod('attach');
     },
-    switchToDisplayOptions: function() {
+    switchToDisplayOptions: function () {
       // Switch content view
       this.$('.mailpoet_settings_posts_selection').addClass('mailpoet_closed');
       this.$('.mailpoet_settings_posts_display_options').removeClass('mailpoet_closed');
@@ -267,7 +273,7 @@ define([
       this.$('.mailpoet_settings_posts_show_display_options').addClass('mailpoet_hidden');
       this.$('.mailpoet_settings_posts_show_post_selection').removeClass('mailpoet_hidden');
     },
-    switchToPostSelection: function() {
+    switchToPostSelection: function () {
       // Switch content view
       this.$('.mailpoet_settings_posts_display_options').addClass('mailpoet_closed');
       this.$('.mailpoet_settings_posts_selection').removeClass('mailpoet_closed');
@@ -276,43 +282,43 @@ define([
       this.$('.mailpoet_settings_posts_show_post_selection').addClass('mailpoet_hidden');
       this.$('.mailpoet_settings_posts_show_display_options').removeClass('mailpoet_hidden');
     },
-    insertPosts: function() {
+    insertPosts: function () {
       this.model.trigger('insertSelectedPosts');
       this.model.destroy();
       this.close();
     }
   });
 
-  var PostsSelectionCollectionView = Marionette.CollectionView.extend({
+  PostsSelectionCollectionView = Marionette.CollectionView.extend({
     className: 'mailpoet_post_scroll_container',
-    childView: function() { return SinglePostSelectionSettingsView; },
+    childView: function () { return SinglePostSelectionSettingsView; },
-    emptyView: function() { return EmptyPostSelectionSettingsView; },
+    emptyView: function () { return EmptyPostSelectionSettingsView; },
-    childViewOptions: function() {
+    childViewOptions: function () {
       return {
         blockModel: this.blockModel
       };
     },
-    initialize: function(options) {
+    initialize: function (options) {
       this.blockModel = options.blockModel;
     },
     events: {
       scroll: 'onPostsScroll'
     },
-    onPostsScroll: function(event) {
+    onPostsScroll: function (event) {
       var $postsBox = jQuery(event.target);
-      if($postsBox.scrollTop() + $postsBox.innerHeight() >= $postsBox[0].scrollHeight){
+      if ($postsBox.scrollTop() + $postsBox.innerHeight() >= $postsBox[0].scrollHeight) {
         // Load more posts if scrolled to bottom
         this.blockModel.trigger('loadMorePosts');
       }
     }
   });
 
-  var PostSelectionSettingsView = Marionette.View.extend({
+  PostSelectionSettingsView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.postSelectionPostsBlockSettings; },
+    getTemplate: function () { return window.templates.postSelectionPostsBlockSettings; },
     regions: {
       posts: '.mailpoet_post_selection_container'
     },
-    events: function() {
+    events: function () {
       return {
         'change .mailpoet_settings_posts_content_type': _.partial(this.changeField, 'contentType'),
         'change .mailpoet_posts_post_status': _.partial(this.changeField, 'postStatus'),
@@ -320,30 +326,31 @@ define([
       };
     },
     modelEvents: {
-      'change:offset': function(model, value) {
+      'change:offset': function (model, value) {
         // Scroll posts view to top if settings are changed
         if (value === 0) {
           this.$('.mailpoet_post_scroll_container').scrollTop(0);
         }
       },
-      loadingMorePosts: function() {
+      loadingMorePosts: function () {
         this.$('.mailpoet_post_selection_loading').css('visibility', 'visible');
       },
-      morePostsLoaded: function() {
+      morePostsLoaded: function () {
         this.$('.mailpoet_post_selection_loading').css('visibility', 'hidden');
       }
     },
-    onRender: function() {
+    onRender: function () {
+      var postsView;
       // Dynamically update available post types
       CommunicationComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
-      var postsView = new PostsSelectionCollectionView({
+      postsView = new PostsSelectionCollectionView({
         collection: this.model.get('_availablePosts'),
         blockModel: this.model
       });
 
       this.showChildView('posts', postsView);
     },
-    onAttach: function() {
+    onAttach: function () {
       var that = this;
 
       this.$('.mailpoet_posts_categories_and_tags').select2({
@@ -356,35 +363,36 @@ define([
               term: params.term
             };
           },
-          transport: function(options, success, failure) {
+          transport: function (options, success, failure) {
             var taxonomies;
+            var termsPromise;
             var promise = CommunicationComponent.getTaxonomies(
               that.model.get('contentType')
-            ).then(function(tax) {
+            ).then(function (tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = CommunicationComponent.getTerms({
+              termsPromise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
-              }).then(function(terms) {
+              }).then(function (terms) {
                 return {
                   taxonomies: taxonomies,
                   terms: terms
                 };
               });
-              return promise;
+              return termsPromise;
             });
 
             promise.then(success);
             promise.fail(failure);
             return promise;
           },
-          processResults: function(data) {
+          processResults: function (data) {
             // Transform taxonomies and terms into select2 compatible format
             return {
               results: _.map(
                 data.terms,
-                function(item) {
+                function (item) {
                   return _.defaults({
                     text: data.taxonomies[item.taxonomy].labels.singular_name + ': ' + item.name,
                     id: item.term_id
@@ -395,29 +403,29 @@ define([
           }
         }
       }).on({
-        'select2:select': function(event) {
+        'select2:select': function (event) {
           var terms = that.model.get('terms');
           terms.add(event.params.data);
           // Reset whole model in order for change events to propagate properly
           that.model.set('terms', terms.toJSON());
         },
-        'select2:unselect': function(event) {
+        'select2:unselect': function (event) {
           var terms = that.model.get('terms');
           terms.remove(event.params.data);
           // Reset whole model in order for change events to propagate properly
           that.model.set('terms', terms.toJSON());
         }
-      }).trigger( 'change' );
+      }).trigger('change');
     },
-    changeField: function(field, event) {
+    changeField: function (field, event) {
       this.model.set(field, jQuery(event.target).val());
     },
-    _updateContentTypes: function(postTypes) {
+    _updateContentTypes: function (postTypes) {
-      var select = this.$('.mailpoet_settings_posts_content_type'),
+      var select = this.$('.mailpoet_settings_posts_content_type');
-        selectedValue = this.model.get('contentType');
+      var selectedValue = this.model.get('contentType');
 
       select.find('option').remove();
-      _.each(postTypes, function(type) {
+      _.each(postTypes, function (type) {
         select.append(jQuery('<option>', {
           value: type.name,
           text: type.label
@@ -427,29 +435,29 @@ define([
     }
   });
 
-  var EmptyPostSelectionSettingsView = Marionette.View.extend({
+  EmptyPostSelectionSettingsView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.emptyPostPostsBlockSettings; }
+    getTemplate: function () { return window.templates.emptyPostPostsBlockSettings; }
   });
 
-  var SinglePostSelectionSettingsView = Marionette.View.extend({
+  SinglePostSelectionSettingsView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.singlePostPostsBlockSettings; },
+    getTemplate: function () { return window.templates.singlePostPostsBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'change .mailpoet_select_post_checkbox': 'postSelectionChange'
       };
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON(),
         index: this._index
       };
     },
-    initialize: function(options) {
+    initialize: function (options) {
       this.blockModel = options.blockModel;
     },
-    postSelectionChange: function(event) {
+    postSelectionChange: function (event) {
-      var checkBox = jQuery(event.target),
+      var checkBox = jQuery(event.target);
-        selectedPostsCollection = this.blockModel.get('_selectedPosts');
+      var selectedPostsCollection = this.blockModel.get('_selectedPosts');
       if (checkBox.prop('checked')) {
         selectedPostsCollection.add(this.model);
       } else {
@@ -458,9 +466,9 @@ define([
     }
   });
 
-  var PostsDisplayOptionsSettingsView = base.BlockSettingsView.extend({
+  PostsDisplayOptionsSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.displayOptionsPostsBlockSettings; },
+    getTemplate: function () { return window.templates.displayOptionsPostsBlockSettings; },
-    events: function() {
+    events: function () {
       return {
         'click .mailpoet_posts_select_button': 'showButtonSettings',
         'click .mailpoet_posts_select_divider': 'showDividerSettings',
@@ -483,12 +491,12 @@ define([
         'change .mailpoet_posts_sort_by': _.partial(this.changeField, 'sortBy')
       };
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON()
       };
     },
-    showButtonSettings: function(event) {
+    showButtonSettings: function () {
       var buttonModule = ButtonBlock;
       (new buttonModule.ButtonBlockSettingsView({
         model: this.model.get('readMoreButton'),
@@ -499,7 +507,7 @@ define([
         }
       })).render();
     },
-    showDividerSettings: function(event) {
+    showDividerSettings: function () {
       var dividerModule = DividerBlock;
       (new dividerModule.DividerBlockSettingsView({
         model: this.model.get('divider'),
@@ -509,7 +517,7 @@ define([
         }
       })).render();
     },
-    changeReadMoreType: function(event) {
+    changeReadMoreType: function (event) {
       var value = jQuery(event.target).val();
       if (value == 'link') {
         this.$('.mailpoet_posts_read_more_text').removeClass('mailpoet_hidden');
@@ -520,7 +528,7 @@ define([
       }
       this.changeField('readMoreType', event);
     },
-    changeDisplayType: function(event) {
+    changeDisplayType: function (event) {
       var value = jQuery(event.target).val();
       if (value == 'titleOnly') {
         this.$('.mailpoet_posts_title_as_list').removeClass('mailpoet_hidden');
@@ -547,7 +555,7 @@ define([
 
       this.changeField('displayType', event);
     },
-    changeTitleFormat: function(event) {
+    changeTitleFormat: function (event) {
       var value = jQuery(event.target).val();
       if (value == 'ul') {
         this.$('.mailpoet_posts_non_title_list_options').addClass('mailpoet_hidden');
@@ -564,24 +572,24 @@ define([
   });
 
   Module.PostsWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.postsInsertion; },
+    getTemplate: function () { return window.templates.postsInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.PostsBlockModel({}, { parse: true });
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('posts', {
+    BeforeStartApp.registerBlockType('posts', {
       blockModel: Module.PostsBlockModel,
       blockView: Module.PostsBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'posts',
       widgetView: Module.PostsWidgetView,
       priority: 96

assets/js/src/newsletter_editor/blocks/social.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 /**
  * Social icons content block
  */
@@ -9,19 +10,19 @@ define([
   'backbone.supermodel',
   'underscore',
   'jquery'
-], function(App, BaseBlock, Backbone, Marionette, SuperModel, _, jQuery) {
+], function (App, BaseBlock, Backbone, Marionette, SuperModel, _, jQuery) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    base = BaseBlock,
+  var base = BaseBlock;
-    SocialBlockSettingsIconSelectorView,
+  var SocialBlockSettingsIconSelectorView;
-    SocialBlockSettingsIconView,
+  var SocialBlockSettingsIconView;
-    SocialBlockSettingsIconCollectionView,
+  var SocialBlockSettingsIconCollectionView;
-    SocialBlockSettingsStylesView;
+  var SocialBlockSettingsStylesView;
+  var SocialIconView;
 
   Module.SocialIconModel = SuperModel.extend({
-    defaults: function() {
+    defaults: function () {
       var defaultValues = App.getConfig().get('socialIcons.custom');
       return {
         type: 'socialIcon',
@@ -33,19 +34,19 @@ define([
         text: defaultValues.get('title')
       };
     },
-    initialize: function(options) {
+    initialize: function () {
       var that = this;
       // Make model swap to default values for that type when iconType changes
-      this.on('change:iconType', function() {
+      this.on('change:iconType', function () {
-        var defaultValues = App.getConfig().get('socialIcons').get(that.get('iconType')),
+        var defaultValues = App.getConfig().get('socialIcons').get(that.get('iconType'));
-          iconSet = that.collection.iconBlockModel.getIconSet();
+        var iconSet = that.collection.iconBlockModel.getIconSet();
         this.set({
           link: defaultValues.get('defaultLink'),
           image: iconSet.get(that.get('iconType')),
           text: defaultValues.get('title')
         });
       }, this);
-      this.on('change', function() { App.getChannel().trigger('autoSave'); });
+      this.on('change', function () { App.getChannel().trigger('autoSave'); });
     }
   });
 
@@ -55,7 +56,7 @@ define([
 
   Module.SocialBlockModel = base.BlockModel.extend({
     name: 'iconBlockModel',
-    defaults: function() {
+    defaults: function () {
       return this._getDefaults({
         type: 'social',
         iconSet: 'default',
@@ -65,31 +66,31 @@ define([
     relations: {
       icons: Module.SocialIconCollectionModel
     },
-    initialize: function() {
+    initialize: function () {
       this.get('icons').on('add remove change', this._iconsChanged, this);
       this.on('change:iconSet', this.changeIconSet, this);
     },
-    getIconSet: function() {
+    getIconSet: function () {
       return App.getAvailableStyles().get('socialIconSets').get(this.get('iconSet'));
     },
-    changeIconSet: function() {
+    changeIconSet: function () {
       var iconSet = this.getIconSet();
-      _.each(this.get('icons').models, function(model) {
+      _.each(this.get('icons').models, function (model) {
         model.set('image', iconSet.get(model.get('iconType')));
       });
     },
-    _iconsChanged: function() {
+    _iconsChanged: function () {
-      App.getChannel().trigger('autoSave'); 
+      App.getChannel().trigger('autoSave');
     }
   });
 
-  var SocialIconView = Marionette.View.extend({
+  SocialIconView = Marionette.View.extend({
     tagName: 'span',
-    getTemplate: function() { return window.templates.socialIconBlock; },
+    getTemplate: function () { return window.templates.socialIconBlock; },
     modelEvents: {
       change: 'render'
     },
-    templateContext: function() {
+    templateContext: function () {
       var allIconSets = App.getAvailableStyles().get('socialIconSets');
       return {
         model: this.model.toJSON(),
@@ -105,7 +106,7 @@ define([
 
   Module.SocialBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_social_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.socialBlock; },
+    getTemplate: function () { return window.templates.socialBlock; },
     regions: _.extend({}, base.BlockView.prototype.regions, {
       icons: '.mailpoet_social'
     }),
@@ -115,8 +116,8 @@ define([
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
       ShowSettingsBehavior: {}
     }),
-    onDragSubstituteBy: function() { return Module.SocialWidgetView; },
+    onDragSubstituteBy: function () { return Module.SocialWidgetView; },
-    onRender: function() {
+    onRender: function () {
       this.toolsView = new Module.SocialBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
       this.showChildView('icons', new Module.SocialIconCollectionView({
@@ -126,28 +127,28 @@ define([
   });
 
   Module.SocialBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.SocialBlockSettingsView; }
+    getSettingsView: function () { return Module.SocialBlockSettingsView; }
   });
 
   // Sidebar view container
   Module.SocialBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.socialBlockSettings; },
+    getTemplate: function () { return window.templates.socialBlockSettings; },
     regions: {
       iconRegion: '#mailpoet_social_icons_selection',
       stylesRegion: '#mailpoet_social_icons_styles'
     },
-    events: function() {
+    events: function () {
       return {
         'click .mailpoet_done_editing': 'close'
       };
     },
-    initialize: function() {
+    initialize: function () {
       base.BlockSettingsView.prototype.initialize.apply(this, arguments);
 
       this._iconSelectorView = new SocialBlockSettingsIconSelectorView({ model: this.model });
       this._stylesView = new SocialBlockSettingsStylesView({ model: this.model });
     },
-    onRender: function() {
+    onRender: function () {
       this.showChildView('iconRegion', this._iconSelectorView);
       this.showChildView('stylesRegion', this._stylesView);
     }
@@ -155,8 +156,8 @@ define([
 
   // Single icon settings view, used by the selector view
   SocialBlockSettingsIconView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.socialSettingsIcon; },
+    getTemplate: function () { return window.templates.socialSettingsIcon; },
-    events: function() {
+    events: function () {
       return {
         'click .mailpoet_delete_block': 'deleteIcon',
         'change .mailpoet_social_icon_field_type': _.partial(this.changeField, 'iconType'),
@@ -167,35 +168,36 @@ define([
     },
     modelEvents: {
       'change:iconType': 'render',
-      'change:image': function() {
+      'change:image': function () {
         this.$('.mailpoet_social_icon_image').attr('src', this.model.get('image'));
       },
-      'change:text': function() {
+      'change:text': function () {
         this.$('.mailpoet_social_icon_image').attr('alt', this.model.get('text'));
       }
     },
-    templateContext: function() {
+    templateContext: function () {
-      var icons = App.getConfig().get('socialIcons'),
+      var icons = App.getConfig().get('socialIcons');
-        // Construct icon type list of format [{iconType: 'type', title: 'Title'}, ...]
+      // Construct icon type list of format [{iconType: 'type', title: 'Title'}, ...]
-        availableIconTypes = _.map(_.keys(icons.attributes), function(key) { return { iconType: key, title: icons.get(key).get('title') }; }),
+      var availableIconTypes = _.map(_.keys(icons.attributes), function (key) { return { iconType: key, title: icons.get(key).get('title') }; });
-        allIconSets = App.getAvailableStyles().get('socialIconSets');
+      var allIconSets = App.getAvailableStyles().get('socialIconSets');
       return _.extend({}, base.BlockView.prototype.templateContext.apply(this, arguments), {
         iconTypes: availableIconTypes,
         currentType: icons.get(this.model.get('iconType')).toJSON(),
         allIconSets: allIconSets.toJSON()
       });
     },
-    deleteIcon: function() {
+    deleteIcon: function () {
       this.model.destroy();
     },
-    changeLink: function(event) {
+    changeLink: function (event) {
       if (this.model.get('iconType') === 'email') {
         this.model.set('link', 'mailto:' + jQuery(event.target).val());
       } else {
         return this.changeField('link', event);
       }
+      return undefined;
     },
-    changeField: function(field, event) {
+    changeField: function (field, event) {
       this.model.set(field, jQuery(event.target).val());
     }
   });
@@ -212,7 +214,7 @@ define([
 
   // Select icons section container view
   SocialBlockSettingsIconSelectorView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.socialSettingsIconSelector; },
+    getTemplate: function () { return window.templates.socialSettingsIconSelector; },
     regions: {
       icons: '#mailpoet_social_icon_selector_contents'
     },
@@ -222,11 +224,11 @@ define([
     modelEvents: {
       'change:iconSet': 'render'
     },
-    addSocialIcon: function() {
+    addSocialIcon: function () {
       // Add a social icon with default values
       this.model.get('icons').add({});
     },
-    onRender: function() {
+    onRender: function () {
       this.showChildView('icons', new SocialBlockSettingsIconCollectionView({
         collection: this.model.get('icons')
       }));
@@ -235,17 +237,17 @@ define([
   });
 
   SocialBlockSettingsStylesView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.socialSettingsStyles; },
+    getTemplate: function () { return window.templates.socialSettingsStyles; },
     modelEvents: {
       change: 'render'
     },
     events: {
       'click .mailpoet_social_icon_set': 'changeSocialIconSet'
     },
-    initialize: function() {
+    initialize: function () {
       this.listenTo(this.model.get('icons'), 'add remove change', this.render);
     },
-    templateContext: function() {
+    templateContext: function () {
       var allIconSets = App.getAvailableStyles().get('socialIconSets');
       return {
         activeSet: this.model.get('iconSet'),
@@ -254,20 +256,20 @@ define([
         availableSocialIcons: this.model.get('icons').pluck('iconType')
       };
     },
-    changeSocialIconSet: function(event) {
+    changeSocialIconSet: function (event) {
       this.model.set('iconSet', jQuery(event.currentTarget).data('setname'));
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () {
       this.model.get('icons').off('add remove', this.render, this);
     }
   });
 
   Module.SocialWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.socialInsertion; },
+    getTemplate: function () { return window.templates.socialInsertion; },
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () {
           return new Module.SocialBlockModel({
             type: 'social',
             iconSet: 'default',
@@ -297,13 +299,13 @@ define([
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    App.registerBlockType('social', {
+    BeforeStartApp.registerBlockType('social', {
       blockModel: Module.SocialBlockModel,
       blockView: Module.SocialBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'social',
       widgetView: Module.SocialWidgetView,
       priority: 95

assets/js/src/newsletter_editor/blocks/spacer.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Spacer content block
  */
@@ -5,15 +7,12 @@ define([
   'newsletter_editor/App',
   'newsletter_editor/blocks/base',
   'underscore'
-], function(App, BaseBlock, _) {
+], function (App, BaseBlock, _) { // eslint-disable-line func-names
-
+  var Module = {};
-  'use strict';
+  var base = BaseBlock;
-
-  var Module = {},
-    base = BaseBlock;
 
   Module.SpacerBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () { // eslint-disable-line func-names
       return this._getDefaults({
         type: 'spacer',
         styles: {
@@ -28,7 +27,7 @@ define([
 
   Module.SpacerBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_spacer_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.spacerBlock; },
+    getTemplate: function () { return window.templates.spacerBlock; }, // eslint-disable-line func-names
     behaviors: _.defaults({
       ResizableBehavior: {
         elementSelector: '.mailpoet_spacer',
@@ -41,33 +40,33 @@ define([
       }
     }, base.BlockView.prototype.behaviors),
     modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'),
-    onDragSubstituteBy: function() { return Module.SpacerWidgetView; },
+    onDragSubstituteBy: function () { return Module.SpacerWidgetView; }, // eslint-disable-line func-names
-    initialize: function() {
+    initialize: function () { // eslint-disable-line func-names
       base.BlockView.prototype.initialize.apply(this, arguments);
 
       this.listenTo(this.model, 'change:styles.block.backgroundColor', this.render);
       this.listenTo(this.model, 'change:styles.block.height', this.changeHeight);
     },
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       this.toolsView = new Module.SpacerBlockToolsView({ model: this.model });
       this.showChildView('toolsRegion', this.toolsView);
     },
-    changeHeight: function() {
+    changeHeight: function () { // eslint-disable-line func-names
       this.$('.mailpoet_spacer').css('height', this.model.get('styles.block.height'));
       this.$('.mailpoet_resize_handle_text').text(this.model.get('styles.block.height'));
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () { // eslint-disable-line func-names
       this.stopListening(this.model);
     }
   });
 
   Module.SpacerBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.SpacerBlockSettingsView; }
+    getSettingsView: function () { return Module.SpacerBlockSettingsView; } // eslint-disable-line func-names
   });
 
   Module.SpacerBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.spacerBlockSettings; },
+    getTemplate: function () { return window.templates.spacerBlockSettings; }, // eslint-disable-line func-names
-    events: function() {
+    events: function () { // eslint-disable-line func-names
       return {
         'change .mailpoet_field_spacer_background_color': _.partial(this.changeColorField, 'styles.block.backgroundColor'),
         'click .mailpoet_done_editing': 'close'
@@ -76,24 +75,24 @@ define([
   });
 
   Module.SpacerWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.spacerInsertion; },
+    getTemplate: function () { return window.templates.spacerInsertion; }, // eslint-disable-line func-names
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () { // eslint-disable-line func-names
           return new Module.SpacerBlockModel();
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) { // eslint-disable-line func-names
-    App.registerBlockType('spacer', {
+    BeforeStartApp.registerBlockType('spacer', {
       blockModel: Module.SpacerBlockModel,
       blockView: Module.SpacerBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'spacer',
       widgetView: Module.SpacerWidgetView,
       priority: 94

assets/js/src/newsletter_editor/blocks/text.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Text content block
  */
@@ -6,15 +8,12 @@ define([
   'newsletter_editor/blocks/base',
   'underscore',
   'mailpoet'
-], function(App, BaseBlock, _, MailPoet) {
+], function (App, BaseBlock, _, MailPoet) { // eslint-disable-line func-names
-
+  var Module = {};
-  'use strict';
+  var base = BaseBlock;
-
-  var Module = {},
-    base = BaseBlock;
 
   Module.TextBlockModel = base.BlockModel.extend({
-    defaults: function() {
+    defaults: function () { // eslint-disable-line func-names
       return this._getDefaults({
         type: 'text',
         text: 'Edit this to insert text'
@@ -24,7 +23,7 @@ define([
 
   Module.TextBlockView = base.BlockView.extend({
     className: 'mailpoet_block mailpoet_text_block mailpoet_droppable_block',
-    getTemplate: function() { return window.templates.textBlock; },
+    getTemplate: function () { return window.templates.textBlock; }, // eslint-disable-line func-names
     modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'), // Prevent rerendering on model change due to text editor redrawing
     behaviors: _.extend({}, base.BlockView.prototype.behaviors, {
       TextEditorBehavior: {
@@ -34,7 +33,7 @@ define([
         invalidElements: 'script',
         blockFormats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p',
         plugins: 'link lists code textcolor colorpicker mailpoet_shortcodes paste',
-        configurationFilter: function(originalSettings) {
+        configurationFilter: function (originalSettings) { // eslint-disable-line func-names
           return _.extend({}, originalSettings, {
             mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),
             mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle')
@@ -42,7 +41,7 @@ define([
         }
       }
     }),
-    initialize: function(options) {
+    initialize: function (options) { // eslint-disable-line func-names
       base.BlockView.prototype.initialize.apply(this, arguments);
 
       this.renderOptions = _.defaults(options.renderOptions || {}, {
@@ -51,8 +50,8 @@ define([
 
       this.disableTextEditor = this.renderOptions.disableTextEditor;
     },
-    onDragSubstituteBy: function() { return Module.TextWidgetView; },
+    onDragSubstituteBy: function () { return Module.TextWidgetView; }, // eslint-disable-line func-names
-    onRender: function() {
+    onRender: function () { // eslint-disable-line func-names
       this.toolsView = new Module.TextBlockToolsView({
         model: this.model,
         tools: {
@@ -61,46 +60,46 @@ define([
       });
       this.showChildView('toolsRegion', this.toolsView);
     },
-    onTextEditorChange: function(newContent) {
+    onTextEditorChange: function (newContent) { // eslint-disable-line func-names
       this.model.set('text', newContent);
     },
-    onTextEditorFocus: function() {
+    onTextEditorFocus: function () { // eslint-disable-line func-names
       this.disableDragging();
       this.disableShowingTools();
     },
-    onTextEditorBlur: function() {
+    onTextEditorBlur: function () { // eslint-disable-line func-names
       this.enableDragging();
       this.enableShowingTools();
     }
   });
 
   Module.TextBlockToolsView = base.BlockToolsView.extend({
-    getSettingsView: function() { return Module.TextBlockSettingsView; }
+    getSettingsView: function () { return Module.TextBlockSettingsView; } // eslint-disable-line func-names
   });
 
   Module.TextBlockSettingsView = base.BlockSettingsView.extend({
-    getTemplate: function() { return window.templates.textBlockSettings; }
+    getTemplate: function () { return window.templates.textBlockSettings; } // eslint-disable-line func-names
   });
 
   Module.TextWidgetView = base.WidgetView.extend({
-    getTemplate: function() { return window.templates.textInsertion; },
+    getTemplate: function () { return window.templates.textInsertion; }, // eslint-disable-line func-names
     behaviors: {
       DraggableBehavior: {
         cloneOriginal: true,
-        drop: function() {
+        drop: function () { // eslint-disable-line func-names
           return new Module.TextBlockModel();
         }
       }
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) { // eslint-disable-line func-names
-    App.registerBlockType('text', {
+    BeforeStartApp.registerBlockType('text', {
       blockModel: Module.TextBlockModel,
       blockView: Module.TextBlockView
     });
 
-    App.registerWidget({
+    BeforeStartApp.registerWidget({
       name: 'text',
       widgetView: Module.TextWidgetView,
       priority: 90

assets/js/src/newsletter_editor/communicationsFix.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * This shim replaces the default Backbone.Marionette communication library
  * Backbone.Wreqr with Backbone.Radio ahead of time,
@@ -6,26 +8,24 @@
  * Courtesy of https://gist.github.com/jmeas/7992474cdb1c5672d88b
  */
 
-(function(root, factory) {
+(function (root, factory) { // eslint-disable-line func-names
+  var Marionette = require('backbone.marionette');
+  var Radio = require('backbone.radio');
+  var _ = require('underscore');
   if (typeof define === 'function' && define.amd) {
-    define(['backbone.marionette', 'backbone.radio', 'underscore'], function(Marionette, Radio, _) {
+    define(['backbone.marionette', 'backbone.radio', 'underscore'], function (BackboneMarionette, BackboneRadio, underscore) { // eslint-disable-line func-names
-      return factory(Marionette, Radio, _);
+      return factory(BackboneMarionette, BackboneRadio, underscore);
     });
   }
   else if (typeof exports !== 'undefined') {
-    var Marionette = require('backbone.marionette');
-    var Radio = require('backbone.radio');
-    var _ = require('underscore');
     module.exports = factory(Marionette, Radio, _);
   }
   else {
     factory(root.Backbone.Marionette, root.Backbone.Radio, root._);
   }
-}(this, function(Marionette, Radio, _) {
+}(this, function (Marionette, Radio, _) { // eslint-disable-line func-names
-  'use strict';
-
   var MarionetteApplication = Marionette.Application;
-  MarionetteApplication.prototype._initChannel = function () {
+  MarionetteApplication.prototype._initChannel = function () { // eslint-disable-line func-names
     this.channelName = _.result(this, 'channelName') || 'global';
     this.channel = _.result(this, 'channel') || Radio.channel(this.channelName);
   };

assets/js/src/newsletter_editor/components/communication.js

@@ -1,13 +1,13 @@
+/* eslint-disable func-names */
 define([
   'newsletter_editor/App',
   'underscore',
   'mailpoet',
   'ajax'
-], function(App, _, MailPoet) {
+], function (App, _, MailPoet) {
-
   var Module = {};
 
-  Module._query = function(args) {
+  Module._query = function (args) {
     return MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'automatedLatestContent',
@@ -17,70 +17,70 @@ define([
   };
   Module._cachedQuery = _.memoize(Module._query, JSON.stringify);
 
-  Module.getNewsletter = function(options) {
+  Module.getNewsletter = function (options) {
     return Module._query({
       action: 'get',
       options: options
     });
   };
 
-  Module.getPostTypes = function() {
+  Module.getPostTypes = function () {
     return Module._cachedQuery({
       action: 'getPostTypes',
       options: {}
-    }).then(function(response) {
+    }).then(function (response) {
       return _.values(response.data);
     });
   };
 
-  Module.getTaxonomies = function(postType) {
+  Module.getTaxonomies = function (postType) {
     return Module._cachedQuery({
       action: 'getTaxonomies',
       options: {
         postType: postType
       }
-    }).then(function(response) {
+    }).then(function (response) {
       return response.data;
     });
   };
 
-  Module.getTerms = function(options) {
+  Module.getTerms = function (options) {
     return Module._cachedQuery({
       action: 'getTerms',
       options: options
-    }).then(function(response) {
+    }).then(function (response) {
       return response.data;
     });
   };
 
-  Module.getPosts = function(options) {
+  Module.getPosts = function (options) {
     return Module._cachedQuery({
       action: 'getPosts',
       options: options
-    }).then(function(response) {
+    }).then(function (response) {
       return response.data;
     });
   };
 
-  Module.getTransformedPosts = function(options) {
+  Module.getTransformedPosts = function (options) {
     return Module._cachedQuery({
       action: 'getTransformedPosts',
       options: options
-    }).then(function(response) {
+    }).then(function (response) {
       return response.data;
     });
   };
 
-  Module.getBulkTransformedPosts = function(options) {
+  Module.getBulkTransformedPosts = function (options) {
     return Module._query({
       action: 'getBulkTransformedPosts',
       options: options
-    }).then(function(response) {
+    }).then(function (response) {
       return response.data;
     });
   };
 
-  Module.saveNewsletter = function(options) {
+  Module.saveNewsletter = function (options) {
     return MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'newsletters',
@@ -89,7 +89,7 @@ define([
     });
   };
 
-  Module.previewNewsletter = function(options) {
+  Module.previewNewsletter = function (options) {
     return MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'newsletters',
@@ -98,7 +98,7 @@ define([
     });
   };
 
-  App.on('start', function(App, options) {
+  App.on('start', function () {
     // Prefetch post types
     Module.getPostTypes();
   });

assets/js/src/newsletter_editor/components/config.js

@@ -1,8 +1,7 @@
 define([
   'newsletter_editor/App',
   'backbone.supermodel'
-], function(App, SuperModel) {
+], function (App, SuperModel) { // eslint-disable-line func-names
-
   var Module = {};
 
   Module.ConfigModel = SuperModel.extend({
@@ -18,14 +17,14 @@ define([
 
   // Global and available styles for access in blocks and their settings
   Module._config = {};
-  Module.getConfig = function() { return Module._config; };
+  Module.getConfig = function () { return Module._config; }; // eslint-disable-line func-names
-  Module.setConfig = function(options) {
+  Module.setConfig = function (options) { // eslint-disable-line func-names
     Module._config = new Module.ConfigModel(options, { parse: true });
     return Module._config;
   };
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp, options) { // eslint-disable-line func-names
-    var Application = App;
+    var Application = BeforeStartApp;
     // Expose config methods globally
     Application.getConfig = Module.getConfig;
     Application.setConfig = Module.setConfig;

assets/js/src/newsletter_editor/components/content.js

@@ -1,11 +1,11 @@
+'use strict';
+
 define([
   'newsletter_editor/App',
   'backbone.supermodel',
   'underscore',
   'mailpoet'
-], function(App, SuperModel, _, MailPoet) {
+], function (App, SuperModel, _, MailPoet) { // eslint-disable-line func-names
-  'use strict';
-
   var Module = {};
 
   // Holds newsletter entry fields, such as subject or creation datetime.
@@ -13,12 +13,12 @@ define([
   // handled by other components.
   Module.NewsletterModel = SuperModel.extend({
     whitelisted: ['id', 'subject', 'preheader'],
-    initialize: function(options) {
+    initialize: function () { // eslint-disable-line func-names
-      this.on('change', function() {
+      this.on('change', function () { // eslint-disable-line func-names
         App.getChannel().trigger('autoSave');
       });
     },
-    toJSON: function() {
+    toJSON: function () { // eslint-disable-line func-names
       // Use only whitelisted properties to ensure properties editor
       // doesn't control don't change.
       return _.pick(SuperModel.prototype.toJSON.call(this), this.whitelisted);
@@ -27,62 +27,60 @@ define([
 
   // Content block view and model handlers for different content types
   Module._blockTypes = {};
-  Module.registerBlockType = function(type, data) {
+  Module.registerBlockType = function (type, data) { // eslint-disable-line func-names
     Module._blockTypes[type] = data;
   };
-  Module.getBlockTypeModel = function(type) {
+  Module.getBlockTypeModel = function (type) { // eslint-disable-line func-names
     if (type in Module._blockTypes) {
       return Module._blockTypes[type].blockModel;
-    } else {
-      throw 'Block type not supported: ' + type;
     }
+    throw 'Block type not supported: ' + type;
   };
-  Module.getBlockTypeView = function(type) {
+  Module.getBlockTypeView = function (type) { // eslint-disable-line func-names
     if (type in Module._blockTypes) {
       return Module._blockTypes[type].blockView;
-    } else {
-      throw 'Block type not supported: ' + type;
     }
+    throw 'Block type not supported: ' + type;
   };
 
-  Module.getBody = function() {
+  Module.getBody = function () { // eslint-disable-line func-names
     return {
       content: App._contentContainer.toJSON(),
       globalStyles: App.getGlobalStyles().toJSON()
     };
   };
 
-  Module.toJSON = function() {
+  Module.toJSON = function () { // eslint-disable-line func-names
     return _.extend({
       body: Module.getBody()
     }, App.getNewsletter().toJSON());
   };
 
-  Module.getNewsletter = function() {
+  Module.getNewsletter = function () { // eslint-disable-line func-names
     return Module.newsletter;
   };
 
-  Module.findModels = function(predicate) {
+  Module.findModels = function (predicate) { // eslint-disable-line func-names
     var blocks = App._contentContainer.getChildren();
     return _.filter(blocks, predicate);
   };
 
-  App.on('before:start', function(Application, options) {
+  App.on('before:start', function (Application, options) { // eslint-disable-line func-names
-    var App = Application;
+    var BeforeStartApp = Application;
     // Expose block methods globally
-    App.registerBlockType = Module.registerBlockType;
+    BeforeStartApp.registerBlockType = Module.registerBlockType;
-    App.getBlockTypeModel = Module.getBlockTypeModel;
+    BeforeStartApp.getBlockTypeModel = Module.getBlockTypeModel;
-    App.getBlockTypeView = Module.getBlockTypeView;
+    BeforeStartApp.getBlockTypeView = Module.getBlockTypeView;
-    App.toJSON = Module.toJSON;
+    BeforeStartApp.toJSON = Module.toJSON;
-    App.getBody = Module.getBody;
+    BeforeStartApp.getBody = Module.getBody;
-    App.getNewsletter = Module.getNewsletter;
+    BeforeStartApp.getNewsletter = Module.getNewsletter;
-    App.findModels = Module.findModels;
+    BeforeStartApp.findModels = Module.findModels;
 
     Module.newsletter = new Module.NewsletterModel(_.omit(_.clone(options.newsletter), ['body']));
   });
 
-  App.on('start', function(Application, options) {
+  App.on('start', function (Application, options) { // eslint-disable-line func-names
-    var App = Application;
+    var StartApp = Application;
     var body = options.newsletter.body;
     var content = (_.has(body, 'content')) ? body.content : {};
 
@@ -93,13 +91,13 @@ define([
       );
     }
 
-    App._contentContainer = new (App.getBlockTypeModel('container'))(content, {parse: true});
+    StartApp._contentContainer = new (StartApp.getBlockTypeModel('container'))(content, { parse: true });
-    App._contentContainerView = new (App.getBlockTypeView('container'))({
+    StartApp._contentContainerView = new (StartApp.getBlockTypeView('container'))({
-      model: App._contentContainer,
+      model: StartApp._contentContainer,
       renderOptions: { depth: 0 }
     });
 
-    App._appView.showChildView('contentRegion', App._contentContainerView);
+    StartApp._appView.showChildView('contentRegion', StartApp._contentContainerView);
   });
 
 

assets/js/src/newsletter_editor/components/heading.js

@@ -1,3 +1,5 @@
+'use strict';
+
 define([
   'newsletter_editor/App',
   'backbone',
@@ -5,32 +7,29 @@ define([
   'underscore',
   'jquery',
   'mailpoet'
-], function(App, Backbone, Marionette, _, jQuery, MailPoet) {
+], function (App, Backbone, Marionette, _, jQuery, MailPoet) { // eslint-disable-line func-names
-
-  'use strict';
-
   var Module = {};
 
   Module.HeadingView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.heading; },
+    getTemplate: function () { return window.templates.heading; }, // eslint-disable-line func-names
-    templateContext: function() {
+    templateContext: function () { // eslint-disable-line func-names
       return {
         model: this.model.toJSON()
       };
     },
-    events: function() {
+    events: function () { // eslint-disable-line func-names
       return {
         'keyup .mailpoet_input_title': _.partial(this.changeField, 'subject'),
         'keyup .mailpoet_input_preheader': _.partial(this.changeField, 'preheader')
       };
     },
-    changeField: function(field, event) {
+    changeField: function (field, event) { // eslint-disable-line func-names
       this.model.set(field, jQuery(event.target).val());
     }
   });
 
-  App.on('start', function(App, options) {
+  App.on('start', function (StartApp) { // eslint-disable-line func-names
-    App._appView.showChildView('headingRegion', new Module.HeadingView({ model: App.getNewsletter() }));
+    StartApp._appView.showChildView('headingRegion', new Module.HeadingView({ model: StartApp.getNewsletter() }));
     MailPoet.helpTooltip.show(document.getElementById('tooltip-designer-subject-line'), {
       tooltipId: 'tooltip-designer-subject-line-ti',
       tooltip: MailPoet.I18n.t('helpTooltipDesignerSubjectLine'),

assets/js/src/newsletter_editor/components/save.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 define([
   'newsletter_editor/App',
   'newsletter_editor/components/communication',
@@ -11,7 +12,7 @@ define([
   'html2canvas',
   'underscore',
   'jquery'
-], function(
+], function (
   App,
   CommunicationComponent,
   MailPoet,
@@ -25,15 +26,13 @@ define([
   _,
   $
 ) {
-
   'use strict';
 
-  var Module = {},
+  var Module = {};
-    saveTimeout;
+  var saveTimeout;
 
   // Save editor contents to server
-  Module.save = function() {
+  Module.save = function () {
-
     var json = App.toJSON();
 
     // Stringify to enable transmission of primitive non-string value types
@@ -44,12 +43,12 @@ define([
     App.getChannel().trigger('beforeEditorSave', json);
 
     // save newsletter
-    return CommunicationComponent.saveNewsletter(json).done(function(response) {
+    return CommunicationComponent.saveNewsletter(json).done(function (response) {
-      if(response.success !== undefined && response.success === true) {
+      if (response.success !== undefined && response.success === true) {
         // TODO: Handle translations
-        //MailPoet.Notice.success("<?php _e('Newsletter has been saved.'); ?>");
+        // MailPoet.Notice.success("<?php _e('Newsletter has been saved.'); ?>");
-      } else if(response.error !== undefined) {
+      } else if (response.error !== undefined) {
-        if(response.error.length === 0) {
+        if (response.error.length === 0) {
           MailPoet.Notice.error(
             MailPoet.I18n.t('templateSaveFailed'),
             {
@@ -57,29 +56,28 @@ define([
             }
           );
         } else {
-          $(response.error).each(function(i, error) {
+          $(response.error).each(function (i, error) {
             MailPoet.Notice.error(error, { scroll: true });
           });
         }
       }
       App.getChannel().trigger('afterEditorSave', json, response);
-    }).fail(function(response) {
+    }).fail(function (response) {
       // TODO: Handle saving errors
       App.getChannel().trigger('afterEditorSave', {}, response);
     });
   };
 
-  Module.getThumbnail = function(element, options) {
+  Module.getThumbnail = function (element, options) {
     var promise = html2canvas(element, options || {});
 
-    return promise.then(function(oldCanvas) {
+    return promise.then(function (oldCanvas) {
       // Temporary workaround for html2canvas-alpha2.
       // Removes 1px left transparent border from resulting canvas.
 
-      var oldContext = oldCanvas.getContext('2d'),
+      var newCanvas = document.createElement('canvas');
-        newCanvas = document.createElement('canvas'),
+      var newContext = newCanvas.getContext('2d');
-        newContext = newCanvas.getContext('2d'),
+      var leftBorderWidth = 1;
-        leftBorderWidth = 1;
 
       newCanvas.width = oldCanvas.width;
       newCanvas.height = oldCanvas.height;
@@ -94,11 +92,10 @@ define([
     });
   };
 
-  Module.saveTemplate = function(options) {
+  Module.saveTemplate = function (options) {
-    var that = this,
+    var promise = jQuery.Deferred();
-      promise = jQuery.Deferred();
 
-    promise.then(function(thumbnail) {
+    promise.then(function (thumbnail) {
       var data = _.extend(options || {}, {
         thumbnail: thumbnail.toDataURL('image/jpeg'),
         body: JSON.stringify(App.getBody())
@@ -114,18 +111,17 @@ define([
 
     Module.getThumbnail(
       jQuery('#mailpoet_editor_content > .mailpoet_block').get(0)
-    ).then(function(thumbnail) {
+    ).then(function (thumbnail) {
       promise.resolve(thumbnail);
     });
 
     return promise;
   };
 
-  Module.exportTemplate = function(options) {
+  Module.exportTemplate = function (options) {
-    var that = this;
     return Module.getThumbnail(
       jQuery('#mailpoet_editor_content > .mailpoet_block').get(0)
-    ).then(function(thumbnail) {
+    ).then(function (thumbnail) {
       var data = _.extend(options || {}, {
         thumbnail: thumbnail.toDataURL('image/jpeg'),
         body: App.getBody()
@@ -143,7 +139,7 @@ define([
   };
 
   Module.SaveView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.save; },
+    getTemplate: function () { return window.templates.save; },
     events: {
       'click .mailpoet_save_button': 'save',
       'click .mailpoet_save_show_options': 'toggleSaveOptions',
@@ -155,46 +151,46 @@ define([
       'click .mailpoet_save_export': 'toggleExportTemplate',
       'click .mailpoet_export_template': 'exportTemplate'
     },
-    initialize: function(options) {
+    initialize: function () {
       App.getChannel().on('beforeEditorSave', this.beforeSave, this);
       App.getChannel().on('afterEditorSave', this.afterSave, this);
     },
-    onRender: function() {
+    onRender: function () {
       this.validateNewsletter(App.toJSON());
     },
-    save: function() {
+    save: function () {
       this.hideOptionContents();
       App.getChannel().request('save');
     },
-    beforeSave: function() {
+    beforeSave: function () {
       // TODO: Add a loading animation instead
       this.$('.mailpoet_autosaved_at').text(MailPoet.I18n.t('saving'));
     },
-    afterSave: function(json, response) {
+    afterSave: function (json) {
       this.validateNewsletter(json);
       // Update 'Last saved timer'
       this.$('.mailpoet_editor_last_saved').removeClass('mailpoet_hidden');
       this.$('.mailpoet_autosaved_at').text('');
     },
-    toggleSaveOptions: function() {
+    toggleSaveOptions: function () {
       this.$('.mailpoet_save_options').toggleClass('mailpoet_hidden');
       this.$('.mailpoet_save_show_options').toggleClass('mailpoet_save_show_options_active');
     },
-    toggleSaveAsTemplate: function() {
+    toggleSaveAsTemplate: function () {
       this.$('.mailpoet_save_as_template_container').toggleClass('mailpoet_hidden');
       this.toggleSaveOptions();
     },
-    showSaveAsTemplate: function() {
+    showSaveAsTemplate: function () {
       this.$('.mailpoet_save_as_template_container').removeClass('mailpoet_hidden');
       this.toggleSaveOptions();
     },
-    hideSaveAsTemplate: function() {
+    hideSaveAsTemplate: function () {
       this.$('.mailpoet_save_as_template_container').addClass('mailpoet_hidden');
     },
-    saveAsTemplate: function() {
+    saveAsTemplate: function () {
-      var templateName = this.$('.mailpoet_save_as_template_name').val(),
+      var templateName = this.$('.mailpoet_save_as_template_name').val();
-        templateDescription = this.$('.mailpoet_save_as_template_description').val(),
+      var templateDescription = this.$('.mailpoet_save_as_template_description').val();
-        that = this;
+      var that = this;
 
       if (templateName === '') {
         MailPoet.Notice.error(
@@ -216,7 +212,7 @@ define([
         Module.saveTemplate({
           name: templateName,
           description: templateDescription
-        }).done(function() {
+        }).done(function () {
           MailPoet.Notice.success(
             MailPoet.I18n.t('templateSaved'),
             {
@@ -227,7 +223,7 @@ define([
           MailPoet.trackEvent('Editor > Template saved', {
             'MailPoet Free version': window.mailpoet_version
           });
-        }).fail(function() {
+        }).fail(function () {
           MailPoet.Notice.error(
             MailPoet.I18n.t('templateSaveFailed'),
             {
@@ -238,19 +234,18 @@ define([
         });
         this.hideOptionContents();
       }
-
     },
-    toggleExportTemplate: function() {
+    toggleExportTemplate: function () {
       this.$('.mailpoet_export_template_container').toggleClass('mailpoet_hidden');
       this.toggleSaveOptions();
     },
-    hideExportTemplate: function() {
+    hideExportTemplate: function () {
       this.$('.mailpoet_export_template_container').addClass('mailpoet_hidden');
     },
-    exportTemplate: function() {
+    exportTemplate: function () {
-      var templateName = this.$('.mailpoet_export_template_name').val(),
+      var templateName = this.$('.mailpoet_export_template_name').val();
-        templateDescription = this.$('.mailpoet_export_template_description').val(),
+      var templateDescription = this.$('.mailpoet_export_template_description').val();
-        that = this;
+      var that = this;
 
       if (templateName === '') {
         MailPoet.Notice.error(
@@ -276,27 +271,28 @@ define([
         this.hideExportTemplate();
       }
     },
-    hideOptionContents: function() {
+    hideOptionContents: function () {
       this.hideSaveAsTemplate();
       this.hideExportTemplate();
       this.$('.mailpoet_save_options').addClass('mailpoet_hidden');
     },
-    next: function() {
+    next: function () {
       this.hideOptionContents();
-      if(!this.$('.mailpoet_save_next').hasClass('button-disabled')) {
+      if (!this.$('.mailpoet_save_next').hasClass('button-disabled')) {
         Module._cancelAutosave();
-        Module.save().done(function(response) {
+        Module.save().done(function () {
           window.location.href = App.getConfig().get('urls.send');
         });
       }
     },
-    validateNewsletter: function(jsonObject) {
+    validateNewsletter: function (jsonObject) {
+      var contents;
       if (!App._contentContainer.isValid()) {
         this.showValidationError(App._contentContainer.validationError);
         return;
       }
 
-      var contents = JSON.stringify(jsonObject);
+      contents = JSON.stringify(jsonObject);
       if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
           contents.indexOf('[link:subscription_unsubscribe_url]') < 0 &&
           contents.indexOf('[link:subscription_unsubscribe]') < 0) {
@@ -306,43 +302,45 @@ define([
 
       this.hideValidationError();
     },
-    showValidationError: function(message) {
+    showValidationError: function (message) {
       var $el = this.$('.mailpoet_save_error');
       $el.text(message);
       $el.removeClass('mailpoet_hidden');
 
       this.$('.mailpoet_save_next').addClass('button-disabled');
     },
-    hideValidationError: function() {
+    hideValidationError: function () {
       this.$('.mailpoet_save_error').addClass('mailpoet_hidden');
       this.$('.mailpoet_save_next').removeClass('button-disabled');
     }
   });
 
-  Module.autoSave = function() {
+  Module.autoSave = function () {
     // Delay in saving editor contents, during which a new autosave
     // may be requested
     var AUTOSAVE_DELAY_DURATION = 1000;
 
     Module._cancelAutosave();
-    saveTimeout = setTimeout(function() {
+    saveTimeout = setTimeout(function () {
-      App.getChannel().request('save').always(function() {
+      App.getChannel().request('save').always(function () {
         Module._cancelAutosave();
       });
     }, AUTOSAVE_DELAY_DURATION);
   };
 
-  Module._cancelAutosave = function() {
+  Module._cancelAutosave = function () {
     if (!saveTimeout) return;
 
     clearTimeout(saveTimeout);
     saveTimeout = undefined;
   };
 
-  Module.beforeExitWithUnsavedChanges = function(e) {
+  Module.beforeExitWithUnsavedChanges = function (e) {
+    var message;
+    var event;
     if (saveTimeout) {
-      var message = MailPoet.I18n.t('unsavedChangesWillBeLost');
+      message = MailPoet.I18n.t('unsavedChangesWillBeLost');
-      var event = e || window.event;
+      event = e || window.event;
 
       if (event) {
         event.returnValue = message;
@@ -350,10 +348,11 @@ define([
 
       return message;
     }
+    return undefined;
   };
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    var Application = App;
+    var Application = BeforeStartApp;
     Application.save = Module.save;
     Application.getChannel().on('autoSave', Module.autoSave);
 
@@ -362,9 +361,9 @@ define([
     Application.getChannel().reply('save', Application.save);
   });
 
-  App.on('start', function(App, options) {
+  App.on('start', function (BeforeStartApp) {
     var saveView = new Module.SaveView();
-    App._appView.showChildView('bottomRegion', saveView);
+    BeforeStartApp._appView.showChildView('bottomRegion', saveView);
   });
 
   return Module;

assets/js/src/newsletter_editor/components/sidebar.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names */
 define([
   'newsletter_editor/App',
   'newsletter_editor/components/communication',
@@ -6,9 +7,8 @@ define([
   'backbone.marionette',
   'backbone.supermodel',
   'underscore',
-  'jquery',
+  'jquery'
-  'sticky-kit'
+], function (
-], function(
   App,
   CommunicationComponent,
   MailPoet,
@@ -16,14 +16,12 @@ define([
   Marionette,
   SuperModel,
   _,
-  jQuery,
+  jQuery
-  StickyKit
   ) {
-
   'use strict';
 
   var Module = {};
-
+  var SidebarView;
   // Widget handlers for use to create new content blocks via drag&drop
   Module._contentWidgets = new (Backbone.Collection.extend({
     model: SuperModel.extend({
@@ -35,8 +33,8 @@ define([
     }),
     comparator: 'priority'
   }))();
-  Module.registerWidget = function(widget) { return Module._contentWidgets.add(widget); };
+  Module.registerWidget = function (widget) { return Module._contentWidgets.add(widget); };
-  Module.getWidgets = function() { return Module._contentWidgets; };
+  Module.getWidgets = function () { return Module._contentWidgets; };
 
   // Layout widget handlers for use to create new layout blocks via drag&drop
   Module._layoutWidgets = new (Backbone.Collection.extend({
@@ -49,11 +47,11 @@ define([
     }),
     comparator: 'priority'
   }))();
-  Module.registerLayoutWidget = function(widget) { return Module._layoutWidgets.add(widget); };
+  Module.registerLayoutWidget = function (widget) { return Module._layoutWidgets.add(widget); };
-  Module.getLayoutWidgets = function() { return Module._layoutWidgets; };
+  Module.getLayoutWidgets = function () { return Module._layoutWidgets; };
 
-  var SidebarView = Marionette.View.extend({
+  SidebarView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.sidebar; },
+    getTemplate: function () { return window.templates.sidebar; },
     regions: {
       contentRegion: '.mailpoet_content_region',
       layoutRegion: '.mailpoet_layout_region',
@@ -61,16 +59,16 @@ define([
       previewRegion: '.mailpoet_preview_region'
     },
     events: {
-      'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function(event) {
+      'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function (event) {
-        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)'),
+        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)');
-          $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
+        var $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
 
         $openRegion.find('.mailpoet_region_content').velocity(
           'slideUp',
           {
             duration: 250,
             easing: 'easeOut',
-            complete: function() {
+            complete: function () {
               $openRegion.addClass('closed');
             }.bind(this)
           }
@@ -82,7 +80,7 @@ define([
             {
               duration: 250,
               easing: 'easeIn',
-              complete: function() {
+              complete: function () {
                 $targetRegion.removeClass('closed');
               }
             }
@@ -90,12 +88,12 @@ define([
         }
       }
     },
-    initialize: function(options) {
+    initialize: function () {
       jQuery(window)
         .on('resize', this.updateHorizontalScroll.bind(this))
         .on('scroll', this.updateHorizontalScroll.bind(this));
     },
-    onRender: function() {
+    onRender: function () {
       this.showChildView('contentRegion', new Module.SidebarWidgetsView(
         App.getWidgets()
       ));
@@ -108,24 +106,23 @@ define([
       }));
       this.showChildView('previewRegion', new Module.SidebarPreviewView());
     },
-    updateHorizontalScroll: function() {
+    updateHorizontalScroll: function () {
       // Fixes the sidebar so that on narrower screens the horizontal
       // position of the sidebar would be scrollable and not fixed
       // partially out of visible screen
       this.$el.parent().each(function () {
-        var calculated_left, self;
+        var calculatedLeft;
-
+        var self = jQuery(this);
-        self = jQuery(this);
 
         if (self.css('position') === 'fixed') {
-          calculated_left = self.parent().offset().left - jQuery(window).scrollLeft();
+          calculatedLeft = self.parent().offset().left - jQuery(window).scrollLeft();
-          self.css('left', calculated_left + 'px');
+          self.css('left', calculatedLeft + 'px');
         } else {
           self.css('left', '');
         }
       });
     },
-    onDomRefresh: function() {
+    onDomRefresh: function () {
       this.$el.parent().stick_in_parent({
         offset_top: 32
       });
@@ -140,23 +137,23 @@ define([
    * Draggable widget collection view
    */
   Module.SidebarWidgetsCollectionView = Marionette.CollectionView.extend({
-    childView: function(item) { return item.get('widgetView'); }
+    childView: function (item) { return item.get('widgetView'); }
   });
 
   /**
    * Responsible for rendering draggable content widgets
    */
   Module.SidebarWidgetsView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.sidebarContent; },
+    getTemplate: function () { return window.templates.sidebarContent; },
     regions: {
       widgets: '.mailpoet_region_content'
     },
 
-    initialize: function(widgets) {
+    initialize: function (widgets) {
       this.widgets = widgets;
     },
 
-    onRender: function() {
+    onRender: function () {
       this.showChildView('widgets', new Module.SidebarWidgetsCollectionView({
         collection: this.widgets
       }));
@@ -167,68 +164,68 @@ define([
    * Responsible for rendering draggable layout widgets
    */
   Module.SidebarLayoutWidgetsView = Module.SidebarWidgetsView.extend({
-    getTemplate: function() { return window.templates.sidebarLayout; }
+    getTemplate: function () { return window.templates.sidebarLayout; }
   });
 
   /**
    * Responsible for managing global styles
    */
   Module.SidebarStylesView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.sidebarStyles; },
+    getTemplate: function () { return window.templates.sidebarStyles; },
     behaviors: {
       ColorPickerBehavior: {}
     },
-    events: function() {
+    events: function () {
       return {
         'change #mailpoet_text_font_color': _.partial(this.changeColorField, 'text.fontColor'),
-        'change #mailpoet_text_font_family': function(event) {
+        'change #mailpoet_text_font_family': function (event) {
           this.model.set('text.fontFamily', event.target.value);
         },
-        'change #mailpoet_text_font_size': function(event) {
+        'change #mailpoet_text_font_size': function (event) {
           this.model.set('text.fontSize', event.target.value);
         },
         'change #mailpoet_h1_font_color': _.partial(this.changeColorField, 'h1.fontColor'),
-        'change #mailpoet_h1_font_family': function(event) {
+        'change #mailpoet_h1_font_family': function (event) {
           this.model.set('h1.fontFamily', event.target.value);
         },
-        'change #mailpoet_h1_font_size': function(event) {
+        'change #mailpoet_h1_font_size': function (event) {
           this.model.set('h1.fontSize', event.target.value);
         },
         'change #mailpoet_h2_font_color': _.partial(this.changeColorField, 'h2.fontColor'),
-        'change #mailpoet_h2_font_family': function(event) {
+        'change #mailpoet_h2_font_family': function (event) {
           this.model.set('h2.fontFamily', event.target.value);
         },
-        'change #mailpoet_h2_font_size': function(event) {
+        'change #mailpoet_h2_font_size': function (event) {
           this.model.set('h2.fontSize', event.target.value);
         },
         'change #mailpoet_h3_font_color': _.partial(this.changeColorField, 'h3.fontColor'),
-        'change #mailpoet_h3_font_family': function(event) {
+        'change #mailpoet_h3_font_family': function (event) {
           this.model.set('h3.fontFamily', event.target.value);
         },
-        'change #mailpoet_h3_font_size': function(event) {
+        'change #mailpoet_h3_font_size': function (event) {
           this.model.set('h3.fontSize', event.target.value);
         },
         'change #mailpoet_a_font_color': _.partial(this.changeColorField, 'link.fontColor'),
-        'change #mailpoet_a_font_underline': function(event) {
+        'change #mailpoet_a_font_underline': function (event) {
           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')
       };
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         model: this.model.toJSON(),
         availableStyles: this.availableStyles.toJSON()
       };
     },
-    initialize: function(options) {
+    initialize: function (options) {
       this.availableStyles = options.availableStyles;
     },
-    changeField: function(field, event) {
+    changeField: function (field, event) {
       this.model.set(field, jQuery(event.target).val());
     },
-    changeColorField: function(field, event) {
+    changeColorField: function (field, event) {
       var value = jQuery(event.target).val();
       if (value === '') {
         value = 'transparent';
@@ -238,18 +235,18 @@ define([
   });
 
   Module.SidebarPreviewView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.sidebarPreview; },
+    getTemplate: function () { return window.templates.sidebarPreview; },
     events: {
       'click .mailpoet_show_preview': 'showPreview',
       'click #mailpoet_send_preview': 'sendPreview'
     },
-    onBeforeDestroy: function() {
+    onBeforeDestroy: function () {
       if (this.previewView) {
         this.previewView.destroy();
         this.previewView = null;
       }
     },
-    showPreview: function() {
+    showPreview: function () {
       var json = App.toJSON();
 
       // Stringify to enable transmission of primitive non-string value types
@@ -264,23 +261,23 @@ define([
         endpoint: 'newsletters',
         action: 'showPreview',
         data: json
-      }).always(function() {
+      }).always(function () {
         MailPoet.Modal.loading(false);
-      }).done(function(response) {
+      }).done(function (response) {
         this.previewView = new Module.NewsletterPreviewView({
           previewUrl: response.meta.preview_url
         });
 
-        var view = this.previewView.render();
+        this.previewView.render();
         this.previewView.$el.css('height', '100%');
- 
+
         MailPoet.Modal.popup({
           template: '',
           element: this.previewView.$el,
           width: '95%',
           height: '94%',
           title: MailPoet.I18n.t('newsletterPreview'),
-          onCancel: function() {
+          onCancel: function () {
             this.previewView.destroy();
             this.previewView = null;
           }.bind(this)
@@ -289,16 +286,16 @@ define([
         MailPoet.trackEvent('Editor > Browser Preview', {
           'MailPoet Free version': window.mailpoet_version
         });
-      }.bind(this)).fail(function(response) {
+      }.bind(this)).fail(function (response) {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map(function(error) { return error.message; }),
+            response.errors.map(function (error) { return error.message; }),
             { scroll: true }
           );
         }
       });
     },
-    sendPreview: function() {
+    sendPreview: function () {
       // get form data
       var $emailField = this.$('#mailpoet_preview_to_email');
       var data = {
@@ -321,10 +318,10 @@ define([
       MailPoet.Modal.loading(true);
 
       // save before sending
-      App.getChannel().request('save').always(function() {
+      App.getChannel().request('save').always(function () {
-        CommunicationComponent.previewNewsletter(data).always(function() {
+        CommunicationComponent.previewNewsletter(data).always(function () {
           MailPoet.Modal.loading(false);
-        }).done(function(response) {
+        }).done(function () {
           MailPoet.Notice.success(
             MailPoet.I18n.t('newsletterPreviewSent'),
             { scroll: true }
@@ -333,28 +330,29 @@ define([
             'MailPoet Free version': window.mailpoet_version,
             'Domain name': data.subscriber.substring(data.subscriber.indexOf('@') + 1)
           });
-        }).fail(function(response) {
+        }).fail(function (response) {
           if (response.errors.length > 0) {
             MailPoet.Notice.error(
-              response.errors.map(function(error) { return error.message; }),
+              response.errors.map(function (error) { return error.message; }),
               { scroll: true, static: true }
             );
           }
         });
       });
+      return undefined;
     }
   });
 
   Module.NewsletterPreviewView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.newsletterPreview; },
+    getTemplate: function () { return window.templates.newsletterPreview; },
-    initialize: function(options) {
+    initialize: function (options) {
       this.previewUrl = options.previewUrl;
       this.width = '100%';
       this.height = '100%';
       // this.width = App.getConfig().get('newsletterPreview.width');
       // this.height = App.getConfig().get('newsletterPreview.height')
     },
-    templateContext: function() {
+    templateContext: function () {
       return {
         previewUrl: this.previewUrl,
         width: this.width,
@@ -363,19 +361,18 @@ define([
     }
   });
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp) {
-    var Application = App;
+    var Application = BeforeStartApp;
     Application.registerWidget = Module.registerWidget;
     Application.getWidgets = Module.getWidgets;
     Application.registerLayoutWidget = Module.registerLayoutWidget;
     Application.getLayoutWidgets = Module.getLayoutWidgets;
   });
 
-  App.on('start', function(App, options) {
+  App.on('start', function (StartApp) {
-    var stylesModel = App.getGlobalStyles(),
+    var sidebarView = new SidebarView();
-      sidebarView = new SidebarView();
 
-    App._appView.showChildView('sidebarRegion', sidebarView);
+    StartApp._appView.showChildView('sidebarRegion', sidebarView);
 
     MailPoet.helpTooltip.show(document.getElementById('tooltip-send-preview'), {
       tooltipId: 'tooltip-editor-send-preview',

assets/js/src/newsletter_editor/components/styles.js

@@ -1,12 +1,12 @@
+
+'use strict';
+
 define([
   'newsletter_editor/App',
   'backbone.marionette',
   'backbone.supermodel',
   'underscore'
-], function(App, Marionette, SuperModel, _) {
+], function (App, Marionette, SuperModel, _) { // eslint-disable-line func-names
-
-  'use strict';
-
   var Module = {};
 
   Module.StylesModel = SuperModel.extend({
@@ -42,48 +42,50 @@ define([
         backgroundColor: '#cccccc'
       }
     },
-    initialize: function() {
+    initialize: function () { // eslint-disable-line func-names
-      this.on('change', function() { App.getChannel().trigger('autoSave'); });
+      this.on('change', function () { App.getChannel().trigger('autoSave'); }); // eslint-disable-line func-names
     }
   });
 
   Module.StylesView = Marionette.View.extend({
-    getTemplate: function() { return window.templates.styles; },
+    getTemplate: function () { return window.templates.styles; }, // eslint-disable-line func-names
     modelEvents: {
       change: 'render'
     },
-    serializeData: function() {
+    serializeData: function () { // eslint-disable-line func-names
       return this.model.toJSON();
     }
   });
 
   Module._globalStyles = new SuperModel();
-  Module.getGlobalStyles = function() {
+  Module.getGlobalStyles = function () { // eslint-disable-line func-names
     return Module._globalStyles;
   };
-  Module.setGlobalStyles = function(options) {
+  Module.setGlobalStyles = function (options) { // eslint-disable-line func-names
     Module._globalStyles = new Module.StylesModel(options);
     return Module._globalStyles;
   };
-  Module.getAvailableStyles = function() {
+  Module.getAvailableStyles = function () { // eslint-disable-line func-names
     return App.getConfig().get('availableStyles');
   };
 
-  App.on('before:start', function(App, options) {
+  App.on('before:start', function (BeforeStartApp, options) { // eslint-disable-line func-names
-    var Application = App;
+    var Application = BeforeStartApp;
+    var body;
+    var globalStyles;
     // Expose style methods to global application
     Application.getGlobalStyles = Module.getGlobalStyles;
     Application.setGlobalStyles = Module.setGlobalStyles;
     Application.getAvailableStyles = Module.getAvailableStyles;
 
-    var body = options.newsletter.body;
+    body = options.newsletter.body;
-    var globalStyles = (_.has(body, 'globalStyles')) ? body.globalStyles : {};
+    globalStyles = (_.has(body, 'globalStyles')) ? body.globalStyles : {};
     this.setGlobalStyles(globalStyles);
   });
 
-  App.on('start', function(App, options) {
+  App.on('start', function (StartApp) { // eslint-disable-line func-names
-    var stylesView = new Module.StylesView({ model: App.getGlobalStyles() });
+    var stylesView = new Module.StylesView({ model: StartApp.getGlobalStyles() });
-    App._appView.showChildView('stylesRegion', stylesView);
+    StartApp._appView.showChildView('stylesRegion', stylesView);
   });
 
   return Module;

assets/js/src/newsletter_editor/tinymce/mailpoet_shortcodes/plugin.js

@@ -8,33 +8,35 @@
  * its placeholder into editor text.
  */
 
-/*jshint unused:false */
+/* jshint unused:false */
-/*global tinymce:true */
+/* global tinymce:true */
-tinymce.PluginManager.add('mailpoet_shortcodes', function(editor, url) {
+tinymce.PluginManager.add('mailpoet_shortcodes', function (editor) { // eslint-disable-line func-names
-  var appendLabelAndClose = function(shortcode) {
+  var appendLabelAndClose = function (shortcode) { // eslint-disable-line func-names
-      editor.insertContent(shortcode);
+    editor.insertContent(shortcode);
-      editor.windowManager.close();
+    editor.windowManager.close();
-    },
+  };
-    generateOnClickFunc = function(shortcode) {
+  var generateOnClickFunc = function (shortcode) { // eslint-disable-line func-names
-      return function() {
+    return function () { // eslint-disable-line func-names
-        appendLabelAndClose(shortcode);
+      appendLabelAndClose(shortcode);
-      };
     };
+  };
 
   editor.addButton('mailpoet_shortcodes', {
     icon: 'mailpoet_shortcodes',
-    onclick: function() {
+    onclick: function () { // eslint-disable-line func-names
-      var shortcodes = [],
+      var shortcodes = [];
-        configShortcodes = editor.settings.mailpoet_shortcodes;
+      var configShortcodes = editor.settings.mailpoet_shortcodes;
+      var segment;
+      var i;
 
-      for (var segment in configShortcodes) {
+      for (segment in configShortcodes) {
         if (configShortcodes.hasOwnProperty(segment)) {
           shortcodes.push({
             type: 'label',
             text: segment
           });
 
-          for (var i = 0; i < configShortcodes[segment].length; i += 1) {
+          for (i = 0; i < configShortcodes[segment].length; i += 1) {
             shortcodes.push({
               type: 'button',
               text: configShortcodes[segment][i].text,

assets/js/src/newsletters/badges/stats.jsx

@@ -49,7 +49,7 @@ const stats = {
 };
 
 class StatsBadge extends React.Component {
-  getBadgeType(stat, rate) {
+  static getBadgeType(stat, rate) {
     const len = stat.badgeRanges.length;
     for (let i = 0; i < len; i += 1) {
       if (rate > stat.badgeRanges[i]) {
@@ -70,7 +70,7 @@ class StatsBadge extends React.Component {
       return null;
     }
 
-    const badgeType = this.getBadgeType(stat, rate);
+    const badgeType = StatsBadge.getBadgeType(stat, rate);
     const badge = badges[badgeType] || null;
     if (!badge) {
       return null;

assets/js/src/newsletters/breadcrumb.jsx

@@ -46,18 +46,18 @@ define(
 
           let label = step.label;
 
-          if(step['link'] !== undefined && this.props.step !== step.name) {
+          if (step.link !== undefined && this.props.step !== step.name) {
             label = (
-              <Link to={ step.link }>{ step.label }</Link>
+              <Link to={step.link}>{ step.label }</Link>
             );
           }
 
           return (
-            <span key={ 'step-'+index }>
+            <span key={`step-${index}`}>
-              <span className={ stepClasses }>
+              <span className={stepClasses}>
                 { label }
               </span>
-              { (index < (this.state.steps.length - 1) ) ? ' > ' : '' }
+              { (index < (this.state.steps.length - 1)) ? ' > ' : '' }
             </span>
           );
         });

assets/js/src/newsletters/listings/mixins.jsx

@@ -9,7 +9,7 @@ import jQuery from 'jquery';
 import Hooks from 'wp-js-hooks';
 import StatsBadge from 'newsletters/badges/stats.jsx';
 
-const _QueueMixin = {
+const QueueMixin = {
   pauseSending: function (newsletter) {
     MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
@@ -19,12 +19,12 @@ const _QueueMixin = {
         newsletter_id: newsletter.id,
       },
     }).done(() => {
-      jQuery('#resume_'+newsletter.id).show();
+      jQuery(`#resume_${newsletter.id}`).show();
-      jQuery('#pause_'+newsletter.id).hide();
+      jQuery(`#pause_${newsletter.id}`).hide();
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map((error) => { return error.message; }),
+          response.errors.map(error => error.message),
           { scroll: true }
         );
       }
@@ -39,113 +39,119 @@ const _QueueMixin = {
         newsletter_id: newsletter.id,
       },
     }).done(() => {
-      jQuery('#pause_'+newsletter.id).show();
+      jQuery(`#pause_${newsletter.id}`).show();
-      jQuery('#resume_'+newsletter.id).hide();
+      jQuery(`#resume_${newsletter.id}`).hide();
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map((error) => { return error.message; }),
+          response.errors.map(error => error.message),
           { scroll: true }
         );
       }
     });
   },
-  renderQueueStatus: function (newsletter, mailer_log) {
+  renderQueueStatus: function (newsletter, mailerLog) {
     if (!newsletter.queue) {
       return (
         <span>{MailPoet.I18n.t('notSentYet')}</span>
       );
-    } else if (mailer_log.status === 'paused' && newsletter.queue.status !== 'completed') {
+    } else if (mailerLog.status === 'paused' && newsletter.queue.status !== 'completed') {
       return (
         <span>{MailPoet.I18n.t('paused')}</span>
       );
-    } else {
+    }
-      if (newsletter.queue.status === 'scheduled') {
+    if (newsletter.queue.status === 'scheduled') {
-        return (
+      return (
-          <span>
+        <span>
-            { MailPoet.I18n.t('scheduledFor') } { MailPoet.Date.format(newsletter.queue.scheduled_at) }
+          { MailPoet.I18n.t('scheduledFor') } { MailPoet.Date.format(newsletter.queue.scheduled_at) }
-          </span>
+        </span>
-        );
+      );
-      }
+    }
-      const progressClasses = classNames(
+    const progressClasses = classNames(
         'mailpoet_progress',
         { mailpoet_progress_complete: newsletter.queue.status === 'completed' }
       );
 
       // calculate percentage done
-      let percentage = Math.round(
+    let percentage = Math.round(
         (newsletter.queue.count_processed * 100) / (newsletter.queue.count_total)
       );
 
-      let label;
+    let label;
 
-      if (newsletter.queue.status === 'completed') {
+    if (newsletter.queue.status === 'completed') {
-        label = (
+      label = (
-          <span>
+        <span>
-            {
+          {
               MailPoet.I18n.t('newsletterQueueCompleted')
-              .replace('%$1d', newsletter.queue.count_processed)
+              .replace('%$1d', parseInt(newsletter.queue.count_processed, 10).toLocaleString())
-              .replace('%$2d', newsletter.queue.count_total)
+              .replace('%$2d', parseInt(newsletter.queue.count_total, 10).toLocaleString())
             }
-          </span>
+        </span>
         );
-      } else {
+    } else {
-        label = (
+      label = (
-          <span>
+        <span>
-            { newsletter.queue.count_processed } / { newsletter.queue.count_total }
+          { newsletter.queue.count_processed } / { newsletter.queue.count_total }
             &nbsp;&nbsp;
-            <a
+          <a
-              id={ 'resume_'+newsletter.id }
+            id={`resume_${newsletter.id}`}
-              className="button"
+            className="button"
-              style={{ display: (newsletter.queue.status === 'paused')
+            style={{ display: (newsletter.queue.status === 'paused')
-                ? 'inline-block': 'none' }}
+                ? 'inline-block' : 'none' }}
-              href="javascript:;"
+            href="javascript:;"
-              onClick={ this.resumeSending.bind(null, newsletter) }
+            onClick={this.resumeSending.bind(null, newsletter)}
             >{MailPoet.I18n.t('resume')}</a>
-            <a
+          <a
-              id={ 'pause_'+newsletter.id }
+            id={`pause_${newsletter.id}`}
-              className="button mailpoet_pause"
+            className="button mailpoet_pause"
-              style={{ display: (newsletter.queue.status === null)
+            style={{ display: (newsletter.queue.status === null)
-                  ? 'inline-block': 'none' }}
+                  ? 'inline-block' : 'none' }}
-              href="javascript:;"
+            href="javascript:;"
-              onClick={ this.pauseSending.bind(null, newsletter) }
+            onClick={this.pauseSending.bind(null, newsletter)}
             >{MailPoet.I18n.t('pause')}</a>
-          </span>
+        </span>
         );
-      }
-
-      let progress_bar_width = 0;
-
-      if (isNaN(percentage)) {
-        percentage = MailPoet.I18n.t('noSubscribers');
-      } else {
-        progress_bar_width = percentage;
-        percentage += '%';
-      }
-
-      return (
-        <div>
-          <div className={ progressClasses }>
-            <span
-              className="mailpoet_progress_bar"
-              style={ { width: progress_bar_width + '%' } }
-              ></span>
-            <span className="mailpoet_progress_label">
-              { percentage }
-            </span>
-          </div>
-          <p style={{ textAlign:'center' }}>
-            { label }
-          </p>
-        </div>
-      );
     }
+
+    let progressBarWidth = 0;
+
+    if (isNaN(percentage)) {
+      percentage = MailPoet.I18n.t('noSubscribers');
+    } else {
+      progressBarWidth = percentage;
+      percentage += '%';
+    }
+
+    return (
+      <div>
+        <div className={progressClasses}>
+          <span
+            className="mailpoet_progress_bar"
+            style={{ width: `${progressBarWidth}%` }}
+              ></span>
+          <span className="mailpoet_progress_label">
+            { percentage }
+          </span>
+        </div>
+        <p style={{ textAlign: 'center' }}>
+          { label }
+        </p>
+      </div>
+    );
   },
 };
 
-const _StatisticsMixin = {
+const trackStatsCTAClicked = function () {
-  renderStatistics: function (newsletter, is_sent, current_time) {
+  MailPoet.trackEvent(
-    let sent = is_sent;
+    'User has clicked a CTA to view detailed stats',
+    { 'MailPoet Free version': window.mailpoet_version }
+  );
+};
+
+const StatisticsMixin = {
+  renderStatistics: function (newsletter, isSent, currentTime) {
+    let sent = isSent;
     if (sent === undefined) {
       // condition for standard and post notification listings
       sent = newsletter.statistics
@@ -159,77 +165,78 @@ const _StatisticsMixin = {
     }
 
     let params = {};
+    Hooks.addFilter('mailpoet_newsletters_listing_stats_before', this.addStatsCTALink);
     params = Hooks.applyFilters('mailpoet_newsletters_listing_stats_before', params, newsletter);
 
     // welcome emails provide explicit total_sent value
-    const total_sent = ~~(newsletter.total_sent || newsletter.queue.count_processed);
+    const totalSent = Number((newsletter.total_sent || newsletter.queue.count_processed));
 
-    let percentage_clicked = 0;
+    let percentageClicked = 0;
-    let percentage_opened = 0;
+    let percentageOpened = 0;
-    let percentage_unsubscribed = 0;
+    let percentageUnsubscribed = 0;
 
-    if (total_sent > 0) {
+    if (totalSent > 0) {
-      percentage_clicked = (newsletter.statistics.clicked * 100) / total_sent;
+      percentageClicked = (newsletter.statistics.clicked * 100) / totalSent;
-      percentage_opened = (newsletter.statistics.opened * 100) / total_sent;
+      percentageOpened = (newsletter.statistics.opened * 100) / totalSent;
-      percentage_unsubscribed = (newsletter.statistics.unsubscribed * 100) / total_sent;
+      percentageUnsubscribed = (newsletter.statistics.unsubscribed * 100) / totalSent;
     }
 
     // format to 1 decimal place
-    const percentage_clicked_display = MailPoet.Num.toLocaleFixed(percentage_clicked, 1);
+    const percentageClickedDisplay = MailPoet.Num.toLocaleFixed(percentageClicked, 1);
-    const percentage_opened_display = MailPoet.Num.toLocaleFixed(percentage_opened, 1);
+    const percentageOpenedDisplay = MailPoet.Num.toLocaleFixed(percentageOpened, 1);
-    const percentage_unsubscribed_display = MailPoet.Num.toLocaleFixed(percentage_unsubscribed, 1);
+    const percentageUnsubscribedDisplay = MailPoet.Num.toLocaleFixed(percentageUnsubscribed, 1);
 
-    let show_stats_timeout,
+    let showStatsTimeout;
-      newsletter_date,
+    let newsletterDate;
-      sent_hours_ago,
+    let sentHoursAgo;
-      too_early_for_stats,
+    let tooEarlyForStats;
-      show_kb_link;
+    let showKbLink;
-    if (current_time !== undefined) {
+    if (currentTime !== undefined) {
       // standard emails and post notifications:
       // display green box for newsletters that were just sent
-      show_stats_timeout = 6; // in hours
+      showStatsTimeout = 6; // in hours
-      newsletter_date = newsletter.queue.scheduled_at || newsletter.queue.created_at;
+      newsletterDate = newsletter.queue.scheduled_at || newsletter.queue.created_at;
-      sent_hours_ago = moment(current_time).diff(moment(newsletter_date), 'hours');
+      sentHoursAgo = moment(currentTime).diff(moment(newsletterDate), 'hours');
-      too_early_for_stats = sent_hours_ago < show_stats_timeout;
+      tooEarlyForStats = sentHoursAgo < showStatsTimeout;
-      show_kb_link = true;
+      showKbLink = true;
     } else {
       // welcome emails: no green box and KB link
-      too_early_for_stats = false;
+      tooEarlyForStats = false;
-      show_kb_link = false;
+      showKbLink = false;
     }
 
     const improveStatsKBLink = 'http://beta.docs.mailpoet.com/article/191-how-to-improve-my-open-and-click-rates';
 
     // thresholds to display badges
-    const min_newsletters_sent = 20;
+    const minNewslettersSent = 20;
-    const min_newsletter_opens = 5;
+    const minNewsletterOpens = 5;
 
     let content;
-    if (total_sent >= min_newsletters_sent
+    if (totalSent >= minNewslettersSent
-      && newsletter.statistics.opened >= min_newsletter_opens
+      && newsletter.statistics.opened >= minNewsletterOpens
-      && !too_early_for_stats
+      && !tooEarlyForStats
     ) {
       // display stats with badges
       content = (
         <div className="mailpoet_stats_text">
           <div>
-            <span>{ percentage_opened_display }% </span>
+            <span>{ percentageOpenedDisplay }% </span>
             <StatsBadge
               stat="opened"
-              rate={percentage_opened}
+              rate={percentageOpened}
               tooltipId={`opened-${newsletter.id}`}
             />
           </div>
           <div>
-            <span>{ percentage_clicked_display }% </span>
+            <span>{ percentageClickedDisplay }% </span>
             <StatsBadge
               stat="clicked"
-              rate={percentage_clicked}
+              rate={percentageClicked}
               tooltipId={`clicked-${newsletter.id}`}
             />
           </div>
           <div>
-            <span className="mailpoet_stat_hidden">{ percentage_unsubscribed_display }%</span>
+            <span className="mailpoet_stat_hidden">{ percentageUnsubscribedDisplay }%</span>
           </div>
         </div>
       );
@@ -238,17 +245,17 @@ const _StatisticsMixin = {
       content = (
         <div>
           <span className="mailpoet_stats_text">
-            { percentage_opened_display }%,
+            { percentageOpenedDisplay }%,
             { ' ' }
-            { percentage_clicked_display }%
+            { percentageClickedDisplay }%
             <span className="mailpoet_stat_hidden">
-              , { percentage_unsubscribed_display }%
+              , { percentageUnsubscribedDisplay }%
             </span>
           </span>
-          { too_early_for_stats && (
+          { tooEarlyForStats && (
             <div className="mailpoet_badge mailpoet_badge_green">
               {MailPoet.I18n.t('checkBackInHours')
-                  .replace('%$1d', show_stats_timeout - sent_hours_ago)}
+                  .replace('%$1d', showStatsTimeout - sentHoursAgo)}
             </div>
           ) }
         </div>
@@ -256,18 +263,18 @@ const _StatisticsMixin = {
     }
 
     // thresholds to display bad open rate help
-    const max_percentage_opened = 5;
+    const maxPercentageOpened = 5;
-    const min_sent_hours_ago = 24;
+    const minSentHoursAgo = 24;
-    const min_total_sent = 10;
+    const minTotalSent = 10;
 
-    let after_content;
+    let afterContent;
-    if (show_kb_link
+    if (showKbLink
-      && percentage_opened < max_percentage_opened
+      && percentageOpened < maxPercentageOpened
-      && sent_hours_ago >= min_sent_hours_ago
+      && sentHoursAgo >= minSentHoursAgo
-      && total_sent >= min_total_sent
+      && totalSent >= minTotalSent
     ) {
       // help link for bad open rate
-      after_content = (
+      afterContent = (
         <div>
           <a
             href={improveStatsKBLink}
@@ -280,18 +287,32 @@ const _StatisticsMixin = {
       );
     }
 
-    if (total_sent > 0 && params.link) {
+    if (totalSent > 0 && params.link) {
       // wrap content in a link
+      if (params.externalLink) {
+        return (
+          <div>
+            <a
+              key={`stats-${newsletter.id}`}
+              href={params.link}
+              onClick={params.onClick || null}
+            >
+              {content}
+            </a>
+            {afterContent}
+          </div>
+        );
+      }
       return (
         <div>
           <Link
-            key={ `stats-${newsletter.id}` }
+            key={`stats-${newsletter.id}`}
-            to={ params.link }
+            to={params.link}
-            onClick={ params.onClick || null }
+            onClick={params.onClick || null}
-          >
+            >
             {content}
           </Link>
-          {after_content}
+          {afterContent}
         </div>
       );
     }
@@ -299,13 +320,44 @@ const _StatisticsMixin = {
     return (
       <div>
         {content}
-        {after_content}
+        {afterContent}
       </div>
     );
   },
+  addStatsCTAAction: function (actions) {
+    if (window.mailpoet_premium_active) {
+      return actions;
+    }
+    actions.unshift({
+      name: 'stats',
+      link: function () {
+        return (
+          <a href={'admin.php?page=mailpoet-premium'} onClick={trackStatsCTAClicked}>
+            {MailPoet.I18n.t('statsListingActionTitle')}
+          </a>
+        );
+      },
+      display: function (newsletter) {
+        // welcome emails provide explicit total_sent value
+        const countProcessed = newsletter.queue && newsletter.queue.count_processed;
+        return Number(newsletter.total_sent || countProcessed) > 0;
+      },
+    });
+    return actions;
+  },
+  addStatsCTALink: function (params) {
+    if (window.mailpoet_premium_active) {
+      return params;
+    }
+    const newParams = params;
+    newParams.link = 'admin.php?page=mailpoet-premium';
+    newParams.externalLink = true;
+    newParams.onClick = trackStatsCTAClicked;
+    return newParams;
+  },
 };
 
-const _MailerMixin = {
+const MailerMixin = {
   checkMailerStatus: function (state) {
     if (state.meta.mta_log.error && state.meta.mta_log.status === 'paused') {
       MailPoet.Notice.error(
@@ -322,8 +374,8 @@ const _MailerMixin = {
     }
   },
   getMailerError(state) {
-    let mailer_error_notice;
+    let mailerErrorNotice;
-    const mailer_check_settings_notice = ReactStringReplace(
+    const mailerCheckSettingsNotice = ReactStringReplace(
       MailPoet.I18n.t('mailerCheckSettingsNotice'),
       /\[link\](.*?)\[\/link\]/g,
       match => (
@@ -331,23 +383,27 @@ const _MailerMixin = {
       )
     );
     if (state.meta.mta_log.error.operation === 'send') {
-      mailer_error_notice =
+      mailerErrorNotice =
         MailPoet.I18n.t('mailerSendErrorNotice')
           .replace('%$1s', state.meta.mta_method)
           .replace('%$2s', state.meta.mta_log.error.error_message);
     } else {
-      mailer_error_notice =
+      mailerErrorNotice =
         MailPoet.I18n.t('mailerConnectionErrorNotice')
           .replace('%$1s', state.meta.mta_log.error.error_message);
     }
+    if (state.meta.mta_log.error.error_code) {
+      mailerErrorNotice += ` ${MailPoet.I18n.t('mailerErrorCode')
+          .replace('%$1s', state.meta.mta_log.error.error_code)}`;
+    }
     return (
       <div>
-        <p>{ mailer_error_notice }</p>
+        <p>{ mailerErrorNotice }</p>
-        <p>{ mailer_check_settings_notice }</p>
+        <p>{ mailerCheckSettingsNotice }</p>
         <p>
           <a href="javascript:;"
             className="button"
-            onClick={ this.resumeMailerSending }
+            onClick={this.resumeMailerSending}
           >{ MailPoet.I18n.t('mailerResumeSendingButton') }</a>
         </p>
       </div>
@@ -365,7 +421,7 @@ const _MailerMixin = {
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map((error) => { return error.message; }),
+          response.errors.map(error => error.message),
           { scroll: true }
         );
       }
@@ -374,6 +430,6 @@ const _MailerMixin = {
 };
 
 
-export { _QueueMixin as QueueMixin };
+export { QueueMixin };
-export { _StatisticsMixin as StatisticsMixin };
+export { StatisticsMixin };
-export { _MailerMixin as MailerMixin };
+export { MailerMixin };

assets/js/src/newsletters/listings/notification.jsx

@@ -18,7 +18,7 @@ import {
 
 const messages = {
   onTrash: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -33,7 +33,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onDelete: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -48,7 +48,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onRestore: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -91,7 +91,7 @@ const columns = [
   },
 ];
 
-const bulk_actions = [
+const bulkActions = [
   {
     name: 'trash',
     label: MailPoet.I18n.t('moveToTrash'),
@@ -99,12 +99,12 @@ const bulk_actions = [
   },
 ];
 
-const newsletter_actions = [
+const newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
       return (
-        <a href={ newsletter.preview_url } target="_blank">
+        <a href={newsletter.preview_url} target="_blank">
           {MailPoet.I18n.t('preview')}
         </a>
       );
@@ -114,7 +114,7 @@ const newsletter_actions = [
     name: 'edit',
     link: function (newsletter) {
       return (
-        <a href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }>
+        <a href={`?page=mailpoet-newsletter-editor&id=${newsletter.id}`}>
           {MailPoet.I18n.t('edit')}
         </a>
       );
@@ -141,7 +141,7 @@ const newsletter_actions = [
       }).fail((response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map((error) => { return error.message; }),
+            response.errors.map(error => error.message),
             { scroll: true }
           );
         }
@@ -154,7 +154,7 @@ const newsletter_actions = [
 ];
 
 const NewsletterListNotification = React.createClass({
-  mixins: [ MailerMixin ],
+  mixins: [MailerMixin],
   updateStatus: function (e) {
     // make the event persist so that we can still override the selected value
     // in the ajax callback
@@ -165,7 +165,7 @@ const NewsletterListNotification = React.createClass({
       endpoint: 'newsletters',
       action: 'setStatus',
       data: {
-        id: ~~(e.target.getAttribute('data-id')),
+        id: Number(e.target.getAttribute('data-id')),
         status: e.target.value,
       },
     }).done((response) => {
@@ -184,9 +184,9 @@ const NewsletterListNotification = React.createClass({
   renderStatus: function (newsletter) {
     return (
       <select
-        data-id={ newsletter.id }
+        data-id={newsletter.id}
-        defaultValue={ newsletter.status }
+        defaultValue={newsletter.status}
-        onChange={ this.updateStatus }
+        onChange={this.updateStatus}
       >
         <option value="active">{ MailPoet.I18n.t('active') }</option>
         <option value="draft">{ MailPoet.I18n.t('inactive') }</option>
@@ -195,65 +195,66 @@ const NewsletterListNotification = React.createClass({
   },
   renderSettings: function (newsletter) {
     let sendingFrequency;
-    let sendingToSegments;
 
     // get list of segments' name
-    const segments = newsletter.segments.map((segment) => {
+    const segments = newsletter.segments.map(segment => segment.name);
-      return segment.name;
+    const sendingToSegments = MailPoet.I18n.t('ifNewContentToSegments').replace(
-    });
+      '%$1s', segments.join(', ')
+    );
 
     // check if the user has specified segments to send to
-    if(segments.length === 0) {
+    if (segments.length === 0) {
       return (
         <span className="mailpoet_error">
           { MailPoet.I18n.t('sendingToSegmentsNotSpecified') }
         </span>
       );
-    } else {
+    }
-      sendingToSegments = MailPoet.I18n.t('ifNewContentToSegments').replace(
-        '%$1s', segments.join(', ')
-      );
 
-      // set sending frequency
+    // set sending frequency
-      switch (newsletter.options.intervalType) {
+    switch (newsletter.options.intervalType) {
-        case 'daily':
+      case 'daily':
-          sendingFrequency = MailPoet.I18n.t('sendDaily').replace(
+        sendingFrequency = MailPoet.I18n.t('sendDaily').replace(
             '%$1s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'weekly':
+      case 'weekly':
-          sendingFrequency = MailPoet.I18n.t('sendWeekly').replace(
+        sendingFrequency = MailPoet.I18n.t('sendWeekly').replace(
             '%$1s', weekDayValues[newsletter.options.weekDay]
           ).replace(
             '%$2s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'monthly':
+      case 'monthly':
-          sendingFrequency = MailPoet.I18n.t('sendMonthly').replace(
+        sendingFrequency = MailPoet.I18n.t('sendMonthly').replace(
             '%$1s', monthDayValues[newsletter.options.monthDay]
           ).replace(
             '%$2s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'nthWeekDay':
+      case 'nthWeekDay':
-          sendingFrequency = MailPoet.I18n.t('sendNthWeekDay').replace(
+        sendingFrequency = MailPoet.I18n.t('sendNthWeekDay').replace(
             '%$1s', nthWeekDayValues[newsletter.options.nthWeekDay]
           ).replace(
             '%$2s', weekDayValues[newsletter.options.weekDay]
           ).replace(
             '%$3s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'immediately':
+      case 'immediately':
-          sendingFrequency = MailPoet.I18n.t('sendImmediately');
+        sendingFrequency = MailPoet.I18n.t('sendImmediately');
-          break;
+        break;
-      }
+
+      default:
+        sendingFrequency = 'Invalid sending frequency';
+        break;
     }
 
+
     return (
       <span>
         { sendingFrequency } { sendingToSegments }
@@ -261,18 +262,17 @@ const NewsletterListNotification = React.createClass({
     );
   },
   renderHistoryLink: function (newsletter) {
-    const childrenCount = ~~(newsletter.children_count);
+    const childrenCount = Number((newsletter.children_count));
     if (childrenCount === 0) {
       return (
         MailPoet.I18n.t('notSentYet')
       );
-    } else {
-      return (
-        <Link
-          to={ `/notification/history/${ newsletter.id }` }
-        >{ MailPoet.I18n.t('viewHistory') }</Link>
-      );
     }
+    return (
+      <Link
+        to={`/notification/history/${newsletter.id}`}
+        >{ MailPoet.I18n.t('viewHistory') }</Link>
+    );
   },
   renderItem: function (newsletter, actions) {
     const rowClasses = classNames(
@@ -283,25 +283,25 @@ const NewsletterListNotification = React.createClass({
 
     return (
       <div>
-        <td className={ rowClasses }>
+        <td className={rowClasses}>
           <strong>
             <a
               className="row-title"
-              href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }
+              href={`?page=mailpoet-newsletter-editor&id=${newsletter.id}`}
             >{ newsletter.subject }</a>
           </strong>
           { actions }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('status') }>
+        <td className="column" data-colname={MailPoet.I18n.t('status')}>
           { this.renderStatus(newsletter) }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('settings') }>
+        <td className="column" data-colname={MailPoet.I18n.t('settings')}>
           { this.renderSettings(newsletter) }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('history') }>
+        <td className="column" data-colname={MailPoet.I18n.t('history')}>
           { this.renderHistoryLink(newsletter) }
         </td>
-        <td className="column-date" data-colname={ MailPoet.I18n.t('lastModifiedOn') }>
+        <td className="column-date" data-colname={MailPoet.I18n.t('lastModifiedOn')}>
           <abbr>{ MailPoet.Date.format(newsletter.updated_at) }</abbr>
         </td>
       </div>
@@ -311,27 +311,27 @@ const NewsletterListNotification = React.createClass({
     return (
       <div>
         <h1 className="title">
-          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
+          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
         </h1>
 
         <ListingTabs tab="notification" />
 
         <Listing
-          limit={ window.mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
           endpoint="newsletters"
           type="notification"
           base_url="notification"
-          onRenderItem={ this.renderItem }
+          onRenderItem={this.renderItem}
-          columns={ columns }
+          columns={columns}
-          bulk_actions={ bulk_actions }
+          bulk_actions={bulkActions}
-          item_actions={ newsletter_actions }
+          item_actions={newsletterActions}
-          messages={ messages }
+          messages={messages}
-          auto_refresh={ true }
+          auto_refresh={true}
           sort_by="updated_at"
           sort_order="desc"
-          afterGetItems={ this.checkMailerStatus }
+          afterGetItems={this.checkMailerStatus}
         />
       </div>
     );

assets/js/src/newsletters/listings/notification_history.jsx

@@ -13,7 +13,7 @@ import {
   MailerMixin,
 } from 'newsletters/listings/mixins.jsx';
 
-const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
+const mailpoetTrackingEnabled = (!!(window.mailpoet_tracking_enabled));
 
 const columns = [
   {
@@ -31,7 +31,7 @@ const columns = [
   {
     name: 'statistics',
     label: MailPoet.I18n.t('statistics'),
-    display: mailpoet_tracking_enabled,
+    display: mailpoetTrackingEnabled,
   },
   {
     name: 'sent_at',
@@ -39,12 +39,12 @@ const columns = [
   },
 ];
 
-let newsletter_actions = [
+let newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
       return (
-        <a href={ newsletter.preview_url } target="_blank">
+        <a href={newsletter.preview_url} target="_blank">
           {MailPoet.I18n.t('preview')}
         </a>
       );
@@ -52,10 +52,11 @@ let newsletter_actions = [
   },
 ];
 
-newsletter_actions = Hooks.applyFilters('mailpoet_newsletters_listings_notification_history_actions', newsletter_actions);
+Hooks.addFilter('mailpoet_newsletters_listings_notification_history_actions', StatisticsMixin.addStatsCTAAction);
+newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_notification_history_actions', newsletterActions);
 
 const NewsletterListNotificationHistory = React.createClass({
-  mixins: [ QueueMixin, StatisticsMixin, MailerMixin ],
+  mixins: [QueueMixin, StatisticsMixin, MailerMixin],
   renderItem: function (newsletter, actions, meta) {
     const rowClasses = classNames(
       'manage-column',
@@ -63,33 +64,31 @@ const NewsletterListNotificationHistory = React.createClass({
       'has-row-actions'
     );
 
-    const segments = newsletter.segments.map((segment) => {
+    const segments = newsletter.segments.map(segment => segment.name).join(', ');
-      return segment.name;
-    }).join(', ');
 
     return (
       <div>
-        <td className={ rowClasses }>
+        <td className={rowClasses}>
           <strong>
             <a
-              href={ newsletter.preview_url }
+              href={newsletter.preview_url}
               target="_blank"
             >{ newsletter.queue.newsletter_rendered_subject || newsletter.subject }</a>
           </strong>
           { actions }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('status') }>
+        <td className="column" data-colname={MailPoet.I18n.t('status')}>
           { this.renderQueueStatus(newsletter, meta.mta_log) }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('lists') }>
+        <td className="column" data-colname={MailPoet.I18n.t('lists')}>
           { segments }
         </td>
-        { (mailpoet_tracking_enabled === true) ? (
+        { (mailpoetTrackingEnabled === true) ? (
-          <td className="column" data-colname={ MailPoet.I18n.t('statistics') }>
+          <td className="column" data-colname={MailPoet.I18n.t('statistics')}>
             { this.renderStatistics(newsletter, undefined, meta.current_time) }
           </td>
         ) : null }
-        <td className="column-date" data-colname={ MailPoet.I18n.t('sentOn') }>
+        <td className="column-date" data-colname={MailPoet.I18n.t('sentOn')}>
           { (newsletter.sent_at) ? MailPoet.Date.format(newsletter.sent_at) : MailPoet.I18n.t('notSentYet') }
         </td>
       </div>
@@ -99,7 +98,7 @@ const NewsletterListNotificationHistory = React.createClass({
     return (
       <div>
         <h1 className="title">
-          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
+          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
         </h1>
 
         <ListingTabs tab="notification" />
@@ -110,19 +109,19 @@ const NewsletterListNotificationHistory = React.createClass({
         >{MailPoet.I18n.t('backToPostNotifications')}</Link>
 
         <Listing
-          limit={ window.mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
           endpoint="newsletters"
           type="notification_history"
           base_url="notification/history/:parent_id"
-          onRenderItem={ this.renderItem }
+          onRenderItem={this.renderItem}
           columns={columns}
-          item_actions={ newsletter_actions }
+          item_actions={newsletterActions}
-          auto_refresh={ true }
+          auto_refresh={true}
           sort_by="sent_at"
           sort_order="desc"
-          afterGetItems={ this.checkMailerStatus }
+          afterGetItems={this.checkMailerStatus}
         />
       </div>
     );

assets/js/src/newsletters/listings/standard.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router';
+import { confirmAlert } from 'react-confirm-alert';
 import classNames from 'classnames';
 import MailPoet from 'mailpoet';
 import Hooks from 'wp-js-hooks';
@@ -13,11 +14,11 @@ import {
   MailerMixin,
 } from 'newsletters/listings/mixins.jsx';
 
-const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
+const mailpoetTrackingEnabled = (!!(window.mailpoet_tracking_enabled));
 
 const messages = {
   onTrash: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -32,7 +33,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onDelete: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -47,7 +48,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onRestore: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -80,7 +81,7 @@ const columns = [
   {
     name: 'statistics',
     label: MailPoet.I18n.t('statistics'),
-    display: mailpoet_tracking_enabled,
+    display: mailpoetTrackingEnabled,
   },
   {
     name: 'sent_at',
@@ -89,7 +90,7 @@ const columns = [
   },
 ];
 
-const bulk_actions = [
+const bulkActions = [
   {
     name: 'trash',
     label: MailPoet.I18n.t('moveToTrash'),
@@ -98,22 +99,32 @@ const bulk_actions = [
 ];
 
 const confirmEdit = (newsletter) => {
-  if(
+  const redirectToEditing = () => {
+    window.location.href = `?page=mailpoet-newsletter-editor&id=${newsletter.id}`;
+  };
+  if (
     !newsletter.queue
-    || newsletter.status != 'sending'
+    || newsletter.status !== 'sending'
     || newsletter.queue.status !== null
-    || window.confirm(MailPoet.I18n.t('confirmEdit'))
   ) {
-    window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
+    redirectToEditing();
+  } else {
+    confirmAlert({
+      title: MailPoet.I18n.t('confirmTitle'),
+      message: MailPoet.I18n.t('confirmEdit'),
+      confirmLabel: MailPoet.I18n.t('confirmLabel'),
+      cancelLabel: MailPoet.I18n.t('cancelLabel'),
+      onConfirm: redirectToEditing,
+    });
   }
 };
 
-let newsletter_actions = [
+let newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
       return (
-        <a href={ newsletter.preview_url } target="_blank">
+        <a href={newsletter.preview_url} target="_blank">
           {MailPoet.I18n.t('preview')}
         </a>
       );
@@ -145,7 +156,7 @@ let newsletter_actions = [
       }).fail((response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map((error) => { return error.message; }),
+            response.errors.map(error => error.message),
             { scroll: true }
           );
         }
@@ -157,10 +168,11 @@ let newsletter_actions = [
   },
 ];
 
-newsletter_actions = Hooks.applyFilters('mailpoet_newsletters_listings_standard_actions', newsletter_actions);
+Hooks.addFilter('mailpoet_newsletters_listings_standard_actions', StatisticsMixin.addStatsCTAAction);
+newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_standard_actions', newsletterActions);
 
 const NewsletterListStandard = React.createClass({
-  mixins: [ QueueMixin, StatisticsMixin, MailerMixin ],
+  mixins: [QueueMixin, StatisticsMixin, MailerMixin],
   renderItem: function (newsletter, actions, meta) {
     const rowClasses = classNames(
       'manage-column',
@@ -168,13 +180,11 @@ const NewsletterListStandard = React.createClass({
       'has-row-actions'
     );
 
-    const segments = newsletter.segments.map((segment) => {
+    const segments = newsletter.segments.map(segment => segment.name).join(', ');
-      return segment.name;
-    }).join(', ');
 
     return (
       <div>
-        <td className={ rowClasses }>
+        <td className={rowClasses}>
           <strong>
             <a
               className="row-title"
@@ -184,18 +194,18 @@ const NewsletterListStandard = React.createClass({
           </strong>
           { actions }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('status') }>
+        <td className="column" data-colname={MailPoet.I18n.t('status')}>
           { this.renderQueueStatus(newsletter, meta.mta_log) }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('lists') }>
+        <td className="column" data-colname={MailPoet.I18n.t('lists')}>
           { segments }
         </td>
-        { (mailpoet_tracking_enabled === true) ? (
+        { (mailpoetTrackingEnabled === true) ? (
-          <td className="column" data-colname={ MailPoet.I18n.t('statistics') }>
+          <td className="column" data-colname={MailPoet.I18n.t('statistics')}>
             { this.renderStatistics(newsletter, undefined, meta.current_time) }
           </td>
         ) : null }
-        <td className="column-date" data-colname={ MailPoet.I18n.t('sentOn') }>
+        <td className="column-date" data-colname={MailPoet.I18n.t('sentOn')}>
           <abbr>{ (newsletter.sent_at) ? MailPoet.Date.format(newsletter.sent_at) : MailPoet.I18n.t('notSentYet') }</abbr>
         </td>
       </div>
@@ -210,6 +220,7 @@ const NewsletterListStandard = React.createClass({
             onClick={() => MailPoet.trackEvent('Emails > Add New',
               { 'MailPoet Free version': window.mailpoet_version }
             )}
+            data-automation-id="new_email"
           >
             {MailPoet.I18n.t('new')}
           </Link>
@@ -218,21 +229,21 @@ const NewsletterListStandard = React.createClass({
         <ListingTabs tab="standard" />
 
         <Listing
-          limit={ window.mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
           endpoint="newsletters"
           type="standard"
           base_url="standard"
           onRenderItem={this.renderItem}
           columns={columns}
-          bulk_actions={ bulk_actions }
+          bulk_actions={bulkActions}
-          item_actions={ newsletter_actions }
+          item_actions={newsletterActions}
-          messages={ messages }
+          messages={messages}
-          auto_refresh={ true }
+          auto_refresh={true}
           sort_by="sent_at"
           sort_order="desc"
-          afterGetItems={ this.checkMailerStatus }
+          afterGetItems={this.checkMailerStatus}
         />
       </div>
     );

assets/js/src/newsletters/listings/tabs.jsx

@@ -35,9 +35,9 @@ const ListingTabs = React.createClass({
 
       return (
         <Link
-          key={ 'tab-'+index }
+          key={`tab-${index}`}
-          className={ tabClasses }
+          className={tabClasses}
-          to={ tab.link }
+          to={tab.link}
           onClick={() => MailPoet.trackEvent(`Tab Emails > ${tab.name} clicked`,
             { 'MailPoet Free version': window.mailpoet_version }
           )}
@@ -46,7 +46,7 @@ const ListingTabs = React.createClass({
     });
 
     return (
-      <h2 className="nav-tab-wrapper">
+      <h2 className="nav-tab-wrapper" data-automation-id="newsletters_listing_tabs">
         { tabs }
       </h2>
     );

assets/js/src/newsletters/listings/welcome.jsx

@@ -11,13 +11,13 @@ import MailPoet from 'mailpoet';
 import _ from 'underscore';
 import Hooks from 'wp-js-hooks';
 
-const mailpoet_roles = window.mailpoet_roles || {};
+const mailpoetRoles = window.mailpoet_roles || {};
-const mailpoet_segments = window.mailpoet_segments || {};
+const mailpoetSegments = window.mailpoet_segments || {};
-const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
+const mailpoetTrackingEnabled = (!!(window.mailpoet_tracking_enabled));
 
 const messages = {
   onTrash: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -32,7 +32,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onDelete: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -47,7 +47,7 @@ const messages = {
     MailPoet.Notice.success(message);
   },
   onRestore: (response) => {
-    const count = ~~response.meta.count;
+    const count = Number(response.meta.count);
     let message = null;
 
     if (count === 1) {
@@ -81,7 +81,7 @@ const columns = [
   {
     name: 'statistics',
     label: MailPoet.I18n.t('statistics'),
-    display: mailpoet_tracking_enabled,
+    display: mailpoetTrackingEnabled,
   },
   {
     name: 'updated_at',
@@ -90,7 +90,7 @@ const columns = [
   },
 ];
 
-const bulk_actions = [
+const bulkActions = [
   {
     name: 'trash',
     label: MailPoet.I18n.t('moveToTrash'),
@@ -98,12 +98,12 @@ const bulk_actions = [
   },
 ];
 
-let newsletter_actions = [
+let newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
       return (
-        <a href={ newsletter.preview_url } target="_blank">
+        <a href={newsletter.preview_url} target="_blank">
           {MailPoet.I18n.t('preview')}
         </a>
       );
@@ -113,7 +113,7 @@ let newsletter_actions = [
     name: 'edit',
     link: function (newsletter) {
       return (
-        <a href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }>
+        <a href={`?page=mailpoet-newsletter-editor&id=${newsletter.id}`}>
           {MailPoet.I18n.t('edit')}
         </a>
       );
@@ -124,10 +124,11 @@ let newsletter_actions = [
   },
 ];
 
-newsletter_actions = Hooks.applyFilters('mailpoet_newsletters_listings_welcome_notification_actions', newsletter_actions);
+Hooks.addFilter('mailpoet_newsletters_listings_welcome_notification_actions', StatisticsMixin.addStatsCTAAction);
+newsletterActions = Hooks.applyFilters('mailpoet_newsletters_listings_welcome_notification_actions', newsletterActions);
 
 const NewsletterListWelcome = React.createClass({
-  mixins: [ StatisticsMixin, MailerMixin ],
+  mixins: [StatisticsMixin, MailerMixin],
   updateStatus: function (e) {
     // make the event persist so that we can still override the selected value
     // in the ajax callback
@@ -138,7 +139,7 @@ const NewsletterListWelcome = React.createClass({
       endpoint: 'newsletters',
       action: 'setStatus',
       data: {
-        id: ~~(e.target.getAttribute('data-id')),
+        id: Number(e.target.getAttribute('data-id')),
         status: e.target.value,
       },
     }).done((response) => {
@@ -155,7 +156,7 @@ const NewsletterListWelcome = React.createClass({
     });
   },
   renderStatus: function (newsletter) {
-    const total_sent = (
+    const totalSent = (
       MailPoet.I18n.t('sentToXSubscribers')
       .replace('%$1d', newsletter.total_sent.toLocaleString())
     );
@@ -164,21 +165,22 @@ const NewsletterListWelcome = React.createClass({
       <div>
         <p>
           <select
-            data-id={ newsletter.id }
+            data-id={newsletter.id}
-            defaultValue={ newsletter.status }
+            defaultValue={newsletter.status}
-            onChange={ this.updateStatus }
+            onChange={this.updateStatus}
           >
             <option value="active">{ MailPoet.I18n.t('active') }</option>
             <option value="draft">{ MailPoet.I18n.t('inactive') }</option>
           </select>
         </p>
-        <p>{ total_sent }</p>
+        <p>{ totalSent }</p>
       </div>
     );
   },
   renderSettings: function (newsletter) {
     let sendingEvent;
     let sendingDelay;
+    let segment;
 
     // set sending event
     switch (newsletter.options.event) {
@@ -188,16 +190,17 @@ const NewsletterListWelcome = React.createClass({
           sendingEvent = MailPoet.I18n.t('welcomeEventWPUserAnyRole');
         } else {
           sendingEvent = MailPoet.I18n.t('welcomeEventWPUserWithRole').replace(
-            '%$1s', mailpoet_roles[newsletter.options.role]
+            '%$1s', mailpoetRoles[newsletter.options.role]
           );
         }
         break;
 
-      case 'segment':
+      default:
         // get segment
-        const segment = _.find(mailpoet_segments, (segment) => {
+        segment = _.find(
-          return (~~(segment.id) === ~~(newsletter.options.segment));
+          mailpoetSegments,
-        });
+          seg => (Number(seg.id) === Number(newsletter.options.segment))
+        );
 
         if (segment === undefined) {
           return (
@@ -205,11 +208,11 @@ const NewsletterListWelcome = React.createClass({
               { MailPoet.I18n.t('sendingToSegmentsNotSpecified') }
             </span>
           );
-        } else {
+        }
-          sendingEvent = MailPoet.I18n.t('welcomeEventSegment').replace(
+        sendingEvent = MailPoet.I18n.t('welcomeEventSegment').replace(
             '%$1s', segment.name
           );
-        }
+
         break;
     }
 
@@ -234,8 +237,12 @@ const NewsletterListWelcome = React.createClass({
               '%$1d', newsletter.options.afterTimeNumber
             );
             break;
+
+          default:
+            sendingDelay = 'Invalid sending delay';
+            break;
         }
-        sendingEvent += ' [' + sendingDelay + ']';
+        sendingEvent += ` [${sendingDelay}]`;
       }
       // add a "period" at the end if we do have a sendingEvent
       sendingEvent += '.';
@@ -256,30 +263,30 @@ const NewsletterListWelcome = React.createClass({
 
     return (
       <div>
-        <td className={ rowClasses }>
+        <td className={rowClasses}>
           <strong>
             <a
               className="row-title"
-              href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }
+              href={`?page=mailpoet-newsletter-editor&id=${newsletter.id}`}
             >{ newsletter.subject }</a>
           </strong>
           { actions }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('status') }>
+        <td className="column" data-colname={MailPoet.I18n.t('status')}>
           { this.renderStatus(newsletter) }
         </td>
-        <td className="column" data-colname={ MailPoet.I18n.t('settings') }>
+        <td className="column" data-colname={MailPoet.I18n.t('settings')}>
           { this.renderSettings(newsletter) }
         </td>
-        { (mailpoet_tracking_enabled === true) ? (
+        { (mailpoetTrackingEnabled === true) ? (
-          <td className="column" data-colname={ MailPoet.I18n.t('statistics') }>
+          <td className="column" data-colname={MailPoet.I18n.t('statistics')}>
             { this.renderStatistics(
               newsletter,
               newsletter.total_sent > 0 && newsletter.statistics
             ) }
           </td>
         ) : null }
-        <td className="column-date" data-colname={ MailPoet.I18n.t('lastModifiedOn') }>
+        <td className="column-date" data-colname={MailPoet.I18n.t('lastModifiedOn')}>
           <abbr>{ MailPoet.Date.format(newsletter.updated_at) }</abbr>
         </td>
       </div>
@@ -289,27 +296,27 @@ const NewsletterListWelcome = React.createClass({
     return (
       <div>
         <h1 className="title">
-          { MailPoet.I18n.t('pageTitle') } <Link className="page-title-action" to="/new">{ MailPoet.I18n.t('new') }</Link>
+          { MailPoet.I18n.t('pageTitle') } <Link className="page-title-action" to="/new" data-automation-id="new_email">{ MailPoet.I18n.t('new') }</Link>
         </h1>
 
         <ListingTabs tab="welcome" />
 
         <Listing
-          limit={ window.mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
           endpoint="newsletters"
           type="welcome"
           base_url="welcome"
-          onRenderItem={ this.renderItem }
+          onRenderItem={this.renderItem}
-          columns={ columns }
+          columns={columns}
-          bulk_actions={ bulk_actions }
+          bulk_actions={bulkActions}
-          item_actions={ newsletter_actions }
+          item_actions={newsletterActions}
-          messages={ messages }
+          messages={messages}
-          auto_refresh={ true }
+          auto_refresh={true}
           sort_by="updated_at"
           sort_order="desc"
-          afterGetItems={ this.checkMailerStatus }
+          afterGetItems={this.checkMailerStatus}
         />
       </div>
     );