releasing 3.2.5

New poll [MAILPOET-1225]

.circleci/apache/mailpoet.loc.conf

@@ -1,6 +1,4 @@
-Listen 8080
-
-<VirtualHost *:8080>
+<VirtualHost *:80>
   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

@@ -81,6 +81,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 +95,9 @@ 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
   php7:
     working_directory: /home/circleci/mailpoet
     docker:
@@ -119,7 +120,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:
@@ -134,4 +166,5 @@ workflows:
     jobs:
       - qa_js_php5
       - php7
-      - acceptance_tests
+      - php7_multisite      
+      - acceptance_tests

.circleci/setup.bash

@@ -2,8 +2,11 @@
 
 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-src http://packages.dotdeb.org jessie all" | sudo tee -a /etc/apt/sources.list.d/dotdeb.list
 		wget -qO - http://www.dotdeb.org/dotdeb.gpg | sudo apt-key add -
@@ -15,34 +18,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
-	# TODO: Remove this line after PR gets merged and CircleCI env variables change
-	echo "WP_TEST_PATH=\"/home/circleci/mailpoet/wordpress\"" > .env
-}
+
+	# Activate plugin
+	if [[ $version == "php7_multisite" ]]; then
+	    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,11 +8,13 @@
     "ecmaVersion": 5
   },
   "rules": {
+    // Exceptions
+    "no-underscore-dangle": 0, // Backbone uses underscores, we cannot remove them
+    // Temporary
     "import/no-amd": 0,
     "prefer-arrow-callback": 0,
     "radix": 0,
     "no-alert": 0,
-    "block-scoped-var": 0,
     "guard-for-in": 0,
     "no-prototype-builtins": 0,
     "no-restricted-syntax": 0,
@@ -38,20 +40,9 @@
     "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,
-    "no-use-before-define": 0,
-    "one-var": 0,
-    "camelcase": 0,
-    "padded-blocks": 0,
     "strict": 0,
-    "vars-on-top": 0,
-    "no-var": 0,
-    "no-unused-vars": 0,
+    "space-infix-ops": 0,
     "object-shorthand": 0,
     "new-parens": 0,
     "eol-last": 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,
@@ -37,35 +41,8 @@
     "jsx-a11y/alt-text": 0,
     "func-names": 0,
     "object-shorthand": 0,
-    "no-bitwise": 0,
-    "arrow-body-style": 0,
-    "prefer-template": 0,
-    "default-case": 0,
-    "array-callback-return": 0,
-    "consistent-return": 0,
-    "import/extensions": 0,
-    "import/no-extraneous-dependencies": 0,
-    "camelcase": 0,
-    "eqeqeq": 0,
-    "no-lonely-if": 0,
-    "block-scoped-var": 0,
-    "no-extra-bind": 0,
-    "class-methods-use-this": 0,
-    "no-case-declarations": 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,
-    "padded-blocks": 0,
-    "no-underscore-dangle": 0
+    "space-unary-ops": 0,
+    "space-infix-ops": 0,
+    "no-irregular-whitespace": 0
   }
 }

.eslintrc.tests.json

@@ -8,25 +8,9 @@
     "ecmaVersion": 6
   },
   "rules": {
-    "import/no-amd": 0,
-    "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,
+    // Exceptions
     "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

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(
@@ -288,15 +302,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 = $plugin_data['Version'];
-    $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_version = $this->getPluginVersion('mailpoet.php');
+    $plugin_dist_name = 'mailpoet';
     $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 +430,9 @@ class RoboFile extends \Robo\Tasks {
     $dotenv->load();
   }
 
-  protected function loadWPFunctions() {
-    $this->loadEnv();
-    define('ABSPATH', getenv('WP_TEST_PATH') . '/');
-    define('WPINC', 'wp-includes');
-    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');
+  protected function getPluginVersion($file) {
+    $data = file_get_contents($file);
+    preg_match('/^[ \t*]*Version:(.*)$/mi', $data, $m);
+    return !empty($m[1]) ? trim($m[1]) : false;
   }
 }

assets/css/src/admin-global.styl

@@ -0,0 +1,15 @@
+@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;

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/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/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/ajax.js

@@ -2,11 +2,10 @@ 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)
       }
     ]
   };
@@ -54,21 +53,23 @@ define('ajax', ['mailpoet', 'jquery', 'underscore'], function (mp, jQuery, _) {
       };
     },
     request: function (method, options) {
-        // set options
+      var params;
+      var deferred;
+      // set options
       this.init(options);
 
-        // set request params
-      var params = this.getParams();
+      // set request params
+      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) {
           return (value !== null);
         });
       }
 
-        // ajax request
-      var deferred = jQuery.post(
+      // ajax request
+      deferred = jQuery.post(
           this.options.url,
           params,
           null,

assets/js/src/date.js

@@ -43,9 +43,10 @@ define('date',
       },
       format: function (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));
       },
@@ -71,7 +72,12 @@ define('date',
         });
       },
       convertFormat: function (format) {
-        var format_mappings = {
+        var replacements;
+        var convertedFormat;
+        var escapeToken;
+        var index;
+        var token;
+        var formatMappings = {
           date: {
             d: 'DD',
             D: 'ddd',
@@ -140,12 +146,11 @@ define('date',
 
         if (!format || format.length <= 0) return format;
 
-        var replacements = format_mappings['date'];
+        replacements = formatMappings['date'];
+        convertedFormat = [];
+        escapeToken = false;
 
-        var convertedFormat = [];
-        var escapeToken = false;
-
-        for (var index = 0, token = ''; format.charAt(index); index += 1) {
+        for (index = 0, token = ''; format.charAt(index); index += 1) {
           token = format.charAt(index);
           if (escapeToken === true) {
             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) => {
-          return (
-            <p key={'checkbox-' + index}>
-              <label>
-                <input
-                  ref="checkbox"
-                  type="checkbox"
-                  value="1"
-                  checked={isChecked}
-                  onChange={this.onValueChange}
-                  name={this.props.field.name}
+        (value, index) => (
+          <p key={`checkbox-${index}`}>
+            <label>
+              <input
+                ref="checkbox"
+                type="checkbox"
+                value="1"
+                checked={isChecked}
+                onChange={this.onValueChange}
+                name={this.props.field.name}
                 />
-                { this.props.field.values[value] }
-              </label>
-            </p>
-          );
-        }
+              { this.props.field.values[value] }
+            </label>
+          </p>
+          )
       );
 
       return (

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

@@ -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,
@@ -233,6 +238,9 @@ define([
               day={this.state.day}
               placeholder={this.props.field.day_placeholder}
             />);
+
+          default:
+            return <div>Invalid date type</div>;
         }
       });
 

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

@@ -32,7 +32,7 @@ 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);
       }
 
@@ -68,36 +68,37 @@ define([
         case 'reactComponent':
           field = (<data.field.component {...data} />);
           break;
+
+        default:
+          field = 'invalid';
+          break;
       }
 
       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) {
-        field = this.props.field.fields.map((subfield, index) => {
-          return this.renderField({
-            index: index,
-            field: subfield,
-            item: this.props.item,
-            onValueChange: this.props.onValueChange || false,
-          });
-        });
+      if (this.props.field.fields !== undefined) {
+        field = this.props.field.fields.map((subfield, index) => this.renderField({
+          index: index,
+          field: subfield,
+          item: this.props.item,
+          onValueChange: this.props.onValueChange || false,
+        }));
       } else {
         field = this.renderField(this.props);
       }
@@ -110,10 +111,10 @@ define([
       }
 
       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) => {
-          return (
-            <p key={'radio-' + index}>
-              <label>
-                <input
-                  type="radio"
-                  checked={selected_value === value}
-                  value={value}
-                  onChange={this.props.onValueChange}
-                  name={this.props.field.name} />
-                { this.props.field.values[value] }
-              </label>
-            </p>
-          );
-        }
+        (value, index) => (
+          <p key={`radio-${index}`}>
+            <label>
+              <input
+                type="radio"
+                checked={selectedValue === value}
+                value={value}
+                onChange={this.props.onValueChange}
+                name={this.props.field.name} />
+              { this.props.field.values[value] }
+            </label>
+          </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,27 +41,25 @@ const FormFieldSelect = React.createClass({
       keys = Object.keys(this.props.field.values);
     }
 
-    const options = keys.map(
-      (value, index) => {
-
-        if (filter !== false && filter(this.props.item, value) === false) {
-          return;
-        }
-
-        return (
+    const options = keys
+      .filter((value) => {
+        if (filter === false) return true;
+        return filter(this.props.item, value);
+      })
+      .map(
+        (value, index) => (
           <option
-            key={'option-' + index}
+            key={`option-${index}`}
             value={value}>
             { this.props.field.values[value] }
           </option>
-        );
-      }
-    );
+          )
+      );
 
     return (
       <select
         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]}
         onChange={this.props.onValueChange}
         {...this.props.field.validation}

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

@@ -26,7 +26,7 @@ define([
       return (this.state.select2 === true);
     },
     componentDidMount: function () {
-      if (this.allowMultipleValues()) {
+      if (this.allowMultipleValues() || this.props.field.forceSelect2) {
         this.setupSelect2();
       }
     },
@@ -35,19 +35,19 @@ define([
         (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()) {
-        jQuery('#' + this.refs.select.id).select2('destroy');
+        jQuery(`#${this.refs.select.id}`).select2('destroy');
       }
     },
     setupSelect2: function () {
@@ -55,18 +55,15 @@ define([
         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) {
             return null;
-          } else {
-            if (item.title) {
-              return item.title;
-            } else {
-              return item.text;
-            }
+          } else if (item.title) {
+            return item.title;
           }
+          return item.text;
         },
       });
 
@@ -86,14 +83,12 @@ define([
       this.setState({ select2: true });
     },
     getSelectedValues: function () {
-      if (this.props.field['selected'] !== undefined) {
-        return this.props.field['selected'](this.props.item);
+      if (this.props.field.selected !== undefined) {
+        return this.props.field.selected(this.props.item);
       } 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 item.id;
-            });
+            return this.props.item[this.props.field.name].map(item => 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 = window['mailpoet_' + this.props.field.endpoint];
+      let items;
+      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 (this.props.field['filter'] !== undefined) {
+      if (Array.isArray(items)) {
+        if (this.props.field.filter !== undefined) {
           items = items.filter(this.props.field.filter);
         }
 
@@ -119,7 +118,7 @@ define([
       let value;
       if (this.props.onValueChange !== undefined) {
         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,7 +174,7 @@ define([
 
         return (
           <option
-            key={'option-' + index}
+            key={`option-${index}`}
             value={value}
             title={searchLabel}
           >
@@ -186,7 +192,10 @@ define([
           multiple={this.props.field.multiple}
           defaultValue={this.getSelectedValues()}
           {...this.props.field.validation}
-        >{ options }</select>
+        >
+          { this.insertEmptyOption() }
+          { options }
+        </select>
       );
     },
   });

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

@@ -11,7 +11,7 @@ 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
         }
@@ -22,7 +22,7 @@ const FormFieldText = React.createClass({
           : false
         }
         name={this.props.field.name}
-        id={'field_' + this.props.field.name}
+        id={`field_${this.props.field.name}`}
         value={value}
         placeholder={this.props.field.placeholder}
         onChange={this.props.onValueChange}

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

@@ -11,7 +11,7 @@ define([
           type="text"
           className="regular-text"
           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]}
           placeholder={this.props.field.placeholder}
           defaultValue={this.props.field.defaultValue}

assets/js/src/form/form.jsx

@@ -15,7 +15,6 @@ define(
     FormField,
     jQuery
   ) => {
-
     const Form = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
@@ -44,7 +43,7 @@ define(
             this.loadItem(this.props.params.id);
           } else {
             this.setState({
-              item: jQuery('.mailpoet_form').serializeObject(),
+              item: jQuery('.mailpoet_form').mailpoetSerializeObject(),
             });
           }
         }
@@ -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,
@@ -100,9 +100,9 @@ define(
 
         // only get values from displayed fields
         const item = {};
-        this.props.fields.map((field) => {
-          if (field['fields'] !== undefined) {
-            field.fields.map((subfield) => {
+        this.props.fields.forEach((field) => {
+          if (field.fields !== undefined) {
+            field.fields.forEach((subfield) => {
               item[subfield.name] = this.state.item[subfield.name];
             });
           } else {
@@ -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) {
-          errors = this.getErrors().map((error, index) => {
-            return (
-              <p key={'error-' + index} className="mailpoet_error">
-                { error.message }
-              </p>
-            );
-          });
+          errors = this.getErrors().map((error, index) => (
+            <p key={`error-${index}`} className="mailpoet_error">
+              { error.message }
+            </p>
+            ));
         }
 
         const formClasses = classNames(
@@ -197,7 +194,7 @@ define(
               field={field}
               item={this.getValues()}
               onValueChange={onValueChange}
-              key={'field-' + i} />
+              key={`field-${i}`} />
           );
         });
 

assets/js/src/form_editor/form_editor.js

@@ -7,6 +7,31 @@
 
 'use strict';
 
+var Observable;
+var WysijaHistory;
+var WysijaForm;
+
+/* LOGGING */
+function info(value) {
+  if (WysijaForm.options.debug === false) return;
+
+  if (!(window.console && console.log)) {
+    (function () {
+      var noop = function () {};
+      var methods = ['assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', 'markTimeline', 'profile', 'profileEnd', 'markTimeline', 'table', 'time', 'timeEnd', 'timeStamp', 'trace', 'warn'];
+      var length = methods.length;
+      var console = {};
+      window.console = {};
+      while (length--) {
+        console[methods[length]] = noop;
+      }
+    }());
+  }
+  try {
+    console.log('[DEBUG] ' + value);
+  } catch (e) {}
+}
+
 Event.cacheDelegated = {};
 Object.extend(document, (function () {
   var cache = Event.cacheDelegated;
@@ -30,18 +55,21 @@ Object.extend(document, (function () {
   }
 
   function destroyWrapper(selector, eventName, handler) {
+    var wrapper;
     var c = getCacheForSelector(selector);
     if (!c[eventName]) return false;
-    var wrapper = findWrapper(selector, eventName, handler);
+    wrapper = findWrapper(selector, eventName, handler);
     c[eventName] = c[eventName].without(wrapper);
     return wrapper;
   }
 
   function createWrapper(selector, eventName, handler, context) {
-    var wrapper, c = getWrappersForSelector(selector, eventName);
+    var wrapper;
+    var element;
+    var c = getWrappersForSelector(selector, eventName);
     if (c.pluck('handler').include(handler)) return false;
     wrapper = function (event) {
-      var element = event.findElement(selector);
+      element = event.findElement(selector);
       if (element) handler.call(context || element, event, element);
     };
     wrapper.handler = handler;
@@ -49,31 +77,32 @@ Object.extend(document, (function () {
     return wrapper;
   }
   return {
-    delegate: function (selector, eventName, handler, context) {
+    delegate: function (selector, eventName) {
       var wrapper = createWrapper.apply(null, arguments);
       if (wrapper) document.observe(eventName, wrapper);
       return document;
     },
-    stopDelegating: function (selector, eventName, handler) {
+    stopDelegating: function (selector, eventName) {
       var length = arguments.length;
+      var wrapper;
       switch (length) {
         case 2:
-          getWrappersForSelector(selector, eventName).each(function (wrapper) {
-            document.stopDelegating(selector, eventName, wrapper.handler);
+          getWrappersForSelector(selector, eventName).each(function (selectorWrapper) {
+            document.stopDelegating(selector, eventName, selectorWrapper.handler);
           });
           break;
         case 1:
-          Object.keys(getCacheForSelector(selector)).each(function (eventName) {
-            document.stopDelegating(selector, eventName);
+          Object.keys(getCacheForSelector(selector)).each(function (event) {
+            document.stopDelegating(selector, event);
           });
           break;
         case 0:
-          Object.keys(cache).each(function (selector) {
-            document.stopDelegating(selector);
+          Object.keys(cache).each(function (cacheSelector) {
+            document.stopDelegating(cacheSelector);
           });
           break;
         default:
-          var wrapper = destroyWrapper.apply(null, arguments);
+          wrapper = destroyWrapper.apply(null, arguments);
           if (wrapper) document.stopObserving(eventName, wrapper);
       }
       return document;
@@ -81,16 +110,22 @@ Object.extend(document, (function () {
   };
 })());
 
-var Observable = (function () {
+Observable = (function () {
   function getEventName(nameA, namespace) {
     var name = nameA.substring(2);
     if (namespace) name = namespace + ':' + name;
     return name.underscore().split('_').join(':');
   }
 
+  function getWrapper(handler, klass) {
+    return function (event) {
+      return handler.call(new klass(this), event, event.memo);
+    };
+  }
+
   function getHandlers(klass) {
-    var proto = klass.prototype,
-      namespace = proto.namespace;
+    var proto = klass.prototype;
+    var namespace = proto.namespace;
     return Object.keys(proto).grep(/^on/).inject(window.$H(), function (handlers, name) {
       if (name === 'onDomLoaded') return handlers;
       handlers.set(getEventName(name, namespace), getWrapper(proto[name], klass));
@@ -98,12 +133,6 @@ var Observable = (function () {
     });
   }
 
-  function getWrapper(handler, klass) {
-    return function (event) {
-      return handler.call(new klass(this), event, event.memo);
-    };
-  }
-
   function onDomLoad(selector, klass) {
     window.$$(selector).each(function (element) {
       new klass(element).onDomLoaded();
@@ -111,9 +140,9 @@ var Observable = (function () {
   }
   return {
     observe: function (selector) {
+      var klass = this;
       if (!this.handlers) this.handlers = {};
       if (this.handlers[selector]) return;
-      var klass = this;
       if (this.prototype.onDomLoaded) {
         if (document.loaded) {
           onDomLoad(selector, klass);
@@ -146,10 +175,11 @@ Object.extend(window.Droppables, {
     return proceed(drop);
   }),
   show: function (point, element) {
+    var drop;
+    var affected = [];
     if (!this.drops.length) return;
-    var drop, affected = [];
-    this.drops.each(function (drop) {
-      if (window.Droppables.isAffected(point, element, drop)) affected.push(drop);
+    this.drops.each(function (dropsDrop) {
+      if (window.Droppables.isAffected(point, element, dropsDrop)) affected.push(dropsDrop);
     });
     if (affected.length > 0) drop = window.Droppables.findDeepestChild(affected);
     if (this.last_active && this.last_active !== drop) this.deactivate(this.last_active, element);
@@ -159,13 +189,13 @@ Object.extend(window.Droppables, {
       if (drop !== this.last_active) window.Droppables.activate(drop, element);
     }
   },
-  displayArea: function (draggable) {
+  displayArea: function () {
     if (!this.drops.length) return;
 
     // hide controls when displaying drop areas.
     WysijaForm.hideBlockControls();
 
-    this.drops.each(function (drop, iterator) {
+    this.drops.each(function (drop) {
       if (drop.element.hasClassName('block_placeholder')) {
         drop.element.addClassName('active');
       }
@@ -173,7 +203,7 @@ Object.extend(window.Droppables, {
   },
   hideArea: function () {
     if (!this.drops.length) return;
-    this.drops.each(function (drop, iterator) {
+    this.drops.each(function (drop) {
       if (drop.element.hasClassName('block_placeholder')) {
         drop.element.removeClassName('active');
       } else if (drop.element.hasClassName('image_placeholder')) {
@@ -195,7 +225,7 @@ Object.extend(window.Droppables, {
         - set a maximum number of items to be stored
 
 */
-var WysijaHistory = {
+WysijaHistory = {
   container: 'mailpoet_form_history',
   size: 30,
   enqueue: function (element) {
@@ -239,7 +269,7 @@ var WysijaHistory = {
 };
 
 /* MailPoet Form */
-var WysijaForm = {
+WysijaForm = {
   version: '0.7',
   options: {
     container: 'mailpoet_form_container',
@@ -276,8 +306,8 @@ var WysijaForm = {
     return str.replace(/&amp;/g, '&').replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&quot;/g, '"');
     // ": fix for FileMerge because the previous line fucks up its syntax coloring
   },
-  loading: function (is_loading) {
-    if (is_loading) {
+  loading: function (isLoading) {
+    if (isLoading) {
       window.$(WysijaForm.options.editor).addClassName('loading');
       window.$(WysijaForm.options.toolbar).addClassName('loading');
     } else {
@@ -292,6 +322,7 @@ var WysijaForm = {
     });
   },
   load: function (data) {
+    var settingsElements;
     if (data === undefined) return;
 
     // load body
@@ -302,8 +333,8 @@ var WysijaForm = {
       });
 
       // load settings
-      var settings_elements = window.$('mailpoet_form_settings').getElements();
-      settings_elements.each(function (setting) {
+      settingsElements = window.$('mailpoet_form_settings').getElements();
+      settingsElements.each(function (setting) {
         // skip lists
         if (setting.name === 'segments') {
           return true;
@@ -320,30 +351,31 @@ var WysijaForm = {
             setting.setValue(data.settings[setting.name]);
           }
         }
+        return true;
       });
     }
   },
   save: function () {
-    var position = 1,
-      data = {
-        name: window.$F('mailpoet_form_name'),
-        settings: window.$('mailpoet_form_settings').serialize(true),
-        body: [],
-        styles: (window.MailPoet.CodeEditor !== undefined) ? window.MailPoet.CodeEditor.getValue() : null
-      };
+    var position = 1;
+    var data = {
+      name: window.$F('mailpoet_form_name'),
+      settings: window.$('mailpoet_form_settings').serialize(true),
+      body: [],
+      styles: (window.MailPoet.CodeEditor !== undefined) ? window.MailPoet.CodeEditor.getValue() : null
+    };
     // body
     WysijaForm.getBlocks().each(function (b) {
-      var block_data = (typeof (b.block['save']) === 'function') ? b.block.save() : null;
+      var blockData = (typeof (b.block['save']) === 'function') ? b.block.save() : null;
 
-      if (block_data !== null) {
+      if (blockData !== null) {
         // set block position
-        block_data['position'] = position;
+        blockData['position'] = position;
 
         // increment position
         position++;
 
         // add block data to body
-        data['body'].push(block_data);
+        data['body'].push(blockData);
       }
     });
 
@@ -401,6 +433,7 @@ var WysijaForm = {
     return data;
   },
   toggleWidgets: function () {
+    var hasSegmentSelection;
     window.$$('a[wysija_unique="1"]').invoke('removeClassName', 'disabled');
 
     // loop through each unique field already inserted in the editor and disable its toolbar equivalent
@@ -411,7 +444,7 @@ var WysijaForm = {
       }
     });
 
-    var hasSegmentSelection = WysijaForm.hasSegmentSelection();
+    hasSegmentSelection = WysijaForm.hasSegmentSelection();
 
     if (hasSegmentSelection) {
       window.$('mailpoet_form_segments').writeAttribute('required', false).disable();
@@ -425,9 +458,10 @@ var WysijaForm = {
     return (window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]').length > 0);
   },
   isSegmentSelectionValid: function () {
-    var segment_selection = window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]')[0];
-    if (segment_selection !== undefined) {
-      var block = WysijaForm.get(segment_selection).block.getData();
+    var segmentSelection = window.$$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]')[0];
+    var block;
+    if (segmentSelection !== undefined) {
+      block = WysijaForm.get(segmentSelection).block.getData();
       return (
         (block.params.values !== undefined)
         &&
@@ -437,10 +471,12 @@ var WysijaForm = {
     return false;
   },
   setBlockPositions: function (event, target) {
+    var index = 1;
+    var blockPlaceholder;
+    var previousPlaceholder;
     // release dragging lock
     WysijaForm.locks.dragging = false;
 
-    var index = 1;
     WysijaForm.getBlocks().each(function (container) {
       container.setPosition(index++);
       // remove z-index value to avoid issues when resizing images
@@ -453,19 +489,19 @@ var WysijaForm = {
 
     if (target !== undefined) {
       // get placeholders (previous placeholder matches the placeholder linked to the next block)
-      var block_placeholder = window.$(target.element.readAttribute('wysija_placeholder')),
-        previous_placeholder = target.element.previous('.block_placeholder');
+      blockPlaceholder = window.$(target.element.readAttribute('wysija_placeholder'));
+      previousPlaceholder = target.element.previous('.block_placeholder');
 
-      if (block_placeholder !== null) {
+      if (blockPlaceholder !== null) {
         // put block placeholder before the current block
         target.element.insert({
-          before: block_placeholder
+          before: blockPlaceholder
         });
 
         // if the next block is a wysija_block, insert previous placeholder
-        if (target.element.next() !== undefined && target.element.next().hasClassName('mailpoet_form_block') && previous_placeholder !== undefined) {
+        if (target.element.next() !== undefined && target.element.next().hasClassName('mailpoet_form_block') && previousPlaceholder !== undefined) {
           target.element.insert({
-            after: previous_placeholder
+            after: previousPlaceholder
           });
         }
       }
@@ -479,23 +515,17 @@ var WysijaForm = {
   },
   setSettingsPosition: function () {
     // get viewport offsets and dimensions
-    var viewportHeight = document.viewport.getHeight(),
-      blockPadding = 5;
+    var viewportHeight = document.viewport.getHeight();
 
     window.$(WysijaForm.options.container).select('.wysija_settings').each(function (element) {
       // get parent dimensions and position
-      var parentDim = element.up('.mailpoet_form_block').getDimensions(),
-        parentPos = element.up('.mailpoet_form_block').cumulativeOffset(),
-        is_visible = (parentPos.top <= (WysijaForm.scroll.top + viewportHeight)),
-        buttonMargin = 5,
-        relativeTop = buttonMargin;
-
-      if (is_visible) {
-        // desired position is set to center of viewport
-        var absoluteTop = parseInt(WysijaForm.scroll.top + ((viewportHeight / 2) - (element.getHeight() / 2)), 10),
-          parentTop = parseInt(parentPos.top - blockPadding, 10),
-          parentBottom = parseInt(parentPos.top + parentDim.height - blockPadding, 10);
+      var parentDim = element.up('.mailpoet_form_block').getDimensions();
+      var parentPos = element.up('.mailpoet_form_block').cumulativeOffset();
+      var isVisible = (parentPos.top <= (WysijaForm.scroll.top + viewportHeight));
+      var buttonMargin = 5;
+      var relativeTop = buttonMargin;
 
+      if (isVisible) {
         // always center
         relativeTop = parseInt((parentDim.height / 2) - (element.getHeight() / 2), 10);
       }
@@ -516,12 +546,12 @@ var WysijaForm = {
       if (WysijaForm.toolbar.left === null) WysijaForm.toolbar.left = parseInt(window.$(WysijaForm.options.container).positionedOffset().left);
     }
     if (WysijaForm.toolbar.x === null) WysijaForm.toolbar.x = parseInt(WysijaForm.toolbar.left + window.$(WysijaForm.options.container).getDimensions().width + 15);
-
   },
   setToolbarPosition: function () {
+    var position;
     WysijaForm.initToolbarPosition();
 
-    var position = {
+    position = {
       top: WysijaForm.toolbar.y + 'px',
       visibility: 'visible'
     };
@@ -573,10 +603,8 @@ var WysijaForm = {
   },
   hideControls: function () {
     try {
-      return WysijaForm.getBlocks().invoke('hideControls');
-    } catch (e) {
-      return;
-    }
+      WysijaForm.getBlocks().invoke('hideControls');
+    } catch (e) {}
   },
   hideTools: function () {
     window.$$('.wysija_tools').invoke('hide');
@@ -585,10 +613,12 @@ var WysijaForm = {
   instances: {},
   get: function (element, typ) {
     var type = typ;
+    var id;
+    var instance;
     if (type === undefined) type = 'block';
     // identify element
-    var id = element.identify();
-    var instance = WysijaForm.instances[id] || new WysijaForm[type.capitalize().camelize()](id);
+    id = element.identify();
+    instance = WysijaForm.instances[id] || new WysijaForm[type.capitalize().camelize()](id);
 
     WysijaForm.instances[id] = instance;
     return instance;
@@ -636,8 +666,8 @@ var WysijaForm = {
   },
   encodeURIComponent: function (str) {
     // check if it's a url and if so, prevent encoding of protocol
-    var regexp = new RegExp(/^http[s]?:\/\//),
-      protocol = regexp.exec(str);
+    var regexp = new RegExp(/^http[s]?:\/\//);
+    var protocol = regexp.exec(str);
 
     if (protocol === null) {
       // this is not a url so encode the whole thing
@@ -646,6 +676,7 @@ var WysijaForm = {
       // this is a url, so do not encode the protocol
       return encodeURI(str).replace(/[!'()*]/g, escape);
     }
+    return str;
   },
   updateBlock: function (field) {
     var hasUpdated = false;
@@ -680,13 +711,13 @@ WysijaForm.DraggableItem = window.Class.create({
   },
   STYLES: new window.Template('position: absolute; top: #{top}px; left: #{left}px;'),
   cloneElement: function () {
-    var clone = this.element.clone(),
-      offset = this.element.cumulativeOffset(),
-      list = this.getList(),
-      styles = this.STYLES.evaluate({
-        top: offset.top - list.scrollTop,
-        left: offset.left - list.scrollLeft
-      });
+    var clone = this.element.clone();
+    var offset = this.element.cumulativeOffset();
+    var list = this.getList();
+    var styles = this.STYLES.evaluate({
+      top: offset.top - list.scrollTop,
+      left: offset.left - list.scrollLeft
+    });
     clone.setStyle(styles);
 
     clone.addClassName('mailpoet_form_widget');
@@ -767,27 +798,28 @@ WysijaForm.Block = window.Class.create({
     }
   },
   makeBlockDroppable: function () {
+    var blockPlaceholder;
     if (this.isBlockDroppableEnabled() === false) {
-      var block_placeholder = this.getBlockDroppable();
-      window.Droppables.add(block_placeholder.identify(), WysijaForm.blockDropOptions);
-      block_placeholder.addClassName('enabled');
+      blockPlaceholder = this.getBlockDroppable();
+      window.Droppables.add(blockPlaceholder.identify(), WysijaForm.blockDropOptions);
+      blockPlaceholder.addClassName('enabled');
     }
   },
   removeBlockDroppable: function () {
+    var blockPlaceholder;
     if (this.isBlockDroppableEnabled()) {
-      var block_placeholder = this.getBlockDroppable();
-      window.Droppables.remove(block_placeholder.identify());
-      block_placeholder.removeClassName('enabled');
+      blockPlaceholder = this.getBlockDroppable();
+      window.Droppables.remove(blockPlaceholder.identify());
+      blockPlaceholder.removeClassName('enabled');
     }
   },
   isBlockDroppableEnabled: function () {
     // if the block_placeholder does not exist, create it
-    var block_placeholder = this.getBlockDroppable();
-    if (block_placeholder === null) {
+    var blockPlaceholder = this.getBlockDroppable();
+    if (blockPlaceholder === null) {
       return this.createBlockDroppable().hasClassName('enabled');
-    } else {
-      return block_placeholder.hasClassName('enabled');
     }
+    return blockPlaceholder.hasClassName('enabled');
   },
   createBlockDroppable: function () {
     info('block -> createBlockDroppable');
@@ -799,14 +831,14 @@ WysijaForm.Block = window.Class.create({
   getBlockDroppable: function () {
     if (this.element.previous() === undefined || this.element.previous().hasClassName('block_placeholder') === false) {
       return null;
-    } else {
-      return this.element.previous();
     }
+    return this.element.previous();
   },
   getControls: function () {
     return this.element.down('.wysija_controls');
   },
   setupControls: function () {
+    var block;
     // enable controls
     this.controls = this.getControls();
 
@@ -857,9 +889,8 @@ WysijaForm.Block = window.Class.create({
       if (this.settingsButton !== null) {
         this.settingsButton.observe('click', function (event) {
           // TODO: refactor
-          var block = window.$(event.target).up('.mailpoet_form_block') || null;
+          block = window.$(event.target).up('.mailpoet_form_block') || null;
           if (block !== null) {
-            var field = WysijaForm.getFieldData(block);
             this.editSettings();
           }
         }.bind(this));
@@ -905,21 +936,26 @@ WysijaForm.Block = window.Class.create({
 /* Invoked on item dropped */
 WysijaForm.Block.create = function (createBlock, target) {
   var block = createBlock;
+  var body;
+  var blockTemplate;
+  var template;
+  var output;
+  var settingsSegments;
   if (window.$('form_template_' + block.type) === null) {
     return false;
   }
 
-  var body = window.$(WysijaForm.options.body),
-    block_template = window.Handlebars.compile(window.$('form_template_block').innerHTML),
-    template = window.Handlebars.compile(window.$('form_template_' + block.type).innerHTML),
-    output = '';
+  body = window.$(WysijaForm.options.body);
+  blockTemplate = window.Handlebars.compile(window.$('form_template_block').innerHTML);
+  template = window.Handlebars.compile(window.$('form_template_' + block.type).innerHTML);
+  output = '';
 
   if (block.type === 'segment') {
     if (block.params.values === undefined) {
-      var settings_segments = window.jQuery('#mailpoet_form_segments').val();
-      if (settings_segments !== null && settings_segments.length > 0) {
+      settingsSegments = window.jQuery('#mailpoet_form_segments').val();
+      if (settingsSegments !== null && settingsSegments.length > 0) {
         block.params.values = window.mailpoet_segments.filter(function (segment) {
-          return (settings_segments.indexOf(segment.id) !== -1);
+          return (settingsSegments.indexOf(segment.id) !== -1);
         });
       }
     }
@@ -927,7 +963,7 @@ WysijaForm.Block.create = function (createBlock, target) {
 
   // set block template (depending on the block type)
   block.template = template(block);
-  output = block_template(block);
+  output = blockTemplate(block);
 
   // check if the new block is unique and if there's already an instance
   // of it in the history. If so, remove its former instance from the history
@@ -936,14 +972,13 @@ WysijaForm.Block.create = function (createBlock, target) {
   }
 
   // if the drop target was the bottom placeholder
-  var element = null;
   if (target.identify() === 'block_placeholder') {
     // insert block at the bottom
-    element = body.insert(output);
+    body.insert(output);
     // block = body.childElements().last();
   } else {
     // insert block before the drop target
-    element = target.insert({
+    target.insert({
       before: output
     });
     // block = target.previous('.mailpoet_form_block');
@@ -956,6 +991,7 @@ WysijaForm.Block.create = function (createBlock, target) {
 
   // position settings
   WysijaForm.setSettingsPosition();
+  return true;
 };
 
 document.observe('wjfe:item:drop', function (event) {
@@ -984,8 +1020,8 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
     this.setupControls();
   },
   save: function () {
-    info('widget -> save');
     var data = this.getData();
+    info('widget -> save');
 
     if (data.element !== undefined) {
       delete data.element;
@@ -994,11 +1030,11 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
     return data;
   },
   setData: function (data) {
-    var current_data = this.getData(),
-      params = window.$H(current_data.params).merge(data.params).toObject();
+    var currentData = this.getData();
+    var params = window.$H(currentData.params).merge(data.params).toObject();
 
     // update type if it changed
-    if (data.type !== undefined && data.type !== current_data.type) {
+    if (data.type !== undefined && data.type !== currentData.type) {
       this.element.writeAttribute('wysija_type', data.type);
     }
 
@@ -1020,16 +1056,20 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
     this.removeBlock();
   },
   redraw: function (data) {
+    var options;
+    var blockTemplate;
+    var template;
+    var params;
     // set parameters
     this.setData(data);
-    var options = this.getData();
+    options = this.getData();
     // redraw block
-    var block_template = window.Handlebars.compile(window.$('form_template_block').innerHTML),
-      template = window.Handlebars.compile(window.$('form_template_' + options.type).innerHTML),
-      data = window.$H(options).merge({
-        template: template(options)
-      }).toObject();
-    this.element.replace(block_template(data));
+    blockTemplate = window.Handlebars.compile(window.$('form_template_block').innerHTML);
+    template = window.Handlebars.compile(window.$('form_template_' + options.type).innerHTML);
+    params = window.$H(options).merge({
+      template: template(options)
+    }).toObject();
+    this.element.replace(blockTemplate(params));
 
     WysijaForm.init();
   },
@@ -1039,7 +1079,7 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
       template: window.jQuery('#form_template_field_settings').html(),
       data: this.getData(),
       onSuccess: function () {
-        var data = window.jQuery('#form_field_settings').serializeObject();
+        var data = window.jQuery('#form_field_settings').mailpoetSerializeObject();
         this.redraw(data);
       }.bind(this)
     });
@@ -1052,25 +1092,4 @@ WysijaForm.Widget = window.Class.create(WysijaForm.Block, {
 /* When dom is loaded, initialize WysijaForm */
 document.observe('dom:loaded', WysijaForm.init);
 
-/* LOGGING */
-function info(value) {
-  if (WysijaForm.options.debug === false) return;
-
-  if (!(window.console && console.log)) {
-    (function () {
-      var noop = function () {};
-      var methods = ['assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', 'markTimeline', 'profile', 'profileEnd', 'markTimeline', 'table', 'time', 'timeEnd', 'timeStamp', 'trace', 'warn'];
-      var length = methods.length;
-      window.console = {};
-      var console = {};
-      while (length--) {
-        console[methods[length]] = noop;
-      }
-    }());
-  }
-  try {
-    console.log('[DEBUG] ' + value);
-  } catch (e) {}
-}
-
 module.exports = WysijaForm;

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,7 +81,7 @@ const bulk_actions = [
   },
 ];
 
-const item_actions = [
+const itemActions = [
   {
     name: 'edit',
     label: MailPoet.I18n.t('edit'),
@@ -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,32 +133,31 @@ 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) => {
-      return (jQuery.inArray(segment.id, form.segments) !== -1);
-    }).map((segment) => {
-      return segment.name;
-    }).join(', ');
+    let segments = window.mailpoet_segments
+      .filter(segment => (jQuery.inArray(segment.id, form.segments) !== -1))
+      .map(segment => segment.name)
+      .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"
@@ -199,8 +198,8 @@ const FormList = React.createClass({
           endpoint="forms"
           onRenderItem={this.renderItem}
           columns={columns}
-          bulk_actions={bulk_actions}
-          item_actions={item_actions}
+          bulk_actions={bulkActions}
+          item_actions={itemActions}
         />
       </div>
     );

assets/js/src/handlebars_helpers.js

@@ -1,34 +1,34 @@
 define('handlebars_helpers', ['handlebars'], function (Handlebars) {
   // Handlebars helpers
   Handlebars.registerHelper('concat', function () {
-    var size = (arguments.length - 1),
-      output = '';
-    for (var i = 0; i < size; i++) {
+    var size = (arguments.length - 1);
+    var output = '';
+    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) {
+    var f;
     if (window.moment) {
       if (timestamp === undefined || isNaN(timestamp) || timestamp <= 0) {
-        return;
+        return undefined;
       }
 
-          // set date format
-      var f = block.hash.format || 'MMM Do, YYYY';
-          // check if we passed a timestamp
+      // set date format
+      f = block.hash.format || 'MMM Do, YYYY';
+      // check if we passed a timestamp
       if (parseInt(timestamp, 10) == timestamp) {
         return window.moment.unix(timestamp).format(f);
-      } else {
-        return window.moment.utc(timestamp).format(f);
       }
-    } else {
-      return timestamp;
+      return window.moment.utc(timestamp).format(f);
     }
+    return timestamp;
   });
 
   Handlebars.registerHelper('cycle', function (value, block) {
@@ -59,25 +59,24 @@ 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;
@@ -86,20 +85,20 @@ define('handlebars_helpers', ['handlebars'], function (Handlebars) {
     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) {
-      // extract all lines into an array
+  Handlebars.registerHelper('rsa_key', function (value) {
+    var lines;
+    // 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,7 +108,7 @@ 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 '';
     return value.trim();
   });
@@ -126,15 +125,14 @@ 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) {

assets/js/src/help-tooltip.js

@@ -6,7 +6,6 @@ define('helpTooltip', ['mailpoet', 'react', 'react-dom', 'help-tooltip.jsx'],
 
     MailPoet.helpTooltip = {
       show: function (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/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 });
 
@@ -17,16 +18,15 @@ const App = React.createClass({
 const container = document.getElementById('help_container');
 
 if (container) {
-
   ReactDOM.render((
     <Router history={history}>
       <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="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) => {
-      return `${key}: ${data[key]}`;
-    });
+    const printableData = Object.keys(data).map(key => `${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() {
-  const data = window.help_scout_data;
+function SystemInfo() {
+  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',
-    label: MailPoet.I18n.t('tabKnowledgeBaseTitle'),
-    link: '/knowledgeBase',
+    name: 'systemStatus',
+    label: MailPoet.I18n.t('tabSystemStatusTitle'),
+    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,7 +30,7 @@ function Tabs(props) {
 
     return (
       <Link
-        key={'tab-' + index}
+        key={`tab-${index}`}
         className={tabClasses}
         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

@@ -21,5 +21,4 @@ define('i18n',
         return translations;
       }
     };
-
   });

assets/js/src/jquery.serialize_object.js

@@ -23,47 +23,47 @@ define(
      * Dual licensed under the MIT and GPL licenses.
      * http://benalman.com/about/license/
      */
-    $.fn.serializeObject = function (coerce) {
-      var obj = {},
-        coerce_types = { true: !0, false: !1, null: null };
+    $.fn.mailpoetSerializeObject = function (coerce) {
+      var obj = {};
+      var coerceTypes = { true: !0, false: !1, null: null };
 
       // Iterate over all name=value pairs.
       $.each(this.serializeArray(), function (j, v) {
-        var key = v.name,
-          val = v.value,
-          cur = obj,
-          i = 0,
+        var key = v.name;
+        var val = v.value;
+        var cur = obj;
+        var i = 0;
 
-          // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
-          // into its component parts.
-          keys = key.split(']['),
-          keys_last = keys.length - 1;
+        // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+        // into its component parts.
+        var keys = key.split('][');
+        var keysLast = keys.length - 1;
 
         // If the first keys part contains [ and the last ends with ], then []
         // are correctly balanced.
-        if (/\[/.test(keys[0]) && /\]$/.test(keys[keys_last])) {
+        if (/\[/.test(keys[0]) && /\]$/.test(keys[keysLast])) {
           // Remove the trailing ] from the last keys part.
-          keys[keys_last] = keys[keys_last].replace(/\]$/, '');
+          keys[keysLast] = keys[keysLast].replace(/\]$/, '');
 
           // Split first keys part into two parts on the [ and add them back onto
           // the beginning of the keys array.
           keys = keys.shift().split('[').concat(keys);
 
-          keys_last = keys.length - 1;
+          keysLast = keys.length - 1;
         } else {
           // Basic 'foo' style key.
-          keys_last = 0;
+          keysLast = 0;
         }
 
         // Coerce values.
         if (coerce) {
           val = val && !isNaN(val) ? +val              // number
             : val === 'undefined' ? undefined         // undefined
-            : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
+            : coerceTypes[val] !== undefined ? coerceTypes[val] // true, false, null
             : val;                                                // string
         }
 
-        if (keys_last) {
+        if (keysLast) {
           // Complex key, build deep object structure based on a few rules:
           // * The 'cur' pointer starts at the object top-level.
           // * [] = array push (n is set to array length), [n] = array if n is
@@ -73,14 +73,13 @@ define(
           //   object or array based on the type of the next keys part.
           // * Move the 'cur' pointer to the next level.
           // * Rinse & repeat.
-          for (; i <= keys_last; i++) {
+          for (; i <= keysLast; i++) {
             key = keys[i] === '' ? cur.length : keys[i];
-            cur[key] = i < keys_last
+            cur[key] = i < keysLast
               ? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
               : val;
             cur = cur[key];
           }
-
         } else {
           // Simple key, even simpler rules, since only scalars and shallow
           // arrays are allowed.
@@ -88,12 +87,10 @@ define(
           if ($.isArray(obj[key])) {
             // val is already an array, so push on the next value.
             obj[key].push(val);
-
           } 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];
-
           } 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),
           });
@@ -37,23 +37,23 @@ define([
         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) {
-        const promise = this.props.onBulkAction(selected_ids, data);
+        const promise = this.props.onBulkAction(selectedIds, data);
         if (promise !== false) {
           promise.then(onSuccess);
         }
@@ -65,11 +65,9 @@ define([
       });
     },
     getSelectedAction: function () {
-      const selected_action = this.refs.action.value;
-      if (selected_action.length > 0) {
-        const action = this.props.bulk_actions.filter((action) => {
-          return (action.name === selected_action);
-        });
+      const selectedAction = this.refs.action.value;
+      if (selectedAction.length > 0) {
+        const action = this.props.bulk_actions.filter(act => (act.name === selectedAction));
 
         if (action.length > 0) {
           return action[0];
@@ -97,14 +95,12 @@ define([
             onChange={this.handleChangeAction}
           >
             <option value="">{MailPoet.I18n.t('bulkActions')}</option>
-            { this.props.bulk_actions.map((action, index) => {
-              return (
-                <option
-                  value={action.name}
-                  key={'action-' + index}
+            { this.props.bulk_actions.map((action, index) => (
+              <option
+                value={action.name}
+                key={`action-${index}`}
                 >{ action.label }</option>
-              );
-            }) }
+              )) }
           </select>
           <input
             onClick={this.handleApplyAction}

assets/js/src/listing/filters.jsx

@@ -11,8 +11,8 @@ define([
   const ListingFilters = React.createClass({
     handleFilterAction: function () {
       const filters = {};
-      this.getAvailableFilters().map((filter, i) => {
-        filters[this.refs['filter-' + i].name] = this.refs['filter-' + i].value;
+      this.getAvailableFilters().forEach((filter, i) => {
+        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 !(
+      return Object.keys(filters).filter(filter => !(
           filters[filter].length === 0
           || (
             filters[filter].length === 1
             && !filters[filter][0].value
           )
-        );
-      });
+        ));
     },
     componentDidUpdate: function () {
-      const selected_filters = this.props.filter;
-      this.getAvailableFilters().map(
+      const selectedFilters = this.props.filter;
+      this.getAvailableFilters().forEach(
         (filter, i) => {
-          if (selected_filters[filter] !== undefined && selected_filters[filter]) {
-            jQuery(this.refs['filter-' + i])
-              .val(selected_filters[filter])
+          if (selectedFilters[filter] !== undefined && selectedFilters[filter]) {
+            jQuery(this.refs[`filter-${i}`])
+              .val(selectedFilters[filter])
               .trigger('change');
           }
         }
@@ -48,29 +46,25 @@ define([
     },
     render: function () {
       const filters = this.props.filters;
-      const available_filters = this.getAvailableFilters()
-        .map((filter, i) => {
-          return (
-            <select
-              ref={`filter-${i}`}
-              key={`filter-${i}`}
-              name={filter}
+      const availableFilters = this.getAvailableFilters()
+        .map((filter, i) => (
+          <select
+            ref={`filter-${i}`}
+            key={`filter-${i}`}
+            name={filter}
             >
-              { filters[filter].map((option, j) => {
-                return (
-                  <option
-                    value={option.value}
-                    key={'filter-option-' + j}
+            { filters[filter].map((option, j) => (
+              <option
+                value={option.value}
+                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"
@@ -81,9 +75,9 @@ define([
         );
       }
 
-      let empty_trash;
+      let emptyTrash;
       if (this.props.group === 'trash') {
-        empty_trash = (
+        emptyTrash = (
           <input
             onClick={this.handleEmptyTrash}
             type="submit"
@@ -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,5 +1,4 @@
 define(['react', 'classnames'], (React, classNames) => {
-
   const ListingGroups = React.createClass({
     handleSelect: function (group) {
       return this.props.onSelectGroup(group);

assets/js/src/listing/header.jsx

@@ -19,7 +19,7 @@ const ListingHeader = React.createClass({
         <ListingColumn
           onSort={this.props.onSort}
           sort_by={this.props.sort_by}
-          key={'column-' + index}
+          key={`column-${index}`}
           column={renderColumn} />
       );
     });
@@ -54,9 +54,9 @@ const ListingHeader = React.createClass({
 
 const ListingColumn = React.createClass({
   handleSort: function () {
-    const sort_by = this.props.column.name;
-    const sort_order = (this.props.column.sorted === 'asc') ? 'desc' : 'asc';
-    this.props.onSort(sort_by, sort_order);
+    const sortBy = this.props.column.name;
+    const sortOrder = (this.props.column.sorted === 'asc') ? 'desc' : 'asc';
+    this.props.onSort(sortBy, sortOrder);
   },
   render: function () {
     const classes = classNames(

assets/js/src/listing/listing.jsx

@@ -44,7 +44,7 @@ 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"
@@ -58,24 +58,20 @@ const ListingItem = React.createClass({
       );
     }
 
-    const custom_actions = this.props.item_actions;
-    let item_actions = false;
+    const customActions = this.props.item_actions;
+    let itemActions = false;
 
-    if (custom_actions.length > 0) {
-      let is_first = true;
-      item_actions = custom_actions.map((action, index) => {
-        if (action.display !== undefined) {
-          if (action.display(this.props.item) === false) {
-            return;
-          }
-        }
-
-        let custom_action = null;
+    if (customActions.length > 0) {
+      let isFirst = true;
+      itemActions = customActions
+      .filter(action => action.display === undefined || action.display(this.props.item))
+      .map((action, index) => {
+        let customAction = null;
 
         if (action.name === 'trash') {
-          custom_action = (
-            <span key={'action-' + index} className="trash">
-              {(!is_first) ? ' | ' : ''}
+          customAction = (
+            <span key={`action-${index}`} className="trash">
+              {(!isFirst) ? ' | ' : ''}
               <a
                 href="javascript:;"
                 onClick={this.handleTrashItem.bind(
@@ -87,27 +83,27 @@ const ListingItem = React.createClass({
             </span>
           );
         } else if (action.refresh) {
-          custom_action = (
+          customAction = (
             <span
               onClick={this.props.onRefreshItems}
-              key={'action-' + index} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              key={`action-${index}`} className={action.name}>
+              {(!isFirst) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
           );
         } else if (action.link) {
-          custom_action = (
+          customAction = (
             <span
-              key={'action-' + index} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              key={`action-${index}`} className={action.name}>
+              {(!isFirst) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
           );
         } else {
-          custom_action = (
+          customAction = (
             <span
-              key={'action-' + index} className={action.name}>
-              {(!is_first) ? ' | ' : ''}
+              key={`action-${index}`} className={action.name}>
+              {(!isFirst) ? ' | ' : ''}
               <a href="javascript:;" onClick={
                 (action.onClick !== undefined)
                 ? action.onClick.bind(null,
@@ -120,14 +116,14 @@ const ListingItem = React.createClass({
           );
         }
 
-        if (custom_action !== null && is_first === true) {
-          is_first = false;
+        if (customAction !== null && isFirst === true) {
+          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>
         </span>
@@ -172,7 +168,7 @@ const ListingItem = React.createClass({
       actions = (
         <div>
           <div className="row-actions">
-            { item_actions }
+            { itemActions }
           </div>
           <button
             onClick={this.handleToggleItem.bind(null, this.props.item.id)}
@@ -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 (
-        <tbody>
-          <tr className={select_all_classes}>
-            <td colSpan={
+    return (
+      <tbody>
+        <tr className={selectAllClasses}>
+          <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
-                onClick={this.props.onSelectAll}
-                href="javascript:;">{
+            <a
+              onClick={this.props.onSelectAll}
+              href="javascript:;">{
                   (this.props.selection !== 'all')
                   ? MailPoet.I18n.t('selectAllLink')
                   : MailPoet.I18n.t('clearSelection')
                 }</a>
-            </td>
-          </tr>
+          </td>
+        </tr>
 
-          {this.props.items.map((item, index) => {
-            const renderItem = item;
-            renderItem.id = parseInt(item.id, 10);
-            renderItem.selected = (this.props.selected_ids.indexOf(renderItem.id) !== -1);
+        {this.props.items.map((item, index) => {
+          const renderItem = item;
+          renderItem.id = parseInt(item.id, 10);
+          renderItem.selected = (this.props.selected_ids.indexOf(renderItem.id) !== -1);
 
-            return (
-              <ListingItem
-                columns={this.props.columns}
-                onSelectItem={this.props.onSelectItem}
-                onRenderItem={this.props.onRenderItem}
-                onDeleteItem={this.props.onDeleteItem}
-                onRestoreItem={this.props.onRestoreItem}
-                onTrashItem={this.props.onTrashItem}
-                onRefreshItems={this.props.onRefreshItems}
-                selection={this.props.selection}
-                is_selectable={this.props.is_selectable}
-                item_actions={this.props.item_actions}
-                group={this.props.group}
-                key={`item-${renderItem.id}-${index}`}
-                item={renderItem} />
-            );
-          })}
-        </tbody>
-      );
-    }
+          return (
+            <ListingItem
+              columns={this.props.columns}
+              onSelectItem={this.props.onSelectItem}
+              onRenderItem={this.props.onRenderItem}
+              onDeleteItem={this.props.onDeleteItem}
+              onRestoreItem={this.props.onRestoreItem}
+              onTrashItem={this.props.onTrashItem}
+              onRefreshItems={this.props.onRefreshItems}
+              selection={this.props.selection}
+              is_selectable={this.props.is_selectable}
+              item_actions={this.props.item_actions}
+              group={this.props.group}
+              key={`item-${renderItem.id}-${index}`}
+              item={renderItem} />
+          );
+        })}
+      </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);
+        const filters = {};
         switch (key) {
           case 'filter':
-            const filters = {};
-            value.split('&').map((pair) => {
+            value.split('&').forEach((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) => {
-          return (
+        .filter(key => (
             [
               '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();
           }
-
-          if (value !== '' && value !== null) {
-            return `${key}[${value}]`;
-          }
+          return {
+            key,
+            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) {
-      base_url = this.setBaseUrlParams(base_url);
-      return `/${base_url}/${params}`;
-    } else {
-      return `/${params}`;
+    if (baseUrl !== null) {
+      baseUrl = this.setBaseUrlParams(baseUrl);
+      return `/${baseUrl}/${params}`;
     }
+    return `/${params}`;
   },
-  setBaseUrlParams: function (base_url) {
-    let ret = base_url;
+  setBaseUrlParams: function (baseUrl) {
+    let ret = baseUrl;
     if (ret.indexOf(':') !== -1) {
       const params = this.getParams();
-      Object.keys(params).map((key) => {
-        if (ret.indexOf(':' + key) !== -1) {
-          ret = ret.replace(':' + key, params[key]);
+      Object.keys(params).forEach((key) => {
+        if (ret.indexOf(`:${key}`) !== -1) {
+          ret = ret.replace(`:${key}`, params[key]);
         }
       });
     }
@@ -491,7 +483,7 @@ const Listing = 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 }
           );
         }
@@ -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') {
-      data.listing.selection = selected_ids;
+    if (selectedIds !== 'all') {
+      data.listing.selection = selectedIds;
     }
 
     return MailPoet.Ajax.post({
@@ -633,7 +625,7 @@ const Listing = 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 }
         );
       }
@@ -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_order: (sort_order === 'asc') ? 'asc' : 'desc',
+      sort_by: sortBy,
+      sort_order: (sortOrder === 'asc') ? 'asc' : 'desc',
     }, () => {
       this.setParams();
     });
   },
-  handleSelectItem: function (id, is_checked) {
-    let selected_ids = this.state.selected_ids,
-      selection = false;
+  handleSelectItem: function (id, isChecked) {
+    let selectedIds = this.state.selected_ids;
+    let selection = false;
 
-    if (is_checked) {
-      selected_ids = jQuery.merge(selected_ids, [id]);
+    if (isChecked) {
+      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) {
-    if (is_checked === false) {
+  handleSelectItems: function (isChecked) {
+    if (isChecked === false) {
       this.clearSelection();
     } else {
-      const selected_ids = this.state.items.map((item) => {
-        return ~~item.id;
-      });
+      const selectedIds = this.state.items.map(item => Number(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 sort_order = this.state.sort_order;
+    const sortBy = this.state.sort_by;
+    const sortOrder = this.state.sort_order;
 
     // columns
     let columns = this.props.columns || [];
-    columns = columns.filter((column) => {
-      return (column.display === undefined || !!(column.display) === true);
-    });
+    columns = columns.filter(
+      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) {
-      bulk_actions = [
+    if (this.state.group === 'trash' && bulkActions.length > 0) {
+      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',
@@ -822,7 +812,7 @@ const Listing = React.createClass({
         <div className="tablenav top clearfix">
           <ListingBulkActions
             count={this.state.count}
-            bulk_actions={bulk_actions}
+            bulk_actions={bulkActions}
             selection={this.state.selection}
             selected_ids={this.state.selected_ids}
             onBulkAction={this.handleBulkAction} />
@@ -840,16 +830,16 @@ const Listing = React.createClass({
             limit={this.state.limit}
             onSetPage={this.handleSetPage} />
         </div>
-        <table className={table_classes}>
+        <table className={tableClasses}>
           <thead>
             <ListingHeader
               onSort={this.handleSort}
               onSelectItems={this.handleSelectItems}
               selection={this.state.selection}
-              sort_by={sort_by}
-              sort_order={sort_order}
+              sort_by={sortBy}
+              sort_order={sortOrder}
               columns={columns}
-              is_selectable={bulk_actions.length > 0} />
+              is_selectable={bulkActions.length > 0} />
           </thead>
 
           <ListingItems
@@ -859,7 +849,7 @@ const Listing = React.createClass({
             onTrashItem={this.handleTrashItem}
             onRefreshItems={this.handleRefreshItems}
             columns={columns}
-            is_selectable={bulk_actions.length > 0}
+            is_selectable={bulkActions.length > 0}
             onSelectItem={this.handleSelectItem}
             onSelectAll={this.handleSelectAll}
             selection={this.state.selection}
@@ -868,7 +858,7 @@ const Listing = React.createClass({
             group={this.state.group}
             count={this.state.count}
             limit={this.state.limit}
-            item_actions={item_actions}
+            item_actions={itemActions}
             messages={messages}
             items={items} />
 
@@ -877,17 +867,17 @@ const Listing = React.createClass({
               onSort={this.handleSort}
               onSelectItems={this.handleSelectItems}
               selection={this.state.selection}
-              sort_by={sort_by}
-              sort_order={sort_order}
+              sort_by={sortBy}
+              sort_order={sortOrder}
               columns={columns}
-              is_selectable={bulk_actions.length > 0} />
+              is_selectable={bulkActions.length > 0} />
           </tfoot>
 
         </table>
         <div className="tablenav bottom">
           <ListingBulkActions
             count={this.state.count}
-            bulk_actions={bulk_actions}
+            bulk_actions={bulkActions}
             selection={this.state.selection}
             selected_ids={this.state.selected_ids}
             onBulkAction={this.handleBulkAction} />

assets/js/src/listing/pages.jsx

@@ -7,7 +7,6 @@ define([
     classNames,
     MailPoet
   ) => {
-
   const ListingPages = React.createClass({
     getInitialState: function () {
       return {
@@ -38,7 +37,7 @@ 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) {
@@ -59,125 +58,124 @@ define([
     render: function () {
       if (this.props.count === 0) {
         return false;
-      } else {
-        let pagination = false;
-        let firstPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">«</span>
+      }
+      let pagination = false;
+      let firstPage = (
+        <span aria-hidden="true" className="tablenav-pages-navspan">«</span>
         );
-        let previousPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">‹</span>
+      let previousPage = (
+        <span aria-hidden="true" className="tablenav-pages-navspan">‹</span>
         );
-        let nextPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">›</span>
+      let nextPage = (
+        <span aria-hidden="true" className="tablenav-pages-navspan">›</span>
         );
-        let lastPage = (
-          <span aria-hidden="true" className="tablenav-pages-navspan">»</span>
+      let lastPage = (
+        <span aria-hidden="true" className="tablenav-pages-navspan">»</span>
         );
 
-        if (this.props.limit > 0 && this.props.count > this.props.limit) {
-          if (this.props.page > 1) {
-            previousPage = (
-              <a href="javascript:;"
-                onClick={this.setPreviousPage}
-                className="prev-page">
-                <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
-                <span aria-hidden="true">‹</span>
-              </a>
+      if (this.props.limit > 0 && this.props.count > this.props.limit) {
+        if (this.props.page > 1) {
+          previousPage = (
+            <a href="javascript:;"
+              onClick={this.setPreviousPage}
+              className="prev-page">
+              <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
+              <span aria-hidden="true">‹</span>
+            </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;
-        if (this.props.count == 1) {
-          numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsSingular');
-        } else {
-          numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsMultiple')
+      let numberOfItemsLabel;
+      if (Number(this.props.count) === 1) {
+        numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsSingular');
+      } else {
+        numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsMultiple')
             .replace('%$1d', this.props.count.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,12 +5,11 @@ 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) {
@@ -19,27 +18,26 @@ define([
     render: function () {
       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/modal.js

@@ -111,11 +111,11 @@ define('modal', ['mailpoet', 'jquery'],
       compileTemplate: function (template) {
         if (this.renderer === 'html') {
           return function () { return template; };
-        } else {
-          return window.Handlebars.compile(template);
         }
+        return window.Handlebars.compile(template);
       },
       init: function (options) {
+        var modal;
         if (this.initialized === true) {
           this.close();
         }
@@ -134,7 +134,7 @@ define('modal', ['mailpoet', 'jquery'],
         if (this.options.type !== null) {
           // insert modal depending on its type
           if (this.options.type === 'popup') {
-            var modal = this.compileTemplate(
+            modal = this.compileTemplate(
               this.templates[this.options.type]
             );
             // create modal
@@ -178,7 +178,7 @@ define('modal', ['mailpoet', 'jquery'],
 
         return this;
       },
-      initOverlay: function (toggle) {
+      initOverlay: function () {
         if (jQuery('#mailpoet_modal_overlay').length === 0) {
             // insert overlay into the DOM
           jQuery('body').append(this.templates.overlay);
@@ -214,6 +214,7 @@ define('modal', ['mailpoet', 'jquery'],
         jQuery(document).on('keyup.mailpoet_modal', function (e) {
           if (this.opened === false) { return false; }
           if (e.keyCode === 27) { this.cancel(); }
+          return true;
         }.bind(this));
 
         // make sure the popup is repositioned when the window is resized
@@ -343,20 +344,21 @@ define('modal', ['mailpoet', 'jquery'],
         return this;
       },
       setPosition: function () {
+        var screenWidth;
+        var screenHeight;
+        var modalWidth;
+        var modalHeight;
         switch (this.options.type) {
           case 'popup':
-            var screenWidth = jQuery(window).width(),
-              screenHeight = jQuery(window).height(),
-              modalWidth = jQuery('.mailpoet_' + this.options.type + '_wrapper').width(),
-              modalHeight = jQuery('.mailpoet_' + this.options.type + '_wrapper').height();
+            screenWidth = jQuery(window).width();
+            screenHeight = jQuery(window).height();
+            modalWidth = jQuery('.mailpoet_'+ this.options.type +'_wrapper').width();
+            modalHeight = jQuery('.mailpoet_'+ this.options.type +'_wrapper').height();
 
-            var top = Math.max(48, parseInt((screenHeight / 2) - (modalHeight / 2))),
-              left = Math.max(0, parseInt((screenWidth / 2) - (modalWidth / 2)));
-
-              // set position of popup depending on screen dimensions.
+            // set position of popup depending on screen dimensions.
             jQuery('#mailpoet_popup').css({
-              top: top,
-              left: left
+              top: Math.max(48, parseInt((screenHeight / 2) - (modalHeight / 2))),
+              left: Math.max(0, parseInt((screenWidth / 2) - (modalWidth / 2)))
             });
             break;
           case 'panel':
@@ -384,9 +386,6 @@ define('modal', ['mailpoet', 'jquery'],
           // 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();
 
@@ -436,7 +435,7 @@ define('modal', ['mailpoet', 'jquery'],
             .removeClass('mailpoet_modal_highlight');
         return this;
       },
-      hideModal: function (callback) {
+      hideModal: function () {
           // set modal as closed
         this.opened = false;
 
@@ -446,12 +445,9 @@ define('modal', ['mailpoet', 'jquery'],
            // 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;
       },

assets/js/src/mp2migrator.js

@@ -41,7 +41,6 @@ define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
             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 () {
@@ -206,5 +205,4 @@ define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
     // Update the display
     MailPoet.MP2Migrator.updateDisplay();
   });
-
 });

assets/js/src/newsletter_editor/App.js

@@ -1,12 +1,8 @@
 define([
   'backbone',
   'backbone.marionette',
-  'backbone.radio',
-  'jquery',
-  'underscore',
-  'handlebars',
-  'handlebars_helpers'
-], function (Backbone, Marionette, BackboneRadio, jQuery, _, Handlebars) {
+  'backbone.radio'
+], function (Backbone, Marionette, BackboneRadio) {
   var Radio = BackboneRadio;
 
   var AppView = Marionette.View.extend({
@@ -40,5 +36,4 @@ define([
   window.EditorApplication = app;
 
   return app;
-
 });

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

@@ -8,13 +8,13 @@ define([
   'newsletter_editor/behaviors/BehaviorsLookup',
   'mailpoet',
   'spectrum'
-], function (Marionette, BehaviorsLookup, MailPoet, Spectrum) {
+], function (Marionette, BehaviorsLookup, MailPoet) {
   var BL = BehaviorsLookup;
 
   BL.ColorPickerBehavior = Marionette.Behavior.extend({
     onRender: function () {
-      var that = this,
-        preferredFormat = 'hex6';
+      var that = this;
+      var preferredFormat = 'hex6';
       this.view.$('.mailpoet_color').each(function () {
         var $input = that.view.$(this);
         var updateColorInput = function (color) {

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

@@ -25,11 +25,11 @@ define([
         this.addDropZone();
       }
     },
-    addDropZone: function (_event) {
-      var that = this,
-        view = this.view,
-        domElement = that.$el.get(0),
-        acceptableElementSelector;
+    addDropZone: function () {
+      var that = this;
+      var view = this.view;
+      var domElement = that.$el.get(0);
+      var acceptableElementSelector;
 
       // TODO: Extract this limitation code to be controlled from containers
       if (this.view.renderOptions.depth === 0) {
@@ -47,11 +47,11 @@ 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();
@@ -63,20 +63,26 @@ define([
           // 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.pageY,
-              view.$el,
-              view.model.get('orientation'),
-              view.model.get('blocks').length
-            ),
-            element = view.$el,
-            markerWidth = '',
-            markerHeight = '',
-            containerOffset = element.offset(),
-            viewCollection = that.getCollection(),
-            marker, targetModel, targetView, targetElement,
-            topOffset, leftOffset, isLastBlockInsertion,
-            $targetBlock, margin;
+            event.dragmove.pageX,
+            event.dragmove.pageY,
+            view.$el,
+            view.model.get('orientation'),
+            view.model.get('blocks').length
+          );
+          var element = view.$el;
+          var markerWidth = '';
+          var markerHeight = '';
+          var containerOffset = element.offset();
+          var viewCollection = that.getCollection();
+          var marker;
+          var targetModel;
+          var targetView;
+          var targetElement;
+          var topOffset;
+          var leftOffset;
+          var isLastBlockInsertion;
+          var $targetBlock;
+          var margin;
 
           if (dropPosition === undefined) return;
 
@@ -178,15 +184,19 @@ define([
           // 4. Perform cleanup actions
 
           var dropPosition = that.getDropPosition(
-              event.dragEvent.pageX,
-              event.dragEvent.pageY,
-              view.$el,
-              view.model.get('orientation'),
-              view.model.get('blocks').length
-            ),
-            droppableModel = event.draggable.getDropModel(),
-            viewCollection = that.getCollection(),
-            droppedView, droppedModel, index, tempCollection, tempCollection2;
+            event.dragEvent.pageX,
+            event.dragEvent.pageY,
+            view.$el,
+            view.model.get('orientation'),
+            view.model.get('blocks').length
+          );
+          var droppableModel = event.draggable.getDropModel();
+          var viewCollection = that.getCollection();
+          var droppedView;
+          var index;
+          var tempCollection;
+          var tempCollection2;
+          var tempModel;
 
           if (dropPosition === undefined) return;
 
@@ -210,7 +220,7 @@ define([
           } 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'
@@ -271,29 +281,33 @@ define([
       // 2. Remove visual markings of drop position visualization
       this.view.$('.mailpoet_drop_marker').remove();
     },
-    getDropPosition: function (eventX, eventY, is_unsafe) {
-      var SPECIAL_AREA_INSERTION_WIDTH = 0.00, // Disable special insertion. Default: 0.3
+    getDropPosition: function (eventX, eventY, isUnsafe) {
+      var SPECIAL_AREA_INSERTION_WIDTH = 0.00; // Disable special insertion. Default: 0.3
 
-        element = this.view.$el,
-        orientation = this.view.model.get('orientation'),
+      var element = this.view.$el;
+      var orientation = this.view.model.get('orientation');
 
-        elementOffset = element.offset(),
-        elementPageX = elementOffset.left,
-        elementPageY = elementOffset.top,
-        elementWidth = element.outerWidth(true),
-        elementHeight = element.outerHeight(true),
+      var elementOffset = element.offset();
+      var elementPageX = elementOffset.left;
+      var elementPageY = elementOffset.top;
+      var elementWidth = element.outerWidth(true);
+      var elementHeight = element.outerHeight(true);
 
-        relativeX = eventX - elementPageX,
-        relativeY = eventY - elementPageY,
+      var relativeX = eventX - elementPageX;
+      var relativeY = eventY - elementPageY;
 
-        relativeOffset, elementLength,
+      var relativeOffset;
+      var elementLength;
 
-        canAcceptNormalInsertion = this._canAcceptNormalInsertion(),
-        canAcceptSpecialInsertion = this._canAcceptSpecialInsertion(),
+      var canAcceptNormalInsertion = this._canAcceptNormalInsertion();
+      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 {
@@ -359,12 +373,14 @@ define([
       // target element if event happens on the second half of the element.
       // Halves depend on orientation.
 
-      var index = this._computeCellIndex(eventX, eventY),
-        // TODO: Handle case when there are no children, container is empty
-        targetView = this.getChildren().findByModel(this.getCollection().at(index)),
-        orientation = this.view.model.get('orientation'),
-        element = targetView.$el,
-        eventOffset, closeOffset, elementDimension;
+      var index = this._computeCellIndex(eventX, eventY);
+      // TODO: Handle case when there are no children, container is empty
+      var targetView = this.getChildren().findByModel(this.getCollection().at(index));
+      var orientation = this.view.model.get('orientation');
+      var element = targetView.$el;
+      var eventOffset;
+      var closeOffset;
+      var elementDimension;
 
       if (orientation === 'vertical') {
         eventOffset = eventY;
@@ -382,51 +398,51 @@ 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) {
       return this._computeCellIndex(eventX, eventY);
     },
     _computeCellIndex: function (eventX, eventY) {
-      var orientation = this.view.model.get('orientation'),
-        eventOffset = (orientation === 'vertical') ? eventY : eventX,
-        resultView = this.getChildren().find(function (view) {
-          var element = view.$el,
-            closeOffset, farOffset;
+      var orientation = this.view.model.get('orientation');
+      var eventOffset = (orientation === 'vertical') ? eventY : eventX;
+      var resultView = this.getChildren().find(function (view) {
+        var element = view.$el;
+        var closeOffset;
+        var farOffset;
 
-          if (orientation === 'vertical') {
-            closeOffset = element.offset().top;
-            farOffset = element.outerHeight(true);
-          } else {
-            closeOffset = element.offset().left;
-            farOffset = element.outerWidth(true);
-          }
-          farOffset += closeOffset;
+        if (orientation === 'vertical') {
+          closeOffset = element.offset().top;
+          farOffset = element.outerHeight(true);
+        } else {
+          closeOffset = element.offset().left;
+          farOffset = element.outerWidth(true);
+        }
+        farOffset += closeOffset;
 
-          return closeOffset <= eventOffset && eventOffset <= farOffset;
-        });
+        return closeOffset <= eventOffset && eventOffset <= farOffset;
+      });
 
       var index = (typeof resultView === 'object') ? resultView._index : 0;
 
       return index;
     },
     _canAcceptNormalInsertion: function () {
-      var orientation = this.view.model.get('orientation'),
-        depth = this.view.renderOptions.depth,
-        childCount = this.getChildren().length;
+      var orientation = this.view.model.get('orientation');
+      var depth = this.view.renderOptions.depth;
+      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 () {
-      var orientation = this.view.model.get('orientation'),
-        depth = this.view.renderOptions.depth,
-        childCount = this.getChildren().length;
+      var orientation = this.view.model.get('orientation');
+      var depth = this.view.renderOptions.depth;
+      var childCount = this.getChildren().length;
       return depth === 0 || (depth === 1 && orientation === 'horizontal' && childCount <= this.options.columnLimit);
     },
     getCollectionView: function () {

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

@@ -28,12 +28,12 @@ define([
         throw "Missing 'drop' function for DraggableBehavior";
       },
 
-      onDrop: function (model, view) {},
-      testAttachToInstance: function (model, view) { return true; }
+      onDrop: function () {},
+      testAttachToInstance: function () { return true; }
     },
     onRender: function () {
-      var that = this,
-        interactable;
+      var that = this;
+      var interactable;
 
       // Give instances more control over whether Draggable should be applied
       if (!this.options.testAttachToInstance(this.view.model, this.view)) return;
@@ -49,16 +49,19 @@ define([
 
         onstart: function (startEvent) {
           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,
-              // Or use a clone
-              clone = tempClone || event.target.cloneNode(true),
-
-              $original = jQuery(event.target),
-              $clone = jQuery(clone),
-              centerXOffset, centerYOffset, parentOffset;
+            tempClone = (_.isFunction(that.options.onDragSubstituteBy)) ? that.options.onDragSubstituteBy(that) : undefined;
+            // Or use a clone
+            clone = tempClone || event.target.cloneNode(true);
+            jQuery(event.target);
+            $clone = jQuery(clone);
 
             $clone.addClass('mailpoet_droppable_active');
             $clone.css('position', 'absolute');
@@ -81,14 +84,13 @@ define([
               that.view.$el.addClass('mailpoet_hidden');
             }
           }
-
         },
         // call this function on every dragmove event
         onmove: function (event) {
-          var target = event.target,
-            // keep the dragged position in the data-x/data-y attributes
-            x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
-            y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+          var target = event.target;
+          // keep the dragged position in the data-x/data-y attributes
+          var x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx;
+          var y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
 
           // translate the element
           target.style.transform = 'translate(' + x + 'px, ' + y + 'px)';

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

@@ -14,12 +14,13 @@ define([
     defaults: {
       elementSelector: null,
       resizeHandleSelector: true, // true will use edges of the element itself
+      transformationFunction: function (y) { return y; }, // for blocks that use the default onResize function
       minLength: 0,
       maxLength: Infinity,
       modelField: 'styles.block.height',
       onResize: function (event) {
-        var currentLength = parseFloat(this.view.model.get(this.options.modelField)),
-          newLength = currentLength + event.y;
+        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');
       }
@@ -36,8 +37,8 @@ define([
       }
     },
     attachResize: function () {
-      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0),
-        that = this;
+      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0);
+      var that = this;
       interact(domElement).resizable({
         // axis: 'y',
         edges: {
@@ -47,15 +48,14 @@ define([
           bottom: (typeof this.options.resizeHandleSelector === 'string') ? this.view.$(this.options.resizeHandleSelector).get(0) : this.options.resizeHandleSelector
         }
       })
-      .on('resizestart', function (event) {
+      .on('resizestart', function () {
         that.isBeingResized = true;
         that.$el.addClass('mailpoet_resize_active');
-      })
-      .on('resizemove', function (event) {
+      }).on('resizemove', function (event) {
         var onResize = that.options.onResize.bind(that);
         return onResize(event);
       })
-      .on('resizeend', function (event) {
+      .on('resizeend', function () {
         that.isBeingResized = null;
         that.$el.removeClass('mailpoet_resize_active');
       });

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

@@ -24,9 +24,9 @@ define([
             ui.item.removeData('previousIndex');
           },
           update: function (event, ui) {
-            var previousIndex = ui.item.data('previousIndex'),
-              newIndex = ui.item.index(),
-              model = collection.at(previousIndex);
+            var previousIndex = ui.item.data('previousIndex');
+            var newIndex = ui.item.index();
+            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

@@ -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) {
           if (url.match(/\[.+\]/g)) {
             // Do not convert URLs with shortcodes
             return url;
@@ -57,7 +57,7 @@ define([
         plugins: this.options.plugins,
 
         setup: function (editor) {
-          editor.on('change', function (e) {
+          editor.on('change', function () {
             that.view.triggerMethod('text:editor:change', editor.getContent());
           });
 
@@ -71,12 +71,12 @@ define([
             }
           });
 
-          editor.on('focus', function (e) {
+          editor.on('focus', function () {
             that.view.triggerMethod('text:editor:focus');
             that._isActivationClick = true;
           });
 
-          editor.on('blur', function (e) {
+          editor.on('blur', function () {
             that.view.triggerMethod('text:editor:blur');
           });
         }

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

@@ -27,11 +27,10 @@ define([
   _,
   jQuery
   ) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.ALCSupervisor = SuperModel.extend({
     initialize: function () {
@@ -43,12 +42,13 @@ define([
       );
     },
     refresh: function () {
+      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();
       });
 
@@ -60,8 +60,8 @@ define([
       _.each(
         _.zip(models, renderedBlocks),
         function (args) {
-          var model = args[0],
-            contents = args[1];
+          var model = args[0];
+          var contents = args[1];
           model.trigger('refreshPosts', contents);
         }
       );
@@ -150,12 +150,12 @@ define([
     }),
     onDragSubstituteBy: function () { return Module.AutomatedLatestContentWidgetView; },
     onRender: function () {
-      var ContainerView = App.getBlockTypeView('container'),
-        renderOptions = {
-          disableTextEditor: true,
-          disableDragAndDrop: true,
-          emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay')
-        };
+      var ContainerView = App.getBlockTypeView('container');
+      var renderOptions = {
+        disableTextEditor: true,
+        disableDragAndDrop: true,
+        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 }));
@@ -213,12 +213,13 @@ define([
           },
           transport: function (options, success, failure) {
             var taxonomies;
+            var termsPromise;
             var promise = CommunicationComponent.getTaxonomies(
               that.model.get('contentType')
             ).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) {
@@ -227,7 +228,7 @@ define([
                   terms: terms
                 };
               });
-              return promise;
+              return termsPromise;
             });
 
             promise.then(success);
@@ -264,9 +265,9 @@ define([
         }
       }).trigger('change');
     },
-    toggleDisplayOptions: function (event) {
-      var el = this.$('.mailpoet_automated_latest_content_display_options'),
-        showControl = this.$('.mailpoet_automated_latest_content_show_display_options');
+    toggleDisplayOptions: function () {
+      var el = this.$('.mailpoet_automated_latest_content_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 +276,7 @@ define([
         showControl.removeClass('mailpoet_hidden');
       }
     },
-    showButtonSettings: function (event) {
+    showButtonSettings: function () {
       var buttonModule = ButtonBlock;
       (new buttonModule.ButtonBlockSettingsView({
         model: this.model.get('readMoreButton'),
@@ -286,7 +287,7 @@ define([
         }
       })).render();
     },
-    showDividerSettings: function (event) {
+    showDividerSettings: function () {
       var dividerModule = DividerBlock;
       (new dividerModule.DividerBlockSettingsView({
         model: this.model.get('divider'),
@@ -349,8 +350,8 @@ define([
       this.changeField('titleFormat', event);
     },
     _updateContentTypes: function (postTypes) {
-      var select = this.$('.mailpoet_automated_latest_content_content_type'),
-        selectedValue = this.model.get('contentType');
+      var select = this.$('.mailpoet_automated_latest_content_content_type');
+      var selectedValue = this.model.get('contentType');
 
       select.find('option').remove();
       _.each(postTypes, function (type) {
@@ -378,21 +379,21 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('automatedLatestContent', {
+  App.on('before:start', function (BeforeStartApp) {
+    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) {
-    var Application = App;
+  App.on('start', function (StartApp) {
+    var Application = StartApp;
     Application._ALCSupervisor = new Module.ALCSupervisor();
     Application._ALCSupervisor.refresh();
   });

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

@@ -12,17 +12,15 @@ define([
   'jquery',
   'mailpoet',
   'modal'
-], function (App, Marionette, SuperModel, _, jQuery, MailPoet, Modal) {
-
+], function (App, Marionette, SuperModel, _, jQuery, MailPoet) {
   'use strict';
 
-  var Module = {},
-    AugmentedView = Marionette.View.extend({});
+  var Module = {};
+  var AugmentedView = Marionette.View.extend({});
 
   Module.BlockModel = SuperModel.extend({
     stale: [], // Attributes to be removed upon saving
     initialize: function () {
-      var that = this;
       this.on('change', function () {
         App.getChannel().trigger('autoSave');
       });
@@ -68,7 +66,8 @@ define([
           options.dragBehavior.view.model.destroy();
         },
         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,6 +78,7 @@ define([
             WidgetView.destroy();
             return node;
           }
+          return undefined;
         }
       },
       HighlightEditingBehavior: {}
@@ -98,13 +98,13 @@ define([
       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');
     },
@@ -240,8 +240,9 @@ define([
       ColorPickerBehavior: {}
     },
     initialize: function (params) {
+      var panelParams;
       this.model.trigger('startEditing');
-      var panelParams = {
+      panelParams = {
         element: this.$el,
         template: '',
         position: 'right',
@@ -262,7 +263,7 @@ define([
         model: this.model.toJSON()
       };
     },
-    close: function (event) {
+    close: function () {
       this.destroy();
     },
     changeField: function (field, event) {

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

@@ -8,11 +8,10 @@ define([
   'underscore',
   'jquery'
 ], function (App, BaseBlock, MailPoet, _, jQuery) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.ButtonBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -132,13 +131,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('button', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -11,12 +11,11 @@ define([
   'newsletter_editor/App',
   'newsletter_editor/blocks/base'
 ], function (Backbone, Marionette, _, jQuery, App, BaseBlock) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock,
-    BlockCollection;
+  var Module = {};
+  var base = BaseBlock;
+  var BlockCollection;
 
   BlockCollection = Backbone.Collection.extend({
     model: base.BlockModel,
@@ -24,7 +23,6 @@ define([
       this.on('add change remove', function () { App.getChannel().trigger('autoSave'); });
     },
     parse: function (response) {
-      var self = this;
       return _.map(response, function (block) {
         var Type = App.getBlockTypeModel(block.type);
         // TODO: If type has no registered model, use a backup one
@@ -55,6 +53,7 @@ define([
       if (invalidBlock) {
         return invalidBlock.validationError;
       }
+      return undefined;
     },
     parse: function (response) {
       // If container has any blocks - add them to a collection
@@ -66,7 +65,7 @@ define([
       return response;
     },
     getChildren: function () {
-      var models = this.get('blocks').map(function (model, index, list) {
+      var models = this.get('blocks').map(function (model) {
         return [model, model.getChildren()];
       });
 
@@ -121,7 +120,8 @@ define([
           options.dragBehavior.view.model.destroy();
         },
         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,6 +132,7 @@ define([
             WidgetView.destroy();
             return node;
           }
+          return undefined;
         },
         testAttachToInstance: function (model, view) {
           // Attach Draggable only to layout containers and disable it
@@ -149,7 +150,6 @@ define([
         if (this.model.get('blocks').length === 2) return Module.TwoColumnContainerWidgetView;
       }
       return Module.OneColumnContainerWidgetView;
-
     },
     initialize: function (options) {
       base.BlockView.prototype.initialize.apply(this, arguments);
@@ -190,24 +190,24 @@ define([
       }
     },
     toggleEditingLayer: function (event) {
-      var that = this,
-        $toggleButton = this.$('> .mailpoet_tools .mailpoet_newsletter_layer_selector'),
-        $overlay = jQuery('.mailpoet_layer_overlay'),
-        $container = this.$('> .mailpoet_container'),
-        enableContainerLayer = function () {
-          that.$el.addClass('mailpoet_container_layer_active');
-          $toggleButton.addClass('mailpoet_container_layer_active');
-          $container.addClass('mailpoet_layer_highlight');
-          $overlay.click(disableContainerLayer);
-          $overlay.show();
-        },
-        disableContainerLayer = function () {
-          that.$el.removeClass('mailpoet_container_layer_active');
-          $toggleButton.removeClass('mailpoet_container_layer_active');
-          $container.removeClass('mailpoet_layer_highlight');
-          $overlay.hide();
-          $overlay.off('click');
-        };
+      var that = this;
+      var $toggleButton = this.$('> .mailpoet_tools .mailpoet_newsletter_layer_selector');
+      var $overlay = jQuery('.mailpoet_layer_overlay');
+      var $container = this.$('> .mailpoet_container');
+      var disableContainerLayer = function () {
+        that.$el.removeClass('mailpoet_container_layer_active');
+        $toggleButton.removeClass('mailpoet_container_layer_active');
+        $container.removeClass('mailpoet_layer_highlight');
+        $overlay.hide();
+        $overlay.off('click');
+      };
+      var enableContainerLayer = function () {
+        that.$el.addClass('mailpoet_container_layer_active');
+        $toggleButton.addClass('mailpoet_container_layer_active');
+        $container.addClass('mailpoet_layer_highlight');
+        $overlay.click(disableContainerLayer);
+        $overlay.show();
+      };
       if ($toggleButton.hasClass('mailpoet_container_layer_active')) {
         disableContainerLayer();
       } else {
@@ -336,25 +336,25 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('container', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -5,14 +5,12 @@ define([
   'newsletter_editor/App',
   'newsletter_editor/blocks/base',
   'underscore',
-  'jquery',
-  'mailpoet'
-], function (App, BaseBlock, _, jQuery, MailPoet) {
-
+  'jquery'
+], function (App, BaseBlock, _, jQuery) {
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.DividerBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -49,8 +47,8 @@ define([
     }, base.BlockView.prototype.behaviors),
     onDragSubstituteBy: function () { return Module.DividerWidgetView; },
     initialize: function () {
-      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'); };
@@ -119,7 +117,7 @@ define([
     repaintDividerStyleOptions: function () {
       this.$('.mailpoet_field_divider_style > div').css('border-top-color', this.model.get('styles.block.borderColor'));
     },
-    applyToAll: function (event) {
+    applyToAll: function () {
       App.getChannel().trigger('replaceAllDividers', this.model.toJSON());
     },
     updateValueAndCall: function (fieldToUpdate, callable, event) {
@@ -139,13 +137,13 @@ define([
       }
     }
   });
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('divider', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -7,11 +7,10 @@ define([
   'underscore',
   'mailpoet'
 ], function (App, BaseBlock, _, MailPoet) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.FooterBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -110,13 +109,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('footer', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -7,11 +7,10 @@ define([
   'underscore',
   'mailpoet'
 ], function (App, BaseBlock, _, MailPoet) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.HeaderBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -110,13 +109,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('header', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -8,12 +8,11 @@ define([
   'mailpoet',
   'jquery'
 ], function (App, BaseBlock, _, MailPoet, jQuery) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock,
-    ImageWidgetView;
+  var Module = {};
+  var base = BaseBlock;
+  var ImageWidgetView;
 
   Module.ImageBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -48,8 +47,8 @@ define([
         elementSelector: '.mailpoet_image',
         resizeHandleSelector: '.mailpoet_image_resize_handle',
         onResize: function (event) {
-          var corner = this.$('.mailpoet_image').offset(),
-            width = event.pageX - corner.left;
+          var corner = this.$('.mailpoet_image').offset();
+          var width = event.pageX - corner.left;
           this.view.model.set('width', width + 'px');
         }
       },
@@ -127,13 +126,16 @@ define([
       }
     },
     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 () {
           window.wp.media.view.MediaFrame.prototype.initialize.apply(this, arguments);
@@ -196,6 +198,7 @@ define([
         },
 
         bindHandlers: function () {
+          var handlers;
           // from Select
           this.on('router:create:browse', this.createRouter, this);
           this.on('router:render:browse', this.browseRouter, this);
@@ -210,7 +213,7 @@ define([
 
           this.on('updateExcluded', this.browseContent, this);
 
-          var handlers = {
+          handlers = {
             content: {
               embed: 'embedContent',
               'edit-selection': 'editSelectionContent'
@@ -244,9 +247,9 @@ define([
         },
 
         editSelectionContent: function () {
-          var state = this.state(),
-            selection = state.get('selection'),
-            view;
+          var state = this.state();
+          var selection = state.get('selection');
+          var view;
 
           view = new window.wp.media.view.AttachmentsBrowser({
             controller: this,
@@ -302,8 +305,8 @@ define([
             requires: { selection: true },
 
             click: function () {
-              var state = controller.state(),
-                selection = state.get('selection');
+              var state = controller.state();
+              var selection = state.get('selection');
 
               controller.close();
               state.trigger('insert', selection).reset();
@@ -321,46 +324,42 @@ define([
 
       });
 
-      var theFrame = new MediaManager({
-          id: 'mailpoet-media-manager',
-          frame: 'select',
-          title: 'Select image',
-          editing: false,
-          multiple: false,
-          library: {
-            type: 'image'
-          },
-          displaySettings: false,
-          button: {
-            text: 'Select'
-          }
-        }),
-        that = this;
+      theFrame = new MediaManager({
+        id: 'mailpoet-media-manager',
+        frame: 'select',
+        title: 'Select image',
+        editing: false,
+        multiple: false,
+        library: {
+          type: 'image'
+        },
+        displaySettings: false,
+        button: {
+          text: 'Select'
+        }
+      });
       this._mediaManager = theFrame;
 
       this._mediaManager.on('insert', function () {
         // Append media manager image selections to Images tab
         var selection = theFrame.state().get('selection');
         selection.each(function (attachment) {
-          var sizes = attachment.get('sizes'),
-            // Following advice from Becs, the target width should
-            // be a double of one column width to render well on
-            // retina screen devices
-            targetImageWidth = 1320,
+          var sizes = attachment.get('sizes');
+          // Following advice from Becs, the target width should
+          // be a double of one column width to render well on
+          // retina screen devices
+          var targetImageWidth = 1320;
 
-            // For main image use the size, that's closest to being 660px in width
-            sizeKeys = _.keys(sizes),
+          // Pick the width that is closest to target width
+          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
-            increasingByWidthDifference = _.sortBy(
-              _.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; });
+          // Maximize the height if there are multiple images with same width
+          var mainSize = _.max(imagesOfBestWidth, function (size) { return size.height; });
 
           that.model.set({
             height: mainSize.height + 'px',
@@ -413,13 +412,13 @@ define([
   });
   Module.ImageWidgetView = ImageWidgetView;
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('image', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -36,11 +36,15 @@ define([
   ButtonBlock,
   DividerBlock
   ) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
+  var PostsDisplayOptionsSettingsView;
+  var SinglePostSelectionSettingsView;
+  var EmptyPostSelectionSettingsView;
+  var PostSelectionSettingsView;
+  var PostsSelectionCollectionView;
 
   Module.PostsBlockModel = base.BlockModel.extend({
     stale: ['_selectedPosts', '_availablePosts', '_transformedPosts'],
@@ -89,10 +93,9 @@ define([
       };
     },
     initialize: function () {
-      var that = this,
-        POST_REFRESH_DELAY_MS = 500,
-        refreshAvailablePosts = _.debounce(this.fetchAvailablePosts.bind(this), POST_REFRESH_DELAY_MS),
-        refreshTransformedPosts = _.debounce(this._refreshTransformedPosts.bind(this), POST_REFRESH_DELAY_MS);
+      var POST_REFRESH_DELAY_MS = 500;
+      var refreshAvailablePosts = _.debounce(this.fetchAvailablePosts.bind(this), POST_REFRESH_DELAY_MS);
+      var refreshTransformedPosts = _.debounce(this._refreshTransformedPosts.bind(this), POST_REFRESH_DELAY_MS);
 
       // Attach Radio.Requests API primarily for highlighting
       _.extend(this, Radio.Requests);
@@ -120,9 +123,9 @@ define([
       });
     },
     _loadMorePosts: function () {
-      var that = this,
-        postCount = this.get('_availablePosts').length,
-        nextOffset = this.get('offset') + Number(this.get('amount'));
+      var that = this;
+      var postCount = this.get('_availablePosts').length;
+      var nextOffset = this.get('offset') + Number(this.get('amount'));
 
       if (postCount === 0 || postCount < nextOffset) {
         // No more posts to load
@@ -139,10 +142,11 @@ define([
       }).always(function () {
         that.trigger('morePostsLoaded');
       });
+      return true;
     },
     _refreshTransformedPosts: function () {
-      var that = this,
-        data = this.toJSON();
+      var that = this;
+      var data = this.toJSON();
 
       data.posts = this.get('_selectedPosts').pluck('ID');
 
@@ -158,10 +162,9 @@ define([
       });
     },
     _insertSelectedPosts: function () {
-      var that = this,
-        data = this.toJSON(),
-        index = this.collection.indexOf(this),
-        collection = this.collection;
+      var data = this.toJSON();
+      var index = this.collection.indexOf(this);
+      var collection = this.collection;
 
       data.posts = this.get('_selectedPosts').pluck('ID');
 
@@ -190,17 +193,19 @@ define([
       this.model.reply('blockView', this.notifyAboutSelf, this);
     },
     onRender: function () {
+      var ContainerView;
+      var renderOptions;
       if (!this.getRegion('toolsRegion').hasView()) {
         this.showChildView('toolsRegion', this.toolsView);
       }
       this.trigger('showSettings');
 
-      var ContainerView = App.getBlockTypeView('container'),
-        renderOptions = {
-          disableTextEditor: true,
-          disableDragAndDrop: true,
-          emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay')
-        };
+      ContainerView = App.getBlockTypeView('container');
+      renderOptions = {
+        disableTextEditor: true,
+        disableDragAndDrop: true,
+        emptyContainerMessage: MailPoet.I18n.t('noPostsToDisplay')
+      };
       this.showChildView('postsRegion', new ContainerView({ model: this.model.get('_transformedPosts'), renderOptions: renderOptions }));
     },
     notifyAboutSelf: function () {
@@ -237,8 +242,8 @@ define([
       this.displayOptionsView = new PostsDisplayOptionsSettingsView({ model: this.model });
     },
     onRender: function () {
-      var that = this,
-        blockView = this.model.request('blockView');
+      var that = this;
+      this.model.request('blockView');
 
       this.showChildView('selectionRegion', this.selectionView);
       this.showChildView('displayOptionsRegion', this.displayOptionsView);
@@ -283,7 +288,7 @@ define([
     }
   });
 
-  var PostsSelectionCollectionView = Marionette.CollectionView.extend({
+  PostsSelectionCollectionView = Marionette.CollectionView.extend({
     className: 'mailpoet_post_scroll_container',
     childView: function () { return SinglePostSelectionSettingsView; },
     emptyView: function () { return EmptyPostSelectionSettingsView; },
@@ -307,7 +312,7 @@ define([
     }
   });
 
-  var PostSelectionSettingsView = Marionette.View.extend({
+  PostSelectionSettingsView = Marionette.View.extend({
     getTemplate: function () { return window.templates.postSelectionPostsBlockSettings; },
     regions: {
       posts: '.mailpoet_post_selection_container'
@@ -334,9 +339,10 @@ define([
       }
     },
     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
       });
@@ -358,12 +364,13 @@ define([
           },
           transport: function (options, success, failure) {
             var taxonomies;
+            var termsPromise;
             var promise = CommunicationComponent.getTaxonomies(
               that.model.get('contentType')
             ).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) {
@@ -372,7 +379,7 @@ define([
                   terms: terms
                 };
               });
-              return promise;
+              return termsPromise;
             });
 
             promise.then(success);
@@ -413,8 +420,8 @@ define([
       this.model.set(field, jQuery(event.target).val());
     },
     _updateContentTypes: function (postTypes) {
-      var select = this.$('.mailpoet_settings_posts_content_type'),
-        selectedValue = this.model.get('contentType');
+      var select = this.$('.mailpoet_settings_posts_content_type');
+      var selectedValue = this.model.get('contentType');
 
       select.find('option').remove();
       _.each(postTypes, function (type) {
@@ -427,11 +434,11 @@ define([
     }
   });
 
-  var EmptyPostSelectionSettingsView = Marionette.View.extend({
+  EmptyPostSelectionSettingsView = Marionette.View.extend({
     getTemplate: function () { return window.templates.emptyPostPostsBlockSettings; }
   });
 
-  var SinglePostSelectionSettingsView = Marionette.View.extend({
+  SinglePostSelectionSettingsView = Marionette.View.extend({
     getTemplate: function () { return window.templates.singlePostPostsBlockSettings; },
     events: function () {
       return {
@@ -448,8 +455,8 @@ define([
       this.blockModel = options.blockModel;
     },
     postSelectionChange: function (event) {
-      var checkBox = jQuery(event.target),
-        selectedPostsCollection = this.blockModel.get('_selectedPosts');
+      var checkBox = jQuery(event.target);
+      var selectedPostsCollection = this.blockModel.get('_selectedPosts');
       if (checkBox.prop('checked')) {
         selectedPostsCollection.add(this.model);
       } else {
@@ -458,7 +465,7 @@ define([
     }
   });
 
-  var PostsDisplayOptionsSettingsView = base.BlockSettingsView.extend({
+  PostsDisplayOptionsSettingsView = base.BlockSettingsView.extend({
     getTemplate: function () { return window.templates.displayOptionsPostsBlockSettings; },
     events: function () {
       return {
@@ -488,7 +495,7 @@ define([
         model: this.model.toJSON()
       };
     },
-    showButtonSettings: function (event) {
+    showButtonSettings: function () {
       var buttonModule = ButtonBlock;
       (new buttonModule.ButtonBlockSettingsView({
         model: this.model.get('readMoreButton'),
@@ -499,7 +506,7 @@ define([
         }
       })).render();
     },
-    showDividerSettings: function (event) {
+    showDividerSettings: function () {
       var dividerModule = DividerBlock;
       (new dividerModule.DividerBlockSettingsView({
         model: this.model.get('divider'),
@@ -575,13 +582,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('posts', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -10,15 +10,15 @@ define([
   'underscore',
   'jquery'
 ], function (App, BaseBlock, Backbone, Marionette, SuperModel, _, jQuery) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock,
-    SocialBlockSettingsIconSelectorView,
-    SocialBlockSettingsIconView,
-    SocialBlockSettingsIconCollectionView,
-    SocialBlockSettingsStylesView;
+  var Module = {};
+  var base = BaseBlock;
+  var SocialBlockSettingsIconSelectorView;
+  var SocialBlockSettingsIconView;
+  var SocialBlockSettingsIconCollectionView;
+  var SocialBlockSettingsStylesView;
+  var SocialIconView;
 
   Module.SocialIconModel = SuperModel.extend({
     defaults: function () {
@@ -33,12 +33,12 @@ 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 () {
-        var defaultValues = App.getConfig().get('socialIcons').get(that.get('iconType')),
-          iconSet = that.collection.iconBlockModel.getIconSet();
+        var defaultValues = App.getConfig().get('socialIcons').get(that.get('iconType'));
+        var iconSet = that.collection.iconBlockModel.getIconSet();
         this.set({
           link: defaultValues.get('defaultLink'),
           image: iconSet.get(that.get('iconType')),
@@ -83,7 +83,7 @@ define([
     }
   });
 
-  var SocialIconView = Marionette.View.extend({
+  SocialIconView = Marionette.View.extend({
     tagName: 'span',
     getTemplate: function () { return window.templates.socialIconBlock; },
     modelEvents: {
@@ -175,10 +175,10 @@ define([
       }
     },
     templateContext: function () {
-      var icons = App.getConfig().get('socialIcons'),
-        // 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') }; }),
-        allIconSets = App.getAvailableStyles().get('socialIconSets');
+      var icons = App.getConfig().get('socialIcons');
+      // Construct icon type list of format [{iconType: 'type', title: 'Title'}, ...]
+      var availableIconTypes = _.map(_.keys(icons.attributes), function (key) { return { iconType: key, title: icons.get(key).get('title') }; });
+      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(),
@@ -194,6 +194,7 @@ define([
       } else {
         return this.changeField('link', event);
       }
+      return undefined;
     },
     changeField: function (field, event) {
       this.model.set(field, jQuery(event.target).val());
@@ -297,13 +298,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('social', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -6,11 +6,10 @@ define([
   'newsletter_editor/blocks/base',
   'underscore'
 ], function (App, BaseBlock, _) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.SpacerBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -87,13 +86,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('spacer', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -7,11 +7,10 @@ define([
   'underscore',
   'mailpoet'
 ], function (App, BaseBlock, _, MailPoet) {
-
   'use strict';
 
-  var Module = {},
-    base = BaseBlock;
+  var Module = {};
+  var base = BaseBlock;
 
   Module.TextBlockModel = base.BlockModel.extend({
     defaults: function () {
@@ -94,13 +93,13 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    App.registerBlockType('text', {
+  App.on('before:start', function (BeforeStartApp) {
+    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

@@ -7,15 +7,15 @@
  */
 
 (function (root, factory) {
+  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, _) {
-      return factory(Marionette, Radio, _);
+    define(['backbone.marionette', 'backbone.radio', 'underscore'], function (BackboneMarionette, BackboneRadio, underscore) {
+      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 {

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

@@ -4,7 +4,6 @@ define([
   'mailpoet',
   'ajax'
 ], function (App, _, MailPoet) {
-
   var Module = {};
 
   Module._query = function (args) {
@@ -98,7 +97,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

@@ -2,7 +2,6 @@ define([
   'newsletter_editor/App',
   'backbone.supermodel'
 ], function (App, SuperModel) {
-
   var Module = {};
 
   Module.ConfigModel = SuperModel.extend({
@@ -24,8 +23,8 @@ define([
     return Module._config;
   };
 
-  App.on('before:start', function (App, options) {
-    var Application = App;
+  App.on('before:start', function (BeforeStartApp, options) {
+    var Application = BeforeStartApp;
     // Expose config methods globally
     Application.getConfig = Module.getConfig;
     Application.setConfig = Module.setConfig;

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

@@ -13,7 +13,7 @@ define([
   // handled by other components.
   Module.NewsletterModel = SuperModel.extend({
     whitelisted: ['id', 'subject', 'preheader'],
-    initialize: function (options) {
+    initialize: function () {
       this.on('change', function () {
         App.getChannel().trigger('autoSave');
       });
@@ -33,16 +33,14 @@ define([
   Module.getBlockTypeModel = function (type) {
     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) {
     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 () {
@@ -68,21 +66,21 @@ define([
   };
 
   App.on('before:start', function (Application, options) {
-    var App = Application;
+    var BeforeStartApp = Application;
     // Expose block methods globally
-    App.registerBlockType = Module.registerBlockType;
-    App.getBlockTypeModel = Module.getBlockTypeModel;
-    App.getBlockTypeView = Module.getBlockTypeView;
-    App.toJSON = Module.toJSON;
-    App.getBody = Module.getBody;
-    App.getNewsletter = Module.getNewsletter;
-    App.findModels = Module.findModels;
+    BeforeStartApp.registerBlockType = Module.registerBlockType;
+    BeforeStartApp.getBlockTypeModel = Module.getBlockTypeModel;
+    BeforeStartApp.getBlockTypeView = Module.getBlockTypeView;
+    BeforeStartApp.toJSON = Module.toJSON;
+    BeforeStartApp.getBody = Module.getBody;
+    BeforeStartApp.getNewsletter = Module.getNewsletter;
+    BeforeStartApp.findModels = Module.findModels;
 
     Module.newsletter = new Module.NewsletterModel(_.omit(_.clone(options.newsletter), ['body']));
   });
 
   App.on('start', function (Application, options) {
-    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 });
-    App._contentContainerView = new (App.getBlockTypeView('container'))({
-      model: App._contentContainer,
+    StartApp._contentContainer = new (StartApp.getBlockTypeModel('container'))(content, { parse: true });
+    StartApp._contentContainerView = new (StartApp.getBlockTypeView('container'))({
+      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

@@ -6,7 +6,6 @@ define([
   'jquery',
   'mailpoet'
 ], function (App, Backbone, Marionette, _, jQuery, MailPoet) {
-
   'use strict';
 
   var Module = {};
@@ -29,8 +28,8 @@ define([
     }
   });
 
-  App.on('start', function (App, options) {
-    App._appView.showChildView('headingRegion', new Module.HeadingView({ model: App.getNewsletter() }));
+  App.on('start', function (StartApp) {
+    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

@@ -25,15 +25,13 @@ define([
   _,
   $
 ) {
-
   'use strict';
 
-  var Module = {},
-    saveTimeout;
+  var Module = {};
+  var saveTimeout;
 
   // Save editor contents to server
   Module.save = function () {
-
     var json = App.toJSON();
 
     // Stringify to enable transmission of primitive non-string value types
@@ -76,10 +74,9 @@ define([
       // Temporary workaround for html2canvas-alpha2.
       // Removes 1px left transparent border from resulting canvas.
 
-      var oldContext = oldCanvas.getContext('2d'),
-        newCanvas = document.createElement('canvas'),
-        newContext = newCanvas.getContext('2d'),
-        leftBorderWidth = 1;
+      var newCanvas = document.createElement('canvas');
+      var newContext = newCanvas.getContext('2d');
+      var leftBorderWidth = 1;
 
       newCanvas.width = oldCanvas.width;
       newCanvas.height = oldCanvas.height;
@@ -95,8 +92,7 @@ define([
   };
 
   Module.saveTemplate = function (options) {
-    var that = this,
-      promise = jQuery.Deferred();
+    var promise = jQuery.Deferred();
 
     promise.then(function (thumbnail) {
       var data = _.extend(options || {}, {
@@ -122,7 +118,6 @@ define([
   };
 
   Module.exportTemplate = function (options) {
-    var that = this;
     return Module.getThumbnail(
       jQuery('#mailpoet_editor_content > .mailpoet_block').get(0)
     ).then(function (thumbnail) {
@@ -155,7 +150,7 @@ 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);
     },
@@ -170,7 +165,7 @@ define([
       // 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');
@@ -192,9 +187,9 @@ define([
       this.$('.mailpoet_save_as_template_container').addClass('mailpoet_hidden');
     },
     saveAsTemplate: function () {
-      var templateName = this.$('.mailpoet_save_as_template_name').val(),
-        templateDescription = this.$('.mailpoet_save_as_template_description').val(),
-        that = this;
+      var templateName = this.$('.mailpoet_save_as_template_name').val();
+      var templateDescription = this.$('.mailpoet_save_as_template_description').val();
+      var that = this;
 
       if (templateName === '') {
         MailPoet.Notice.error(
@@ -238,7 +233,6 @@ define([
         });
         this.hideOptionContents();
       }
-
     },
     toggleExportTemplate: function () {
       this.$('.mailpoet_export_template_container').toggleClass('mailpoet_hidden');
@@ -248,9 +242,9 @@ define([
       this.$('.mailpoet_export_template_container').addClass('mailpoet_hidden');
     },
     exportTemplate: function () {
-      var templateName = this.$('.mailpoet_export_template_name').val(),
-        templateDescription = this.$('.mailpoet_export_template_description').val(),
-        that = this;
+      var templateName = this.$('.mailpoet_export_template_name').val();
+      var templateDescription = this.$('.mailpoet_export_template_description').val();
+      var that = this;
 
       if (templateName === '') {
         MailPoet.Notice.error(
@@ -285,18 +279,19 @@ define([
       this.hideOptionContents();
       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) {
+      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) {
@@ -340,9 +335,11 @@ define([
   };
 
   Module.beforeExitWithUnsavedChanges = function (e) {
+    var message;
+    var event;
     if (saveTimeout) {
-      var message = MailPoet.I18n.t('unsavedChangesWillBeLost');
-      var event = e || window.event;
+      message = MailPoet.I18n.t('unsavedChangesWillBeLost');
+      event = e || window.event;
 
       if (event) {
         event.returnValue = message;
@@ -350,10 +347,11 @@ define([
 
       return message;
     }
+    return undefined;
   };
 
-  App.on('before:start', function (App, options) {
-    var Application = App;
+  App.on('before:start', function (BeforeStartApp) {
+    var Application = BeforeStartApp;
     Application.save = Module.save;
     Application.getChannel().on('autoSave', Module.autoSave);
 
@@ -362,9 +360,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

@@ -6,8 +6,7 @@ define([
   'backbone.marionette',
   'backbone.supermodel',
   'underscore',
-  'jquery',
-  'sticky-kit'
+  'jquery'
 ], function (
   App,
   CommunicationComponent,
@@ -16,14 +15,12 @@ define([
   Marionette,
   SuperModel,
   _,
-  jQuery,
-  StickyKit
+  jQuery
   ) {
-
   '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({
@@ -52,7 +49,7 @@ define([
   Module.registerLayoutWidget = function (widget) { return Module._layoutWidgets.add(widget); };
   Module.getLayoutWidgets = function () { return Module._layoutWidgets; };
 
-  var SidebarView = Marionette.View.extend({
+  SidebarView = Marionette.View.extend({
     getTemplate: function () { return window.templates.sidebar; },
     regions: {
       contentRegion: '.mailpoet_content_region',
@@ -62,8 +59,8 @@ define([
     },
     events: {
       'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function (event) {
-        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)'),
-          $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
+        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)');
+        var $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
 
         $openRegion.find('.mailpoet_region_content').velocity(
           'slideUp',
@@ -90,7 +87,7 @@ define([
         }
       }
     },
-    initialize: function (options) {
+    initialize: function () {
       jQuery(window)
         .on('resize', this.updateHorizontalScroll.bind(this))
         .on('scroll', this.updateHorizontalScroll.bind(this));
@@ -113,13 +110,12 @@ define([
       // position of the sidebar would be scrollable and not fixed
       // partially out of visible screen
       this.$el.parent().each(function () {
-        var calculated_left, self;
-
-        self = jQuery(this);
+        var calculatedLeft;
+        var self = jQuery(this);
 
         if (self.css('position') === 'fixed') {
-          calculated_left = self.parent().offset().left - jQuery(window).scrollLeft();
-          self.css('left', calculated_left + 'px');
+          calculatedLeft = self.parent().offset().left - jQuery(window).scrollLeft();
+          self.css('left', calculatedLeft + 'px');
         } else {
           self.css('left', '');
         }
@@ -271,7 +267,7 @@ define([
           previewUrl: response.meta.preview_url
         });
 
-        var view = this.previewView.render();
+        this.previewView.render();
         this.previewView.$el.css('height', '100%');
 
         MailPoet.Modal.popup({
@@ -324,7 +320,7 @@ define([
       App.getChannel().request('save').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 }
@@ -342,6 +338,7 @@ define([
           }
         });
       });
+      return undefined;
     }
   });
 
@@ -363,19 +360,18 @@ define([
     }
   });
 
-  App.on('before:start', function (App, options) {
-    var Application = App;
+  App.on('before:start', function (BeforeStartApp) {
+    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) {
-    var stylesModel = App.getGlobalStyles(),
-      sidebarView = new SidebarView();
+  App.on('start', function (StartApp) {
+    var 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

@@ -4,7 +4,6 @@ define([
   'backbone.supermodel',
   'underscore'
 ], function (App, Marionette, SuperModel, _) {
-
   'use strict';
 
   var Module = {};
@@ -69,21 +68,23 @@ define([
     return App.getConfig().get('availableStyles');
   };
 
-  App.on('before:start', function (App, options) {
-    var Application = App;
+  App.on('before:start', function (BeforeStartApp, options) {
+    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;
-    var globalStyles = (_.has(body, 'globalStyles')) ? body.globalStyles : {};
+    body = options.newsletter.body;
+    globalStyles = (_.has(body, 'globalStyles')) ? body.globalStyles : {};
     this.setGlobalStyles(globalStyles);
   });
 
-  App.on('start', function (App, options) {
-    var stylesView = new Module.StylesView({ model: App.getGlobalStyles() });
-    App._appView.showChildView('stylesRegion', stylesView);
+  App.on('start', function (StartApp) {
+    var stylesView = new Module.StylesView({ model: StartApp.getGlobalStyles() });
+    StartApp._appView.showChildView('stylesRegion', stylesView);
   });
 
   return Module;

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

@@ -10,31 +10,33 @@
 
 /* jshint unused:false */
 /* global tinymce:true */
-tinymce.PluginManager.add('mailpoet_shortcodes', function (editor, url) {
+tinymce.PluginManager.add('mailpoet_shortcodes', function (editor) {
   var appendLabelAndClose = function (shortcode) {
-      editor.insertContent(shortcode);
-      editor.windowManager.close();
-    },
-    generateOnClickFunc = function (shortcode) {
-      return function () {
-        appendLabelAndClose(shortcode);
-      };
+    editor.insertContent(shortcode);
+    editor.windowManager.close();
+  };
+  var generateOnClickFunc = function (shortcode) {
+    return function () {
+      appendLabelAndClose(shortcode);
     };
+  };
 
   editor.addButton('mailpoet_shortcodes', {
     icon: 'mailpoet_shortcodes',
     onclick: function () {
-      var shortcodes = [],
-        configShortcodes = editor.settings.mailpoet_shortcodes;
+      var 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,14 +46,14 @@ 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>
             );
           }
 
           return (
-            <span key={'step-' + index}>
+            <span key={`step-${index}`}>
               <span className={stepClasses}>
                 { label }
               </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('#pause_' + newsletter.id).hide();
+      jQuery(`#resume_${newsletter.id}`).show();
+      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('#resume_' + newsletter.id).hide();
+      jQuery(`#pause_${newsletter.id}`).show();
+      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') {
-        return (
-          <span>
-            { MailPoet.I18n.t('scheduledFor') } { MailPoet.Date.format(newsletter.queue.scheduled_at) }
-          </span>
-        );
-      }
-      const progressClasses = classNames(
+    }
+    if (newsletter.queue.status === 'scheduled') {
+      return (
+        <span>
+          { MailPoet.I18n.t('scheduledFor') } { MailPoet.Date.format(newsletter.queue.scheduled_at) }
+        </span>
+      );
+    }
+    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') {
-        label = (
-          <span>
-            {
+    if (newsletter.queue.status === 'completed') {
+      label = (
+        <span>
+          {
               MailPoet.I18n.t('newsletterQueueCompleted')
-              .replace('%$1d', newsletter.queue.count_processed)
-              .replace('%$2d', newsletter.queue.count_total)
+              .replace('%$1d', parseInt(newsletter.queue.count_processed, 10).toLocaleString())
+              .replace('%$2d', parseInt(newsletter.queue.count_total, 10).toLocaleString())
             }
-          </span>
+        </span>
         );
-      } else {
-        label = (
-          <span>
-            { newsletter.queue.count_processed } / { newsletter.queue.count_total }
+    } else {
+      label = (
+        <span>
+          { newsletter.queue.count_processed } / { newsletter.queue.count_total }
             &nbsp;&nbsp;
-            <a
-              id={'resume_' + newsletter.id}
-              className="button"
-              style={{ display: (newsletter.queue.status === 'paused')
+          <a
+            id={`resume_${newsletter.id}`}
+            className="button"
+            style={{ display: (newsletter.queue.status === 'paused')
                 ? 'inline-block' : 'none' }}
-              href="javascript:;"
-              onClick={this.resumeSending.bind(null, newsletter)}
+            href="javascript:;"
+            onClick={this.resumeSending.bind(null, newsletter)}
             >{MailPoet.I18n.t('resume')}</a>
-            <a
-              id={'pause_' + newsletter.id}
-              className="button mailpoet_pause"
-              style={{ display: (newsletter.queue.status === null)
+          <a
+            id={`pause_${newsletter.id}`}
+            className="button mailpoet_pause"
+            style={{ display: (newsletter.queue.status === null)
                   ? 'inline-block' : 'none' }}
-              href="javascript:;"
-              onClick={this.pauseSending.bind(null, newsletter)}
+            href="javascript:;"
+            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 = {
-  renderStatistics: function (newsletter, is_sent, current_time) {
-    let sent = is_sent;
+const trackStatsCTAClicked = function () {
+  MailPoet.trackEvent(
+    '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 percentage_opened = 0;
-    let percentage_unsubscribed = 0;
+    let percentageClicked = 0;
+    let percentageOpened = 0;
+    let percentageUnsubscribed = 0;
 
-    if (total_sent > 0) {
-      percentage_clicked = (newsletter.statistics.clicked * 100) / total_sent;
-      percentage_opened = (newsletter.statistics.opened * 100) / total_sent;
-      percentage_unsubscribed = (newsletter.statistics.unsubscribed * 100) / total_sent;
+    if (totalSent > 0) {
+      percentageClicked = (newsletter.statistics.clicked * 100) / totalSent;
+      percentageOpened = (newsletter.statistics.opened * 100) / totalSent;
+      percentageUnsubscribed = (newsletter.statistics.unsubscribed * 100) / totalSent;
     }
 
     // format to 1 decimal place
-    const percentage_clicked_display = MailPoet.Num.toLocaleFixed(percentage_clicked, 1);
-    const percentage_opened_display = MailPoet.Num.toLocaleFixed(percentage_opened, 1);
-    const percentage_unsubscribed_display = MailPoet.Num.toLocaleFixed(percentage_unsubscribed, 1);
+    const percentageClickedDisplay = MailPoet.Num.toLocaleFixed(percentageClicked, 1);
+    const percentageOpenedDisplay = MailPoet.Num.toLocaleFixed(percentageOpened, 1);
+    const percentageUnsubscribedDisplay = MailPoet.Num.toLocaleFixed(percentageUnsubscribed, 1);
 
-    let show_stats_timeout,
-      newsletter_date,
-      sent_hours_ago,
-      too_early_for_stats,
-      show_kb_link;
-    if (current_time !== undefined) {
+    let showStatsTimeout;
+    let newsletterDate;
+    let sentHoursAgo;
+    let tooEarlyForStats;
+    let showKbLink;
+    if (currentTime !== undefined) {
       // standard emails and post notifications:
       // display green box for newsletters that were just sent
-      show_stats_timeout = 6; // in hours
-      newsletter_date = newsletter.queue.scheduled_at || newsletter.queue.created_at;
-      sent_hours_ago = moment(current_time).diff(moment(newsletter_date), 'hours');
-      too_early_for_stats = sent_hours_ago < show_stats_timeout;
-      show_kb_link = true;
+      showStatsTimeout = 6; // in hours
+      newsletterDate = newsletter.queue.scheduled_at || newsletter.queue.created_at;
+      sentHoursAgo = moment(currentTime).diff(moment(newsletterDate), 'hours');
+      tooEarlyForStats = sentHoursAgo < showStatsTimeout;
+      showKbLink = true;
     } else {
       // welcome emails: no green box and KB link
-      too_early_for_stats = false;
-      show_kb_link = false;
+      tooEarlyForStats = 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 min_newsletter_opens = 5;
+    const minNewslettersSent = 20;
+    const minNewsletterOpens = 5;
 
     let content;
-    if (total_sent >= min_newsletters_sent
-      && newsletter.statistics.opened >= min_newsletter_opens
-      && !too_early_for_stats
+    if (totalSent >= minNewslettersSent
+      && newsletter.statistics.opened >= minNewsletterOpens
+      && !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 min_sent_hours_ago = 24;
-    const min_total_sent = 10;
+    const maxPercentageOpened = 5;
+    const minSentHoursAgo = 24;
+    const minTotalSent = 10;
 
-    let after_content;
-    if (show_kb_link
-      && percentage_opened < max_percentage_opened
-      && sent_hours_ago >= min_sent_hours_ago
-      && total_sent >= min_total_sent
+    let afterContent;
+    if (showKbLink
+      && percentageOpened < maxPercentageOpened
+      && sentHoursAgo >= minSentHoursAgo
+      && 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}`}
             to={params.link}
             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;
-    const mailer_check_settings_notice = ReactStringReplace(
+    let mailerErrorNotice;
+    const mailerCheckSettingsNotice = ReactStringReplace(
       MailPoet.I18n.t('mailerCheckSettingsNotice'),
       /\[link\](.*?)\[\/link\]/g,
       match => (
@@ -331,19 +383,23 @@ 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>{ mailer_check_settings_notice }</p>
+        <p>{ mailerErrorNotice }</p>
+        <p>{ mailerCheckSettingsNotice }</p>
         <p>
           <a href="javascript:;"
             className="button"
@@ -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 { _StatisticsMixin as StatisticsMixin };
-export { _MailerMixin as MailerMixin };
+export { QueueMixin };
+export { StatisticsMixin };
+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,7 +99,7 @@ const bulk_actions = [
   },
 ];
 
-const newsletter_actions = [
+const newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
@@ -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 }
           );
         }
@@ -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) => {
@@ -195,12 +195,12 @@ const NewsletterListNotification = React.createClass({
   },
   renderSettings: function (newsletter) {
     let sendingFrequency;
-    let sendingToSegments;
 
     // get list of segments' name
-    const segments = newsletter.segments.map((segment) => {
-      return segment.name;
-    });
+    const segments = newsletter.segments.map(segment => 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) {
@@ -209,51 +209,52 @@ const NewsletterListNotification = React.createClass({
           { MailPoet.I18n.t('sendingToSegmentsNotSpecified') }
         </span>
       );
-    } else {
-      sendingToSegments = MailPoet.I18n.t('ifNewContentToSegments').replace(
-        '%$1s', segments.join(', ')
-      );
+    }
 
-      // set sending frequency
-      switch (newsletter.options.intervalType) {
-        case 'daily':
-          sendingFrequency = MailPoet.I18n.t('sendDaily').replace(
+    // set sending frequency
+    switch (newsletter.options.intervalType) {
+      case 'daily':
+        sendingFrequency = MailPoet.I18n.t('sendDaily').replace(
             '%$1s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'weekly':
-          sendingFrequency = MailPoet.I18n.t('sendWeekly').replace(
+      case 'weekly':
+        sendingFrequency = MailPoet.I18n.t('sendWeekly').replace(
             '%$1s', weekDayValues[newsletter.options.weekDay]
           ).replace(
             '%$2s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'monthly':
-          sendingFrequency = MailPoet.I18n.t('sendMonthly').replace(
+      case 'monthly':
+        sendingFrequency = MailPoet.I18n.t('sendMonthly').replace(
             '%$1s', monthDayValues[newsletter.options.monthDay]
           ).replace(
             '%$2s', timeOfDayValues[newsletter.options.timeOfDay]
           );
-          break;
+        break;
 
-        case 'nthWeekDay':
-          sendingFrequency = MailPoet.I18n.t('sendNthWeekDay').replace(
+      case 'nthWeekDay':
+        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':
-          sendingFrequency = MailPoet.I18n.t('sendImmediately');
-          break;
-      }
+      case 'immediately':
+        sendingFrequency = MailPoet.I18n.t('sendImmediately');
+        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(
@@ -311,7 +311,7 @@ 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" />
@@ -325,8 +325,8 @@ const NewsletterListNotification = React.createClass({
           base_url="notification"
           onRenderItem={this.renderItem}
           columns={columns}
-          bulk_actions={bulk_actions}
-          item_actions={newsletter_actions}
+          bulk_actions={bulkActions}
+          item_actions={newsletterActions}
           messages={messages}
           auto_refresh={true}
           sort_by="updated_at"

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.mailpoetTrackingEnabled));
 
 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,7 +39,7 @@ const columns = [
   },
 ];
 
-let newsletter_actions = [
+let newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
@@ -52,7 +52,8 @@ 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],
@@ -63,9 +64,7 @@ const NewsletterListNotificationHistory = React.createClass({
       'has-row-actions'
     );
 
-    const segments = newsletter.segments.map((segment) => {
-      return segment.name;
-    }).join(', ');
+    const segments = newsletter.segments.map(segment => segment.name).join(', ');
 
     return (
       <div>
@@ -84,7 +83,7 @@ const NewsletterListNotificationHistory = React.createClass({
         <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')}>
             { this.renderStatistics(newsletter, undefined, meta.current_time) }
           </td>
@@ -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" />
@@ -118,7 +117,7 @@ const NewsletterListNotificationHistory = React.createClass({
           base_url="notification/history/:parent_id"
           onRenderItem={this.renderItem}
           columns={columns}
-          item_actions={newsletter_actions}
+          item_actions={newsletterActions}
           auto_refresh={true}
           sort_by="sent_at"
           sort_order="desc"

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.mailpoetTrackingEnabled));
 
 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,17 +99,27 @@ const bulk_actions = [
 ];
 
 const confirmEdit = (newsletter) => {
+  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) {
@@ -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,7 +168,8 @@ 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],
@@ -168,9 +180,7 @@ const NewsletterListStandard = React.createClass({
       'has-row-actions'
     );
 
-    const segments = newsletter.segments.map((segment) => {
-      return segment.name;
-    }).join(', ');
+    const segments = newsletter.segments.map(segment => segment.name).join(', ');
 
     return (
       <div>
@@ -190,7 +200,7 @@ const NewsletterListStandard = React.createClass({
         <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')}>
             { this.renderStatistics(newsletter, undefined, meta.current_time) }
           </td>
@@ -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>
@@ -226,8 +237,8 @@ const NewsletterListStandard = React.createClass({
           base_url="standard"
           onRenderItem={this.renderItem}
           columns={columns}
-          bulk_actions={bulk_actions}
-          item_actions={newsletter_actions}
+          bulk_actions={bulkActions}
+          item_actions={newsletterActions}
           messages={messages}
           auto_refresh={true}
           sort_by="sent_at"

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

@@ -35,7 +35,7 @@ const ListingTabs = React.createClass({
 
       return (
         <Link
-          key={'tab-' + index}
+          key={`tab-${index}`}
           className={tabClasses}
           to={tab.link}
           onClick={() => MailPoet.trackEvent(`Tab Emails > ${tab.name} clicked`,
@@ -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 mailpoet_segments = window.mailpoet_segments || {};
-const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
+const mailpoetRoles = window.mailpoetRoles || {};
+const mailpoetSegments = window.mailpoetSegments || {};
+const mailpoetTrackingEnabled = (!!(window.mailpoetTrackingEnabled));
 
 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,7 +98,7 @@ const bulk_actions = [
   },
 ];
 
-let newsletter_actions = [
+let newsletterActions = [
   {
     name: 'view',
     link: function (newsletter) {
@@ -124,7 +124,8 @@ 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],
@@ -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())
     );
@@ -172,13 +173,14 @@ const NewsletterListWelcome = React.createClass({
             <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) => {
-          return (~~(segment.id) === ~~(newsletter.options.segment));
-        });
+        segment = _.find(
+          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 += '.';
@@ -271,7 +278,7 @@ const NewsletterListWelcome = React.createClass({
         <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')}>
             { this.renderStatistics(
               newsletter,
@@ -289,7 +296,7 @@ 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" />
@@ -303,8 +310,8 @@ const NewsletterListWelcome = React.createClass({
           base_url="welcome"
           onRenderItem={this.renderItem}
           columns={columns}
-          bulk_actions={bulk_actions}
-          item_actions={newsletter_actions}
+          bulk_actions={bulkActions}
+          item_actions={newsletterActions}
           messages={messages}
           auto_refresh={true}
           sort_by="updated_at"

assets/js/src/newsletters/newsletters.jsx

@@ -27,17 +27,18 @@ const App = React.createClass({
 const container = document.getElementById('newsletters_container');
 
 if (container) {
-  let extra_routes = [];
-  extra_routes = Hooks.applyFilters('mailpoet_newsletters_before_router', extra_routes);
+  let extraRoutes = [];
+  extraRoutes = Hooks.applyFilters('mailpoet_newsletters_before_router', extraRoutes);
 
-  const mailpoet_listing = ReactDOM.render((
+  const mailpoetListing = ReactDOM.render((
     <Router history={history}>
       <Route path="/" component={App}>
         <IndexRedirect to="standard" />
         {/* Listings */}
         <Route path="standard(/)**" params={{ tab: 'standard' }} component={NewsletterListStandard} />
         <Route path="welcome(/)**" component={NewsletterListWelcome} />
-        <Route path="notification/history/:parent_id(/)**" component={NewsletterListNotificationHistory} />
+        <Route path="notification/history/:parent_id(/)**"
+          component={NewsletterListNotificationHistory} />
         <Route path="notification(/)**" component={NewsletterListNotification} />
         {/* Newsletter: type selection */}
         <Route path="new" component={NewsletterTypes} />
@@ -49,10 +50,10 @@ if (container) {
         {/* Sending options */}
         <Route path="send/:id" component={NewsletterSend} />
         {/* Extra routes */}
-        { extra_routes.map(rt => <Route key={rt.path} path={rt.path} component={rt.component} />) }
+        { extraRoutes.map(rt => <Route key={rt.path} path={rt.path} component={rt.component} />) }
       </Route>
     </Router>
   ), container);
 
-  window.mailpoet_listing = mailpoet_listing;
+  window.mailpoet_listing = mailpoetListing;
 }

assets/js/src/newsletters/scheduling/common.jsx

@@ -4,14 +4,14 @@ import MailPoet from 'mailpoet';
 const timeFormat = window.mailpoet_time_format || 'H:i';
 
 // welcome emails
-const _timeDelayValues = {
+const timeDelayValues = {
   immediate: MailPoet.I18n.t('delayImmediately'),
   hours: MailPoet.I18n.t('delayHoursAfter'),
   days: MailPoet.I18n.t('delayDaysAfter'),
   weeks: MailPoet.I18n.t('delayWeeksAfter'),
 };
 
-const _intervalValues = {
+const intervalValues = {
   daily: MailPoet.I18n.t('daily'),
   weekly: MailPoet.I18n.t('weekly'),
   monthly: MailPoet.I18n.t('monthly'),
@@ -24,18 +24,16 @@ const SECONDS_IN_DAY = 86400;
 const TIME_STEP_SECONDS = 3600;
 const numberOfTimeSteps = SECONDS_IN_DAY / TIME_STEP_SECONDS;
 
-const _timeOfDayValues = _.object(_.map(
-  _.times(numberOfTimeSteps, (step) => {
-    return step * TIME_STEP_SECONDS;
-  }), (seconds) => {
-  const date = new Date(null);
-  date.setSeconds(seconds);
-  const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 });
-  return [seconds, timeLabel];
-})
+const timeOfDayValues = _.object(_.map(
+  _.times(numberOfTimeSteps, step => step * TIME_STEP_SECONDS), (seconds) => {
+    const date = new Date(null);
+    date.setSeconds(seconds);
+    const timeLabel = MailPoet.Date.format(date, { format: timeFormat, offset: 0 });
+    return [seconds, timeLabel];
+  })
 );
 
-const _weekDayValues = {
+const weekDayValues = {
   0: MailPoet.I18n.t('sunday'),
   1: MailPoet.I18n.t('monday'),
   2: MailPoet.I18n.t('tuesday'),
@@ -46,37 +44,35 @@ const _weekDayValues = {
 };
 
 const NUMBER_OF_DAYS_IN_MONTH = 28;
-const _monthDayValues = _.object(
+const monthDayValues = _.object(
   _.map(
-    _.times(NUMBER_OF_DAYS_IN_MONTH, (day) => {
-      return day;
-    }), (day) => {
-    const labels = {
-      0: MailPoet.I18n.t('first'),
-      1: MailPoet.I18n.t('second'),
-      2: MailPoet.I18n.t('third'),
-    };
-    let label;
-    if (labels[day] !== undefined) {
-      label = labels[day];
-    } else {
-      label = MailPoet.I18n.t('nth').replace('%$1d', day + 1);
+    _.times(NUMBER_OF_DAYS_IN_MONTH, day => day), (day) => {
+      const labels = {
+        0: MailPoet.I18n.t('first'),
+        1: MailPoet.I18n.t('second'),
+        2: MailPoet.I18n.t('third'),
+      };
+      let label;
+      if (labels[day] !== undefined) {
+        label = labels[day];
+      } else {
+        label = MailPoet.I18n.t('nth').replace('%$1d', day + 1);
+      }
+      return [day + 1, label];
     }
-    return [day + 1, label];
-  }
   )
 );
 
-const _nthWeekDayValues = {
+const nthWeekDayValues = {
   1: MailPoet.I18n.t('first'),
   2: MailPoet.I18n.t('second'),
   3: MailPoet.I18n.t('third'),
   L: MailPoet.I18n.t('last'),
 };
 
-export { _timeDelayValues as timeDelayValues };
-export { _intervalValues as intervalValues };
-export { _timeOfDayValues as timeOfDayValues };
-export { _weekDayValues as weekDayValues };
-export { _monthDayValues as monthDayValues };
-export { _nthWeekDayValues as nthWeekDayValues };
+export { timeDelayValues };
+export { intervalValues };
+export { timeOfDayValues };
+export { weekDayValues };
+export { monthDayValues };
+export { nthWeekDayValues };

assets/js/src/newsletters/send.jsx

@@ -25,7 +25,6 @@ define(
     HelpTooltip,
     jQuery
   ) => {
-
     const NewsletterSend = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
@@ -95,7 +94,7 @@ define(
         if (!this.isValid()) {
           jQuery('#mailpoet_newsletter').parsley().validate();
         } else {
-          this._save(e).done(() => {
+          this.saveNewsletter(e).done(() => {
             this.setState({ loading: true });
           }).done((response) => {
             switch (response.data.type) {
@@ -109,21 +108,21 @@ define(
                     id: this.props.params.id,
                     status: 'active',
                   },
-                }).done((response) => {
+                }).done((response2) => {
                   // redirect to listing based on newsletter type
                   this.context.router.push(`/${this.state.item.type || ''}`);
                   const opts = this.state.item.options;
                   // display success message depending on newsletter type
-                  if (response.data.type === 'welcome') {
+                  if (response2.data.type === 'welcome') {
                     MailPoet.Notice.success(
                       MailPoet.I18n.t('welcomeEmailActivated')
                     );
                     MailPoet.trackEvent('Emails > Welcome email activated', {
                       'MailPoet Free version': window.mailpoet_version,
                       'List type': opts.event,
-                      Delay: opts.afterTimeNumber + ' ' + opts.afterTimeType,
+                      Delay: `${opts.afterTimeNumber} ${opts.afterTimeType}`,
                     });
-                  } else if (response.data.type === 'notification') {
+                  } else if (response2.data.type === 'notification') {
                     MailPoet.Notice.success(
                       MailPoet.I18n.t('postNotificationActivated')
                     );
@@ -132,7 +131,7 @@ define(
                       Frequency: opts.intervalType,
                     });
                   }
-                }).fail(this._showError);
+                }).fail(this.showError);
               default:
                 return MailPoet.Ajax.post({
                   api_version: window.mailpoet_api_version,
@@ -141,11 +140,11 @@ define(
                   data: {
                     newsletter_id: this.props.params.id,
                   },
-                }).done((response) => {
+                }).done((response2) => {
                   // redirect to listing based on newsletter type
                   this.context.router.push(`/${this.state.item.type || ''}`);
 
-                  if (response.data.status === 'scheduled') {
+                  if (response2.data.status === 'scheduled') {
                     MailPoet.Notice.success(
                       MailPoet.I18n.t('newsletterHasBeenScheduled')
                     );
@@ -162,10 +161,10 @@ define(
                       'MailPoet Free version': window.mailpoet_version,
                     });
                   }
-                }).fail(this._showError);
+                }).fail(this.showError);
             }
           })
-          .fail(this._showError)
+          .fail(this.showError)
           .always(() => {
             this.setState({ loading: false });
           });
@@ -177,7 +176,7 @@ define(
         if (!this.isValid()) {
           jQuery('#mailpoet_newsletter').parsley().validate();
         } else {
-          this._save(e).done(() => {
+          this.saveNewsletter(e).done(() => {
             this.setState({ loading: true });
           }).done(() => {
             MailPoet.Ajax.post({
@@ -195,13 +194,13 @@ define(
             }).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 }
                 );
               }
             });
           })
-          .fail(this._showError)
+          .fail(this.showError)
           .always(() => {
             this.setState({ loading: false });
           });
@@ -211,27 +210,27 @@ define(
       handleSave: function (e) {
         e.preventDefault();
 
-        this._save(e).done(() => {
+        this.saveNewsletter(e).done(() => {
           MailPoet.Notice.success(
             MailPoet.I18n.t('newsletterUpdated')
           );
         }).done(() => {
           this.context.router.push(`/${this.state.item.type || ''}`);
-        }).fail(this._showError);
+        }).fail(this.showError);
       },
       handleRedirectToDesign: function (e) {
         e.preventDefault();
         const redirectTo = e.target.href;
 
-        this._save(e).done(() => {
+        this.saveNewsletter(e).done(() => {
           MailPoet.Notice.success(
             MailPoet.I18n.t('newsletterUpdated')
           );
         }).done(() => {
           window.location = redirectTo;
-        }).fail(this._showError);
+        }).fail(this.showError);
       },
-      _save: function () {
+      saveNewsletter: function () {
         const data = this.state.item;
         data.queue = undefined;
         this.setState({ loading: true });
@@ -255,10 +254,10 @@ define(
           this.setState({ loading: false });
         });
       },
-      _showError: (response) => {
+      showError: (response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map((error) => { return error.message; }),
+            response.errors.map(error => error.message),
             { scroll: true }
           );
         }
@@ -275,12 +274,12 @@ define(
         return true;
       },
       render: function () {
-        const isPaused = this.state.item.status == 'sending'
+        const isPaused = this.state.item.status === 'sending'
           && this.state.item.queue
-          && this.state.item.queue.status == 'paused';
+          && this.state.item.queue.status === 'paused';
         const fields = this.state.fields.map((field) => {
           const newField = field;
-          if (field.name == 'segments' || field.name == 'options') {
+          if (field.name === 'segments' || field.name === 'options') {
             newField.disabled = isPaused;
           }
           return newField;
@@ -325,13 +324,13 @@ define(
                  {MailPoet.I18n.t('orSimply')} 
                 <a
                   href={
-                    '?page=mailpoet-newsletter-editor&id=' + this.props.params.id
+                    `?page=mailpoet-newsletter-editor&id=${this.props.params.id}`
                   }
                   onClick={this.handleRedirectToDesign}>
                   {MailPoet.I18n.t('goBackToDesign')}
                 </a>.
               </p>
-              { !isPaused && sendButtonOptions['disabled'] && sendButtonOptions['disabled'] === 'disabled' && (
+              { !isPaused && sendButtonOptions.disabled && sendButtonOptions.disabled === 'disabled' && (
                 <HelpTooltip
                   tooltip={MailPoet.I18n.t('helpTooltipSendEmail')}
                   tooltipId="helpTooltipSendEmail"

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

@@ -11,7 +11,6 @@ define(
     Scheduling,
     _
   ) => {
-
     let fields = [
       {
         name: 'subject',
@@ -40,18 +39,14 @@ define(
         endpoint: 'segments',
         multiple: true,
         filter: function (segment) {
-          return !!(!segment.deleted_at);
+          return !segment.deleted_at;
         },
         getLabel: function (segment) {
-          return segment.name + ' (' + parseInt(segment.subscribers, 10).toLocaleString() + ')';
+          return `${segment.name} (${parseInt(segment.subscribers, 10).toLocaleString()})`;
         },
-        transformChangedValue: function (segment_ids) {
-          const all_segments = this.state.items;
-          return _.map(segment_ids, (id) => {
-            return _.find(all_segments, (segment) => {
-              return segment.id === id;
-            });
-          });
+        transformChangedValue: function (segmentIds) {
+          const allSegments = this.state.items;
+          return _.map(segmentIds, id => _.find(allSegments, segment => segment.id === id));
         },
         validation: {
           'data-parsley-required': true,

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

@@ -13,11 +13,10 @@ define(
     MailPoet,
     Hooks
   ) => {
-
     const jQuery = jq;
 
     const currentTime = window.mailpoet_current_time || '00:00';
-    const defaultDateTime = window.mailpoet_current_date + ' ' + '00:00:00';
+    const defaultDateTime = `${window.mailpoet_current_date} 00:00:00`;
     const timeOfDayItems = window.mailpoet_schedule_time_of_day;
     const dateDisplayFormat = window.mailpoet_date_display_format;
     const dateStorageFormat = window.mailpoet_date_storage_format;
@@ -169,15 +168,13 @@ define(
     const TimeSelect = React.createClass({
       render: function () {
         const options = Object.keys(timeOfDayItems).map(
-          (value, index) => {
-            return (
-              <option
-                key={'option-' + index}
-                value={value}>
-                { timeOfDayItems[value] }
-              </option>
-            );
-          }
+          (value, index) => (
+            <option
+              key={`option-${index}`}
+              value={value}>
+              { timeOfDayItems[value] }
+            </option>
+            )
         );
 
         return (
@@ -195,16 +192,16 @@ define(
     });
 
     const DateTime = React.createClass({
-      _DATE_TIME_SEPARATOR: ' ',
+      DATE_TIME_SEPARATOR: ' ',
       getInitialState: function () {
-        return this._buildStateFromProps(this.props);
+        return this.buildStateFromProps(this.props);
       },
       componentWillReceiveProps: function (nextProps) {
-        this.setState(this._buildStateFromProps(nextProps));
+        this.setState(this.buildStateFromProps(nextProps));
       },
-      _buildStateFromProps: function (props) {
+      buildStateFromProps: function (props) {
         const value = props.value || defaultDateTime;
-        const [date, time] = value.split(this._DATE_TIME_SEPARATOR);
+        const [date, time] = value.split(this.DATE_TIME_SEPARATOR);
         return {
           date: date,
           time: time,
@@ -220,7 +217,7 @@ define(
       },
       propagateChange: function () {
         if (this.props.onChange) {
-          return this.props.onChange({
+          this.props.onChange({
             target: {
               name: this.props.name || '',
               value: this.getDateTime(),
@@ -229,7 +226,7 @@ define(
         }
       },
       getDateTime: function () {
-        return [this.state.date, this.state.time].join(this._DATE_TIME_SEPARATOR);
+        return [this.state.date, this.state.time].join(this.DATE_TIME_SEPARATOR);
       },
       render: function () {
         return (
@@ -254,7 +251,7 @@ define(
     });
 
     const StandardScheduling = React.createClass({
-      _getCurrentValue: function () {
+      getCurrentValue: function () {
         return _.defaults(
           this.props.item[this.props.field.name] || {},
           {
@@ -264,7 +261,7 @@ define(
         );
       },
       handleValueChange: function (event) {
-        const oldValue = this._getCurrentValue();
+        const oldValue = this.getCurrentValue();
         const newValue = {};
         newValue[event.target.name] = event.target.value;
 
@@ -281,7 +278,7 @@ define(
         return this.handleValueChange(changeEvent);
       },
       isScheduled: function () {
-        return this._getCurrentValue().isScheduled === '1';
+        return this.getCurrentValue().isScheduled === '1';
       },
       getDateValidation: function () {
         return {
@@ -298,7 +295,7 @@ define(
             <span id="mailpoet_scheduling">
               <DateTime
                 name="scheduledAt"
-                value={this._getCurrentValue().scheduledAt}
+                value={this.getCurrentValue().scheduledAt}
                 onChange={this.handleValueChange}
                 disabled={this.props.field.disabled}
                 dateValidation={this.getDateValidation()} />
@@ -348,18 +345,14 @@ define(
         endpoint: 'segments',
         multiple: true,
         filter: function (segment) {
-          return !!(!segment.deleted_at);
+          return !segment.deleted_at;
         },
         getLabel: function (segment) {
-          return segment.name + ' (' + parseInt(segment.subscribers, 10).toLocaleString() + ')';
+          return `${segment.name} (${parseInt(segment.subscribers, 10).toLocaleString()})`;
         },
-        transformChangedValue: function (segment_ids) {
-          const all_segments = this.state.items;
-          return _.map(segment_ids, (id) => {
-            return _.find(all_segments, (segment) => {
-              return segment.id === id;
-            });
-          });
+        transformChangedValue: function (segmentIds) {
+          const allSegments = this.state.items;
+          return _.map(segmentIds, id => _.find(allSegments, segment => segment.id === id));
         },
         validation: {
           'data-parsley-required': true,
@@ -437,7 +430,7 @@ define(
 
         if (newsletterOptions.status === 'sent'
             || newsletterOptions.status === 'sending') {
-          options['disabled'] = 'disabled';
+          options.disabled = 'disabled';
         }
 
         return options;

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

@@ -9,8 +9,6 @@ define(
     Hooks,
     Scheduling
   ) => {
-
-
     let fields = [
       {
         name: 'subject',

assets/js/src/newsletters/templates.jsx

@@ -1,295 +1,286 @@
-define(
-  [
-    'react',
-    'underscore',
-    'mailpoet',
-    'react-router',
-    'classnames',
-    'newsletters/breadcrumb.jsx',
-    'help-tooltip.jsx',
-  ],
-  (
-    React,
-    _,
-    MailPoet,
-    Router,
-    classNames,
-    Breadcrumb,
-    HelpTooltip
-  ) => {
+import React from 'react';
+import _ from 'underscore';
+import MailPoet from 'mailpoet';
+import { confirmAlert } from 'react-confirm-alert';
+import classNames from 'classnames';
+import Breadcrumb from 'newsletters/breadcrumb.jsx';
+import HelpTooltip from 'help-tooltip.jsx';
 
-    const ImportTemplate = React.createClass({
-      saveTemplate: function (saveTemplate) {
-        const template = saveTemplate;
+const ImportTemplate = React.createClass({
+  saveTemplate: function (saveTemplate) {
+    const template = saveTemplate;
 
-        // Stringify to enable transmission of primitive non-string value types
-        if (!_.isUndefined(template.body)) {
-          template.body = JSON.stringify(template.body);
-        }
+    // Stringify to enable transmission of primitive non-string value types
+    if (!_.isUndefined(template.body)) {
+      template.body = JSON.stringify(template.body);
+    }
 
-        MailPoet.Modal.loading(true);
+    MailPoet.Modal.loading(true);
 
-        MailPoet.Ajax.post({
-          api_version: window.mailpoet_api_version,
-          endpoint: 'newsletterTemplates',
-          action: 'save',
-          data: template,
-        }).always(() => {
-          MailPoet.Modal.loading(false);
-        }).done((response) => {
-          this.props.onImport(response.data);
-        }).fail((response) => {
-          if (response.errors.length > 0) {
-            MailPoet.Notice.error(
-              response.errors.map((error) => { return error.message; }),
-              { scroll: true }
-            );
-          }
-        });
-      },
-      handleSubmit: function (e) {
-        e.preventDefault();
-
-        if (_.size(this.refs.templateFile.files) <= 0) return false;
-
-
-        const file = _.first(this.refs.templateFile.files);
-        const reader = new FileReader();
-        const saveTemplate = this.saveTemplate;
-
-        reader.onload = (e) => {
-          try {
-            saveTemplate(JSON.parse(e.target.result));
-            MailPoet.trackEvent('Emails > Template imported', {
-              'MailPoet Free version': window.mailpoet_version,
-            });
-          } catch (err) {
-            MailPoet.Notice.error(MailPoet.I18n.t('templateFileMalformedError'));
-          }
-        };
-
-        reader.readAsText(file);
-      },
-      render: function () {
-        return (
-          <div>
-            <h2>{MailPoet.I18n.t('importTemplateTitle')} <HelpTooltip
-              tooltip={MailPoet.I18n.t('helpTooltipTemplateUpload')}
-              place="right"
-              className="tooltip-help-import-template"
-            /></h2>
-            <form onSubmit={this.handleSubmit}>
-              <input type="file" placeholder={MailPoet.I18n.t('selectJsonFileToUpload')} ref="templateFile" />
-              <p className="submit">
-                <input
-                  className="button button-primary"
-                  type="submit"
-                  value={MailPoet.I18n.t('upload')} />
-              </p>
-            </form>
-          </div>
+    MailPoet.Ajax.post({
+      api_version: window.mailpoet_api_version,
+      endpoint: 'newsletterTemplates',
+      action: 'save',
+      data: template,
+    }).always(() => {
+      MailPoet.Modal.loading(false);
+    }).done((response) => {
+      this.props.onImport(response.data);
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(error => error.message),
+          { scroll: true }
         );
-      },
+      }
     });
+  },
+  handleSubmit: function (e) {
+    e.preventDefault();
 
-    const NewsletterTemplates = React.createClass({
-      getInitialState: function () {
-        return {
-          loading: false,
-          templates: [],
-        };
-      },
-      componentDidMount: function () {
-        this.getTemplates();
-      },
-      getTemplates: function () {
-        this.setState({ loading: true });
+    if (_.size(this.refs.templateFile.files) <= 0) return false;
 
-        MailPoet.Modal.loading(true);
 
-        MailPoet.Ajax.post({
-          api_version: window.mailpoet_api_version,
-          endpoint: 'newsletterTemplates',
-          action: 'getAll',
-        }).always(() => {
-          MailPoet.Modal.loading(false);
-        }).done((response) => {
-          if (this.isMounted()) {
-            if (response.data.length === 0) {
-              response.data = [
-                {
-                  name:
-                    MailPoet.I18n.t('mailpoetGuideTemplateTitle'),
-                  description:
-                    MailPoet.I18n.t('mailpoetGuideTemplateDescription'),
-                  readonly: '1',
-                },
-              ];
-            }
-            this.setState({
-              templates: response.data,
-              loading: false,
-            });
-          }
-        }).fail((response) => {
-          if (response.errors.length > 0) {
-            MailPoet.Notice.error(
-              response.errors.map((error) => { return error.message; }),
-              { scroll: true }
-            );
-          }
-        });
-      },
-      handleSelectTemplate: function (template) {
-        let body = template.body;
+    const file = _.first(this.refs.templateFile.files);
+    const reader = new FileReader();
+    const saveTemplate = this.saveTemplate;
 
-        // Stringify to enable transmission of primitive non-string value types
-        if (!_.isUndefined(body)) {
-          body = JSON.stringify(body);
-        }
-
-        MailPoet.trackEvent('Emails > Template selected', {
+    reader.onload = (evt) => {
+      try {
+        saveTemplate(JSON.parse(evt.target.result));
+        MailPoet.trackEvent('Emails > Template imported', {
           'MailPoet Free version': window.mailpoet_version,
-          'Email name': template.name,
         });
+      } catch (err) {
+        MailPoet.Notice.error(MailPoet.I18n.t('templateFileMalformedError'));
+      }
+    };
 
-        MailPoet.Ajax.post({
-          api_version: window.mailpoet_api_version,
-          endpoint: 'newsletters',
-          action: 'save',
-          data: {
-            id: this.props.params.id,
-            body: body,
-          },
-        }).done((response) => {
-          // TODO: Move this URL elsewhere
-          window.location = 'admin.php?page=mailpoet-newsletter-editor&id=' + response.data.id;
-        }).fail((response) => {
-          if (response.errors.length > 0) {
-            MailPoet.Notice.error(
-              response.errors.map((error) => { return error.message; }),
-              { scroll: true }
-            );
-          }
-        });
-      },
-      handleDeleteTemplate: function (template) {
-        this.setState({ loading: true });
-        if (
-          window.confirm(
-            (
-              MailPoet.I18n.t('confirmTemplateDeletion')
-            ).replace('%$1s', template.name)
-          )
-        ) {
-          MailPoet.Ajax.post({
-            api_version: window.mailpoet_api_version,
-            endpoint: 'newsletterTemplates',
-            action: 'delete',
-            data: {
-              id: template.id,
+    reader.readAsText(file);
+    return true;
+  },
+  render: function () {
+    return (
+      <div>
+        <h2>{MailPoet.I18n.t('importTemplateTitle')} <HelpTooltip
+          tooltip={MailPoet.I18n.t('helpTooltipTemplateUpload')}
+          place="right"
+          className="tooltip-help-import-template"
+        /></h2>
+        <form onSubmit={this.handleSubmit}>
+          <input type="file" placeholder={MailPoet.I18n.t('selectJsonFileToUpload')} ref="templateFile" />
+          <p className="submit">
+            <input
+              className="button button-primary"
+              type="submit"
+              value={MailPoet.I18n.t('upload')} />
+          </p>
+        </form>
+      </div>
+    );
+  },
+});
+
+const NewsletterTemplates = React.createClass({
+  getInitialState: function () {
+    return {
+      loading: false,
+      templates: [],
+    };
+  },
+  componentDidMount: function () {
+    this.getTemplates();
+  },
+  getTemplates: function () {
+    this.setState({ loading: true });
+
+    MailPoet.Modal.loading(true);
+
+    MailPoet.Ajax.post({
+      api_version: window.mailpoet_api_version,
+      endpoint: 'newsletterTemplates',
+      action: 'getAll',
+    }).always(() => {
+      MailPoet.Modal.loading(false);
+    }).done((response) => {
+      if (this.isMounted()) {
+        if (response.data.length === 0) {
+          response.data = [
+            {
+              name:
+                MailPoet.I18n.t('mailpoetGuideTemplateTitle'),
+              description:
+                MailPoet.I18n.t('mailpoetGuideTemplateDescription'),
+              readonly: '1',
             },
-          }).done(() => {
-            this.getTemplates();
-          }).fail((response) => {
-            if (response.errors.length > 0) {
-              MailPoet.Notice.error(
-                response.errors.map((error) => { return error.message; }),
-                { scroll: true }
-              );
-            }
-          });
-        } else {
-          this.setState({ loading: false });
+          ];
         }
-      },
-      handleShowTemplate: function (template) {
-        MailPoet.Modal.popup({
-          title: template.name,
-          template: '<div class="mailpoet_boxes_preview" style="background-color: {{ body.globalStyles.body.backgroundColor }}"><img src="{{ thumbnail }}" /></div>',
-          data: template,
+        this.setState({
+          templates: response.data,
+          loading: false,
         });
-      },
-      handleTemplateImport: function () {
-        this.getTemplates();
-      },
-      render: function () {
-        const templates = this.state.templates.map((template, index) => {
-          const deleteLink = (
-            <div className="mailpoet_delete">
-              <a
-                href="javascript:;"
-                onClick={this.handleDeleteTemplate.bind(null, template)}
-              >
-                {MailPoet.I18n.t('delete')}
-              </a>
-            </div>
-          );
-          let thumbnail = '';
-
-          if (typeof template.thumbnail === 'string'
-              && template.thumbnail.length > 0) {
-            thumbnail = (
-              <a href="javascript:;" onClick={this.handleShowTemplate.bind(null, template)}>
-                <img src={template.thumbnail} />
-                <div className="mailpoet_overlay"></div>
-              </a>
-            );
-          }
-
-          return (
-            <li key={'template-' + index}>
-              <div className="mailpoet_thumbnail">
-                { thumbnail }
-              </div>
-
-              <div className="mailpoet_description">
-                <h3>{ template.name }</h3>
-                <p>{ template.description }</p>
-              </div>
-
-              <div className="mailpoet_actions">
-                <a
-                  className="button button-secondary"
-                  onClick={this.handleShowTemplate.bind(null, template)}
-                  >
-                  {MailPoet.I18n.t('preview')}
-                </a>
-                  &nbsp;
-                <a
-                  className="button button-primary"
-                  onClick={this.handleSelectTemplate.bind(null, template)}
-                  >
-                  {MailPoet.I18n.t('select')}
-                </a>
-              </div>
-              { (template.readonly === '1') ? false : deleteLink }
-            </li>
-          );
-        });
-
-        const boxClasses = classNames(
-          'mailpoet_boxes',
-          'clearfix',
-          { mailpoet_boxes_loading: this.state.loading }
+      }
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(error => error.message),
+          { scroll: true }
         );
+      }
+    });
+  },
+  handleSelectTemplate: function (template) {
+    let body = template.body;
 
-        return (
-          <div>
-            <h1>{MailPoet.I18n.t('selectTemplateTitle')}</h1>
+    // Stringify to enable transmission of primitive non-string value types
+    if (!_.isUndefined(body)) {
+      body = JSON.stringify(body);
+    }
 
-            <Breadcrumb step="template" />
-
-            <ul className={boxClasses}>
-              { templates }
-            </ul>
-
-            <ImportTemplate onImport={this.handleTemplateImport} />
-          </div>
-        );
-      },
+    MailPoet.trackEvent('Emails > Template selected', {
+      'MailPoet Free version': window.mailpoet_version,
+      'Email name': template.name,
     });
 
-    return NewsletterTemplates;
-  }
-);
+    MailPoet.Ajax.post({
+      api_version: window.mailpoet_api_version,
+      endpoint: 'newsletters',
+      action: 'save',
+      data: {
+        id: this.props.params.id,
+        body: body,
+      },
+    }).done((response) => {
+      // TODO: Move this URL elsewhere
+      window.location = `admin.php?page=mailpoet-newsletter-editor&id=${response.data.id}`;
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(error => error.message),
+          { scroll: true }
+        );
+      }
+    });
+  },
+  handleDeleteTemplate: function (template) {
+    this.setState({ loading: true });
+    const onConfirm = () => {
+      MailPoet.Ajax.post({
+        api_version: window.mailpoet_api_version,
+        endpoint: 'newsletterTemplates',
+        action: 'delete',
+        data: {
+          id: template.id,
+        },
+      }).done(() => {
+        this.getTemplates();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(error => error.message),
+            { scroll: true }
+          );
+        }
+      });
+    };
+    const onCancel = () => {
+      this.setState({ loading: false });
+    };
+    confirmAlert({
+      title: MailPoet.I18n.t('confirmTitle'),
+      message: MailPoet.I18n.t('confirmTemplateDeletion').replace('%$1s', template.name),
+      confirmLabel: MailPoet.I18n.t('confirmLabel'),
+      cancelLabel: MailPoet.I18n.t('cancelLabel'),
+      onConfirm: onConfirm,
+      onCancel: onCancel,
+    });
+  },
+  handleShowTemplate: function (template) {
+    MailPoet.Modal.popup({
+      title: template.name,
+      template: '<div class="mailpoet_boxes_preview" style="background-color: {{ body.globalStyles.body.backgroundColor }}"><img src="{{ thumbnail }}" /></div>',
+      data: template,
+    });
+  },
+  handleTemplateImport: function () {
+    this.getTemplates();
+  },
+  render: function () {
+    const templates = this.state.templates.map((template, index) => {
+      const deleteLink = (
+        <div className="mailpoet_delete">
+          <a
+            href="javascript:;"
+            onClick={this.handleDeleteTemplate.bind(null, template)}
+          >
+            {MailPoet.I18n.t('delete')}
+          </a>
+        </div>
+      );
+      let thumbnail = '';
+
+      if (typeof template.thumbnail === 'string'
+          && template.thumbnail.length > 0) {
+        thumbnail = (
+          <a href="javascript:;" onClick={this.handleShowTemplate.bind(null, template)}>
+            <img src={template.thumbnail} />
+            <div className="mailpoet_overlay"></div>
+          </a>
+        );
+      }
+
+      return (
+        <li key={`template-${index}`}>
+          <div className="mailpoet_thumbnail">
+            { thumbnail }
+          </div>
+
+          <div className="mailpoet_description">
+            <h3>{ template.name }</h3>
+            <p>{ template.description }</p>
+          </div>
+
+          <div className="mailpoet_actions">
+            <a
+              className="button button-secondary"
+              onClick={this.handleShowTemplate.bind(null, template)}
+              >
+              {MailPoet.I18n.t('preview')}
+            </a>
+              &nbsp;
+            <a
+              className="button button-primary"
+              data-automation-id={`select_template_${index}`}
+              onClick={this.handleSelectTemplate.bind(null, template)}
+              >
+              {MailPoet.I18n.t('select')}
+            </a>
+          </div>
+          { (template.readonly === '1') ? false : deleteLink }
+        </li>
+      );
+    });
+
+    const boxClasses = classNames(
+      'mailpoet_boxes',
+      'clearfix',
+      { mailpoet_boxes_loading: this.state.loading }
+    );
+
+    return (
+      <div>
+        <h1>{MailPoet.I18n.t('selectTemplateTitle')}</h1>
+
+        <Breadcrumb step="template" />
+
+        <ul className={boxClasses}>
+          { templates }
+        </ul>
+
+        <ImportTemplate onImport={this.handleTemplateImport} />
+      </div>
+    );
+  },
+});
+
+export default NewsletterTemplates;

assets/js/src/newsletters/types.jsx

@@ -44,7 +44,7 @@ define(
         }).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 }
             );
           }
@@ -58,7 +58,7 @@ define(
             description: MailPoet.I18n.t('regularNewsletterTypeDescription'),
             action: function () {
               return (
-                <a className="button button-primary" onClick={this.createNewsletter.bind(null, 'standard')}>
+                <a className="button button-primary" data-automation-id="create_standard" onClick={this.createNewsletter.bind(null, 'standard')}>
                   {MailPoet.I18n.t('create')}
                 </a>
               );
@@ -68,7 +68,7 @@ define(
             id: 'welcome',
             title: MailPoet.I18n.t('welcomeNewsletterTypeTitle'),
             description: MailPoet.I18n.t('welcomeNewsletterTypeDescription'),
-            action: function () {
+            action: (function () {
               return (
                 <div>
                   <a href="?page=mailpoet-premium" target="_blank">
@@ -76,7 +76,7 @@ define(
                   </a>
                 </div>
               );
-            }(),
+            }()),
           },
           {
             id: 'notification',
@@ -84,7 +84,7 @@ define(
             description: MailPoet.I18n.t('postNotificationNewsletterTypeDescription'),
             action: function () {
               return (
-                <a className="button button-primary" onClick={this.setupNewsletter.bind(null, 'notification')}>
+                <a className="button button-primary" data-automation-id="create_notification" onClick={this.setupNewsletter.bind(null, 'notification')}>
                   {MailPoet.I18n.t('setUp')}
                 </a>
               );
@@ -101,24 +101,22 @@ define(
             <Breadcrumb step="type" />
 
             <ul className="mailpoet_boxes clearfix">
-              {types.map((type, index) => {
-                return (
-                  <li key={index} data-type={type.id}>
-                    <div>
-                      <div className="mailpoet_thumbnail"></div>
+              {types.map((type, index) => (
+                <li key={index} data-type={type.id}>
+                  <div>
+                    <div className="mailpoet_thumbnail"></div>
 
-                      <div className="mailpoet_description">
-                        <h3>{type.title}</h3>
-                        <p>{type.description}</p>
-                      </div>
-
-                      <div className="mailpoet_actions">
-                        {type.action}
-                      </div>
+                    <div className="mailpoet_description">
+                      <h3>{type.title}</h3>
+                      <p>{type.description}</p>
                     </div>
-                  </li>
-                );
-              }, this)}
+
+                    <div className="mailpoet_actions">
+                      {type.action}
+                    </div>
+                  </div>
+                </li>
+                ), this)}
             </ul>
           </div>
         );

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

@@ -15,7 +15,6 @@ define(
     Scheduling,
     Breadcrumb
   ) => {
-
     const field = {
       name: 'options',
       type: 'reactComponent',
@@ -56,7 +55,7 @@ define(
         }).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 }
             );
           }

assets/js/src/newsletters/types/notification/scheduling.jsx

@@ -35,11 +35,11 @@ const nthWeekDayField = {
 };
 
 const NotificationScheduling = React.createClass({
-  _getCurrentValue: function () {
+  getCurrentValue: function () {
     return (this.props.item[this.props.field.name] || {});
   },
   handleValueChange: function (name, value) {
-    const oldValue = this._getCurrentValue();
+    const oldValue = this.getCurrentValue();
     const newValue = {};
 
     newValue[name] = value;
@@ -82,7 +82,7 @@ const NotificationScheduling = React.createClass({
     );
   },
   render: function () {
-    const value = this._getCurrentValue();
+    const value = this.getCurrentValue();
     let timeOfDaySelection;
     let weekDaySelection;
     let monthDaySelection;
@@ -92,7 +92,7 @@ const NotificationScheduling = React.createClass({
       timeOfDaySelection = (
         <Select
           field={timeOfDayField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleTimeOfDayChange} />
       );
     }
@@ -101,7 +101,7 @@ const NotificationScheduling = React.createClass({
       weekDaySelection = (
         <Select
           field={weekDayField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleWeekDayChange} />
       );
     }
@@ -110,7 +110,7 @@ const NotificationScheduling = React.createClass({
       monthDaySelection = (
         <Select
           field={monthDayField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleMonthDayChange} />
       );
     }
@@ -119,7 +119,7 @@ const NotificationScheduling = React.createClass({
       nthWeekDaySelection = (
         <Select
           field={nthWeekDayField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleNthWeekDayChange} />
       );
     }
@@ -128,7 +128,7 @@ const NotificationScheduling = React.createClass({
       <div>
         <Select
           field={intervalField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleIntervalChange} />
 
         {nthWeekDaySelection}

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

@@ -11,7 +11,6 @@ define(
     MailPoet,
     Breadcrumb
   ) => {
-
     const NewsletterStandard = React.createClass({
       contextTypes: {
         router: React.PropTypes.object.isRequired,
@@ -33,7 +32,7 @@ define(
         }).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 }
             );
           }

assets/js/src/newsletters/types/welcome/scheduling.jsx

@@ -8,9 +8,7 @@ import { timeDelayValues } from 'newsletters/scheduling/common.jsx';
 const availableRoles = window.mailpoet_roles || {};
 const availableSegments = _.filter(
   window.mailpoet_segments || [],
-  (segment) => {
-    return segment.type === 'default';
-  }
+  segment => segment.type === 'default'
 );
 
 const events = {
@@ -24,7 +22,7 @@ const events = {
 const availableSegmentValues = _.object(_.map(
   availableSegments,
   (segment) => {
-    const name = segment.name + ' (' + parseInt(segment.subscribers, 10).toLocaleString() + ')';
+    const name = `${segment.name} (${parseInt(segment.subscribers, 10).toLocaleString()})`;
     return [segment.id, name];
   }
 ));
@@ -53,11 +51,11 @@ const WelcomeScheduling = React.createClass({
   contextTypes: {
     router: React.PropTypes.object.isRequired,
   },
-  _getCurrentValue: function () {
+  getCurrentValue: function () {
     return (this.props.item[this.props.field.name] || {});
   },
   handleValueChange: function (name, value) {
-    const oldValue = this._getCurrentValue();
+    const oldValue = this.getCurrentValue();
     const newValue = {};
 
     newValue[name] = value;
@@ -113,7 +111,7 @@ const WelcomeScheduling = 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 }
           );
       }
@@ -123,7 +121,7 @@ const WelcomeScheduling = React.createClass({
     this.context.router.push(`/template/${newsletterId}`);
   },
   render: function () {
-    const value = this._getCurrentValue();
+    const value = this.getCurrentValue();
     let roleSegmentSelection;
     let timeNumber;
 
@@ -131,14 +129,14 @@ const WelcomeScheduling = React.createClass({
       roleSegmentSelection = (
         <Select
           field={roleField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleRoleChange} />
       );
     } else {
       roleSegmentSelection = (
         <Select
           field={segmentField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleSegmentChange} />
       );
     }
@@ -146,7 +144,7 @@ const WelcomeScheduling = React.createClass({
       timeNumber = (
         <Text
           field={afterTimeNumberField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleAfterTimeNumberChange} />
       );
     }
@@ -155,7 +153,7 @@ const WelcomeScheduling = React.createClass({
       <div>
         <Select
           field={events}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleEventChange} />
 
         { roleSegmentSelection }
@@ -164,7 +162,7 @@ const WelcomeScheduling = React.createClass({
 
         <Select
           field={afterTimeTypeField}
-          item={this._getCurrentValue()}
+          item={this.getCurrentValue()}
           onValueChange={this.handleAfterTimeTypeChange} />
       </div>
     );

assets/js/src/notice.js

@@ -47,6 +47,8 @@ define('notice', ['mailpoet', 'jquery'], function (mp, jQuery) {
       return this;
     },
     createNotice: function () {
+      var onClose;
+      var positionAfter;
       // clone element
       this.element = jQuery('#mailpoet_notice_' + this.options.type).clone();
 
@@ -62,7 +64,6 @@ define('notice', ['mailpoet', 'jquery'], function (mp, jQuery) {
       this.element.removeAttr('id');
 
       // insert notice after its parent
-      var positionAfter;
       if (typeof this.options.positionAfter === 'object') {
         positionAfter = this.options.positionAfter;
       } else if (typeof this.options.positionAfter === 'string') {
@@ -73,7 +74,7 @@ define('notice', ['mailpoet', 'jquery'], function (mp, jQuery) {
       positionAfter.after(this.element);
 
       // setup onClose callback
-      var onClose = null;
+      onClose = null;
       if (this.options.onClose !== null) {
         onClose = this.options.onClose;
       }
@@ -114,9 +115,8 @@ define('notice', ['mailpoet', 'jquery'], function (mp, jQuery) {
     formatMessage: function (message) {
       if (Array.isArray(message)) {
         return message.join('<br />');
-      } else {
-        return message;
       }
+      return message;
     },
     show: function (options) {
       // initialize
@@ -177,12 +177,13 @@ define('notice', ['mailpoet', 'jquery'], function (mp, jQuery) {
       }
     },
     hide: function (all) {
+      var id;
       if (all !== undefined && all === true) {
         // all notices
         jQuery('.mailpoet_notice:not([id])').trigger('close');
       } else if (all !== undefined && jQuery.isArray(all)) {
         // array of ids
-        for (var id in all) {
+        for (id in all) {
           jQuery('[data-id="' + all[id] + '"]').trigger('close');
         }
       } if (all !== undefined) {

assets/js/src/num.js

@@ -18,5 +18,4 @@ define('num',
         );
       }
     };
-
   });

assets/js/src/public.js

@@ -5,8 +5,7 @@ define([
 ],
 function (
   MailPoet,
-  jQuery,
-  Parsley
+  jQuery
 ) {
   jQuery(function ($) {
     function isSameDomain(url) {
@@ -20,7 +19,7 @@ function (
       $('form.mailpoet_form').each(function () {
         var form = $(this);
 
-        form.parsley().on('form:validated', function (parsley) {
+        form.parsley().on('form:validated', function () {
           // clear messages
           form.find('.mailpoet_message > p').hide();
 
@@ -31,57 +30,57 @@ function (
         });
 
         form.parsley().on('form:submit', function (parsley) {
-          var form_data = form.serializeObject() || {};
+          var formData = form.mailpoetSerializeObject() || {};
           // check if we're on the same domain
           if (isSameDomain(window.MailPoetForm.ajax_url) === false) {
             // non ajax post request
             return true;
-          } else {
+          }
             // ajax request
-            MailPoet.Ajax.post({
-              url: window.MailPoetForm.ajax_url,
-              token: form_data.token,
-              api_version: form_data.api_version,
-              endpoint: 'subscribers',
-              action: 'subscribe',
-              data: form_data.data
-            }).fail(function (response) {
-              form.find('.mailpoet_validate_error').html(
+          MailPoet.Ajax.post({
+            url: window.MailPoetForm.ajax_url,
+            token: formData.token,
+            api_version: formData.api_version,
+            endpoint: 'subscribers',
+            action: 'subscribe',
+            data: formData.data
+          }).fail(function (response) {
+            form.find('.mailpoet_validate_error').html(
                 response.errors.map(function (error) {
                   return error.message;
                 }).join('<br />')
               ).show();
-            }).done(function (response) {
+          }).done(function (response) {
               // successfully subscribed
-              if (
+            if (
                 response.meta !== undefined
                 && response.meta.redirect_url !== undefined
               ) {
                 // go to page
-                window.location.href = response.meta.redirect_url;
-              } else {
+              window.location.href = response.meta.redirect_url;
+            } else {
                 // display success message
-                form.find('.mailpoet_validate_success').show();
-              }
+              form.find('.mailpoet_validate_success').show();
+            }
 
               // reset form
-              form.trigger('reset');
+            form.trigger('reset');
               // reset validation
-              parsley.reset();
+            parsley.reset();
 
               // resize iframe
-              if (
+            if (
                 window.frameElement !== null
                 && MailPoet !== undefined
                 && MailPoet['Iframe']
               ) {
-                MailPoet.Iframe.autoSize(window.frameElement);
-              }
-            });
-          }
+              MailPoet.Iframe.autoSize(window.frameElement);
+            }
+          });
+
           return false;
         });
       });
     });
   });
-});
+});

assets/js/src/segments/form.jsx

@@ -11,7 +11,6 @@ define(
     MailPoet,
     Form
   ) => {
-
     const fields = [
       {
         name: 'name',