Release 3.1.0

Fixes "column cannot be null" error during WP sync [MAILPOET-1191]

.circle_ci/fake-sendmail.rb

@@ -1,8 +0,0 @@
-#!/usr/bin/ruby
-path = "/tmp"
-Dir.mkdir(path) if !File.exists?(path)
-File.open("#{path}/mailpoet-#{Time.now.to_f}.txt", "w") do |f|
-    sleep 5
-    f.puts ARGV.inspect
-    $stdin.each_line { |line| f.puts line }
-end

.circle_ci/mailpoet_php.ini

@@ -1,3 +0,0 @@
-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
-; http://php.net/sendmail-path
-sendmail_path = /home/ubuntu/mailpoet/.circle_ci/fake-sendmail.rb

.circleci/apache/mailpoet.loc.conf

@@ -3,11 +3,11 @@ Listen 8080
 <VirtualHost *:8080>
   UseCanonicalName Off
   ServerName mailpoet.loc
-  DocumentRoot /home/ubuntu/mailpoet/wordpress
+  DocumentRoot /home/circleci/mailpoet/wordpress
   DirectoryIndex index.php
   LogLevel notice
 
-  <Directory /home/ubuntu/mailpoet/wordpress>
+  <Directory /home/circleci/mailpoet/wordpress>
     Require all granted
   </Directory>
 </VirtualHost>

.circleci/config.yml

@@ -0,0 +1,138 @@
+version: 2
+jobs:
+  qa_js_php5:
+    working_directory: /home/circleci/mailpoet
+    docker:
+      - image: circleci/php:5.6.30-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 php5
+      - save_cache:
+          key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+          paths:
+            - vendor
+      - save_cache:
+          key: npm-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: "QA Scripts"
+          command: ./do qa
+      - run:
+          name: "Preparing test results folder"
+          command: mkdir test-results
+      - run:
+          name: "JS tests"
+          command: |
+            mkdir test-results/mocha
+            ./do t:j test-results/mocha/junit.xml
+      - run:
+          name: "PHP Unit tests"
+          command: |
+            WP_TEST_PATH="/home/circleci/mailpoet/wordpress" ./do t:u --xml
+      - store_test_results:
+          path: test-results/mocha
+      - store_artifacts:
+          path: test-results/mocha
+          destination: mocha
+      - store_test_results:
+          path: tests/_output
+      - store_artifacts:
+          path: tests/_output
+          destination: codeception
+      - store_artifacts:
+          path: /tmp/fake-mailer/
+          destination: fake-mailer
+  acceptance_tests:
+    working_directory: /home/circleci/mailpoet
+    machine: true
+    steps:
+      - checkout
+      - run:
+          name: "Set up virtual host"
+          command: echo 127.0.0.1 mailpoet.loc | sudo tee -a /etc/hosts
+      - restore_cache:
+          key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+      - restore_cache:
+          key: npm-{{ checksum "package.json" }}
+      - run:
+          name: "Set up test environment"
+          command: |
+              sudo apt-get update
+              sudo apt-get install circleci-php-5.6.23
+              sudo rm /usr/bin/php
+              sudo ln -s /opt/circleci/php/5.6.23/bin/php /usr/bin/php
+              # Install NodeJS+NPM
+              curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+              sudo apt-get install nodejs build-essential
+              # install plugin dependencies
+              curl -sS https://getcomposer.org/installer | php
+              php composer.phar install
+              ./do install
+              ./do compile:all --env production
+      - save_cache:
+          key: composer-{{ checksum "composer.json" }}-{{ checksum "composer.lock" }}
+          paths:
+            - vendor
+      - save_cache:
+          key: npm-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run:
+          name: Run acceptance tests
+          command: |
+              docker-compose run codeception --steps --debug -vvv --html --xml
+      - store_artifacts:
+          path: tests/_output
+      - store_test_results:
+          path: tests/_output
+  php7:
+    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
+      - run:
+          name: "PHP Unit tests"
+          command: |
+            WP_TEST_PATH="/home/circleci/mailpoet/wordpress" ./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
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - qa_js_php5
+      - php7
+      - acceptance_tests

.circleci/fake-sendmail.php

@@ -0,0 +1,17 @@
+#!/usr/local/bin/php
+<?php
+$path = "/tmp/fake-mailer";
+if(!file_exists($path)) {
+  mkdir($path);
+}
+$filename = $path . '/mailpoet-' . microtime(true) . '.txt';
+$file_handle = fopen($filename, "w");
+
+$call_arguments = print_r($argv, true) . "\n";
+fwrite($file_handle, $call_arguments);
+
+while($line = fgets(STDIN)) {
+  fwrite($file_handle, $line);
+}
+
+fclose($file_handle);

.circleci/mailpoet_php.ini

@@ -0,0 +1,9 @@
+; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+; http://php.net/sendmail-path
+sendmail_path = /usr/local/bin/fake-sendmail.php
+
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = UTC
+

.circleci/setup.bash

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+function setup {
+	local version=$1
+	# install PHP dependencies for WordPress
+	if [[ $version == "php7" ]]; 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 -
+		sudo apt-get update
+		sudo apt-get install mysql-client php7.0-mysql zlib1g-dev
+		sudo docker-php-ext-install mysqli pdo pdo_mysql zip
+	else
+		sudo apt-get update
+		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 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
+	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
+	# 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
+	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
+	# 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
+}

.eslintrc.es5.json

@@ -9,91 +9,48 @@
   },
   "rules": {
     "import/no-amd": 0,
-
-
-
-
-
-    "comma-dangle": 0,
-    "space-before-function-paren": 0,
     "prefer-arrow-callback": 0,
-    "no-undef": 0,
-    "key-spacing": 0,
     "radix": 0,
     "no-alert": 0,
-    "block-scoped-var": 0,
     "guard-for-in": 0,
     "no-prototype-builtins": 0,
     "no-restricted-syntax": 0,
-    "newline-per-chained-call": 0,
     "no-useless-concat": 0,
-    "no-multi-spaces": 0,
     "no-nested-ternary": 0,
-    "semi-spacing": 0,
     "no-sequences": 0,
     "no-useless-return": 0,
     "array-callback-return": 0,
     "new-cap": 0,
-    "no-return-assign": 0,
     "no-continue": 0,
     "no-new": 0,
-    "no-cond-assign": 0,
-    "space-unary-ops": 0,
     "no-redeclare": 0,
     "no-console": 0,
     "no-empty": 0,
-    "no-extra-semi": 0,
     "no-useless-escape": 0,
-    "comma-spacing": 0,
     "wrap-iife": 0,
-    "no-unused-expressions": 0,
-    "block-spacing": 0,
-    "computed-property-spacing": 0,
     "no-plusplus": 0,
-    "array-bracket-spacing": 0,
-    "lines-around-directive": 0,
-    "no-unreachable": 0,
     "default-case": 0,
     "no-lonely-if": 0,
-    "space-before-blocks": 0,
-    "no-unneeded-ternary": 0,
     "no-mixed-operators": 0,
     "eqeqeq": 0,
-    "space-in-parens": 0,
-    "semi": 0,
     "max-len": 0,
-    "no-multi-assign": 0,
-    "no-trailing-spaces": 0,
     "global-require": 0,
     "no-throw-literal": 0,
     "no-extra-bind": 0,
-    "one-var-declaration-per-line": 0,
     "consistent-return": 0,
     "no-shadow": 0,
     "no-underscore-dangle": 0,
     "brace-style": 0,
     "no-else-return": 0,
     "no-use-before-define": 0,
-    "one-var": 0,
     "camelcase": 0,
-    "spaced-comment": 0,
-    "quotes": 0,
     "padded-blocks": 0,
-    "object-curly-spacing": 0,
     "strict": 0,
-    "vars-on-top": 0,
-    "no-var": 0,
     "space-infix-ops": 0,
-    "no-unused-vars": 0,
     "object-shorthand": 0,
     "new-parens": 0,
-    "no-param-reassign": 0,
-    "keyword-spacing": 0,
     "eol-last": 0,
     "dot-notation": 0,
-    "linebreak-style": 0,
-    "indent": 0,
-    "quote-props": 0,
     "prefer-template": 0,
     "func-names": 0
   }

.eslintrc.es6.json

@@ -10,99 +10,52 @@
       "jsx": true
     }
   },
+  "settings": {
+    "import/resolver": "webpack"
+  },
   "rules": {
+    "comma-dangle": ["error", "always-multiline"],
     "import/no-amd": 0,
-
-
     "react/no-multi-comp": 0,
     "react/sort-comp": 0,
     "react/jsx-max-props-per-line": 0,
     "react/prop-types": 0,
     "react/jsx-first-prop-new-line": 0,
-    "react/jsx-indent-props": 0,
     "react/no-is-mounted": 0,
     "react/jsx-no-target-blank": 0,
     "react/no-render-return-value": 0,
     "react/jsx-boolean-value": 0,
-    "react/jsx-indent": 0,
     "react/jsx-no-bind": 0,
     "react/no-array-index-key": 0,
     "react/self-closing-comp": 0,
-    "react/jsx-tag-spacing": 0,
     "react/jsx-closing-bracket-location": 0,
     "react/no-string-refs": 0,
-    "react/jsx-curly-spacing": 0,
     "react/no-did-mount-set-state": 0,
     "react/prefer-stateless-function": 0,
-
     "jsx-a11y/label-has-for": 0,
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-a11y/alt-text": 0,
-
-    "comma-dangle": 0,
-    "prefer-arrow-callback": 0,
     "func-names": 0,
-    "space-before-function-paren": 0,
     "object-shorthand": 0,
     "no-bitwise": 0,
     "arrow-body-style": 0,
     "prefer-template": 0,
-    "eol-last": 0,
-    "no-unused-vars": 0,
-    "no-plusplus": 0,
-    "semi": 0,
-    "keyword-spacing": 0,
     "default-case": 0,
-    "quote-props": 0,
-    "indent": 0,
-    "prefer-const": 0,
-    "arrow-parens": 0,
     "array-callback-return": 0,
     "consistent-return": 0,
-    "no-unreachable": 0,
-    "no-extra-semi": 0,
-    "import/no-unresolved": 0,
     "import/extensions": 0,
     "import/no-extraneous-dependencies": 0,
     "camelcase": 0,
-    "template-curly-spacing": 0,
-    "quotes": 0,
-    "radix": 0,
     "eqeqeq": 0,
-    "no-lonely-if": 0,
     "space-unary-ops": 0,
-    "block-scoped-var": 0,
-    "no-extra-bind": 0,
-    "no-multi-spaces": 0,
-    "class-methods-use-this": 0,
-    "key-spacing": 0,
-    "no-multiple-empty-lines": 0,
-    "space-in-parens": 0,
-    "no-case-declarations": 0,
-    "array-bracket-spacing": 0,
-    "newline-per-chained-call": 0,
-    "no-else-return": 0,
-    "max-len": 0,
-    "comma-spacing": 0,
-    "no-useless-concat": 0,
-    "no-unused-expressions": 0,
-    "no-sequences": 0,
-    "no-extra-boolean-cast": 0,
     "dot-notation": 0,
-    "no-param-reassign": 0,
     "no-shadow": 0,
-    "one-var": 0,
     "no-alert": 0,
-    "one-var-declaration-per-line": 0,
     "no-script-url": 0,
     "wrap-iife": 0,
-    "no-var": 0,
-    "vars-on-top": 0,
     "space-infix-ops": 0,
     "no-irregular-whitespace": 0,
     "padded-blocks": 0,
-    "no-underscore-dangle": 0,
+    "no-underscore-dangle": 0
-    "object-curly-spacing": 0,
-    "no-undef": 0
   }
 }

.eslintrc.tests.json

@@ -8,40 +8,9 @@
     "ecmaVersion": 6
   },
   "rules": {
-    "import/no-amd": 0,
+    // Exceptions
-
-
-
-    "no-undef": 0,
-    "one-var": 0,
-    "indent": 0,
-    "linebreak-style": 0,
-    "no-whitespace-before-property": 0,
-    "object-property-newline": 0,
-    "global-require": 0,
-    "semi": 0,
-    "keyword-spacing": 0,
-    "no-bitwise": 0,
-    "no-multi-assign": 0,
-    "newline-per-chained-call": 0,
-    "no-spaced-func": 0,
-    "func-call-spacing": 0,
-    "max-len": 0,
-    "space-unary-ops": 0,
-    "quotes": 0,
-    "no-unused-vars": 0,
-    "no-unused-expressions": 0,
-    "no-underscore-dangle": 0,
-    "quote-props": 0,
-    "no-shadow": 0,
-    "padded-blocks": 0,
-    "comma-dangle": 0,
-    "vars-on-top": 0,
-    "space-before-blocks": 0,
-    "object-curly-spacing": 0,
-    "no-param-reassign": 0,
-    "one-var-declaration-per-line": 0,
     "func-names": 0,
-    "space-before-function-paren": 0
+    // Temporary
+    "no-underscore-dangle": 0
   }
 }

.gitignore

@@ -2,8 +2,8 @@
 TODO
 composer.phar
 /vendor
+/vendor_backup
 tests/_output/*
-tests/acceptance.suite.yml
 tests/_support/_generated/*
 node_modules
 .env

Dockerfile

@@ -0,0 +1,39 @@
+FROM php:5.6-cli
+
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+RUN apt-get update && \
+    apt-get -y install \
+            git \
+            zlib1g-dev \
+            libssl-dev \
+            mysql-client \
+            sudo less  \
+        --no-install-recommends && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    docker-php-ext-install bcmath zip mysqli pdo pdo_mysql && \
+    echo "date.timezone = UTC" >> /usr/local/etc/php/php.ini && \
+    curl -sS https://getcomposer.org/installer | php -- \
+        --filename=composer \
+        --install-dir=/usr/local/bin && \
+    composer global require --optimize-autoloader "hirak/prestissimo" && \
+    curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+    chmod +x wp-cli.phar && \
+    mv wp-cli.phar /usr/local/bin/wp
+
+# Prepare application
+WORKDIR /repo
+
+# Install vendor
+COPY ./composer.json /repo/composer.json
+
+# Add source-code
+COPY . /repo
+
+WORKDIR /wp-core/wp-content/plugins/mailpoet
+ENV WP_TEST_PATH=/wp-core
+
+ADD docker-entrypoint.sh /
+
+RUN ["chmod", "+x", "/docker-entrypoint.sh"]

README.md

@@ -180,3 +180,21 @@ Run 'svn copy ...' to tag the release
 It's quite literal: you can review the changes to be pushed and if you're satisfied, run the suggested command to finish the release publishing process.
 
 If you're confident, execute `./do publish --force` and your release will be published to the remote SVN repository without manual intervention (automatically). For easier authentication you might want to set `WP_SVN_USERNAME` and `WP_SVN_PASSWORD` environment variables.
+
+# Acceptance testing
+
+We are using Gravity Flow plugin's setup as an example for our acceptance test suite: https://www.stevenhenty.com/learn-acceptance-testing-deeply/
+
+From the article above:
+
+_Windows users only: enable hard drive sharing in the Docker settings._
+
+The browser runs in a docker container. You can use a VNC client to watch the test run, follow instructions in official 
+repo: https://github.com/SeleniumHQ/docker-selenium
+If you’re on a Mac, you can open vnc://localhost:5900 in Safari to watch the tests running in Chrome. If you’re on Windows, you’ll need a VNC client. Password: secret.
+
+
+To run tests:
+```sh
+$ ./do test:acceptance
+```

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',
@@ -154,9 +155,8 @@ class RoboFile extends \Robo\Tasks {
 
   function testUnit($opts=['file' => null, 'xml' => false]) {
     $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
 
-    $command = 'vendor/bin/codecept run unit -f '.(($opts['file']) ? $opts['file'] : '');
+    $command = 'vendor/bin/codecept run unit -c codeception.unit.yml -f '.(($opts['file']) ? $opts['file'] : '');
 
     if($opts['xml']) {
       $command .= ' --xml';
@@ -166,9 +166,8 @@ class RoboFile extends \Robo\Tasks {
 
   function testCoverage($opts=['file' => null, 'xml' => false]) {
     $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
     $command = join(' ', array(
-      'vendor/bin/codecept run',
+      'vendor/bin/codecept run unit -c codeception.unit.yml ',
       (($opts['file']) ? $opts['file'] : ''),
       '--coverage',
       ($opts['xml']) ? '--coverage-xml' : '--coverage-html'
@@ -199,16 +198,26 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec($command);
   }
 
-  function testDebug() {
+  function testDebug($opts=['file' => null, 'xml' => false]) {
-    $this->_exec('vendor/bin/codecept build');
     $this->loadEnv();
-    return $this->_exec('vendor/bin/codecept run unit --debug');
+    $this->_exec('vendor/bin/codecept build -c codeception.unit.yml');
+
+    $command = 'vendor/bin/codecept run unit -c codeception.unit.yml --debug -f '.(($opts['file']) ? $opts['file'] : '');
+
+    if($opts['xml']) {
+      $command .= ' --xml';
+    }
+    return $this->_exec($command);
+  }
+
+  function testAcceptance() {
+    return $this->_exec('COMPOSE_HTTP_TIMEOUT=200 docker-compose run codeception --steps --debug -vvv');
   }
 
   function testFailed() {
     $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
+    $this->_exec('vendor/bin/codecept build -c codeception.unit.yml');
-    return $this->_exec('vendor/bin/codecept run -g failed');
+    return $this->_exec('vendor/bin/codecept run -c codeception.unit.yml -g failed');
   }
 
   function qa() {
@@ -235,14 +244,25 @@ class RoboFile extends \Robo\Tasks {
     } else {
       $severityFlag = '-n';
     }
-    return $this->_exec(
+    return $this->collectionBuilder()
-      './vendor/bin/phpcs '.
+      ->taskExec(
-      '--standard=./tasks/code_sniffer/MailPoet '.
+        './vendor/bin/phpcs '.
-      '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'.
+        '--standard=./tasks/code_sniffer/MailPoet '.
-      './lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '.
+        '--runtime-set testVersion 5.3-7.0 '.
-      'lib/ '.
+        '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'.
-      $severityFlag
+        './lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '.
-    );
+        'lib/ '.
+        $severityFlag
+      )
+      ->taskExec(
+        './vendor/bin/phpcs '.
+        '--standard=./tasks/code_sniffer/MailPoet '.
+        '--runtime-set testVersion 5.4-7.0 '.
+        '--ignore=./tests/unit/_bootstrap.php '.
+        'tests/unit/ '.
+        $severityFlag
+      )
+      ->run();
   }
 
   function svnCheckout() {
@@ -269,14 +289,16 @@ class RoboFile extends \Robo\Tasks {
   }
 
   function svnPublish($opts = ['force' => false]) {
-    $this->loadWPFunctions();
+    $this->loadEnv();
 
     $svn_dir = ".mp_svn";
-    $plugin_data = get_plugin_data('mailpoet.php', false, false);
+    $plugin_version = $this->getPluginVersion('mailpoet.php');
-    $plugin_version = $plugin_data['Version'];
+    $plugin_dist_name = 'mailpoet';
-    $plugin_dist_name = sanitize_title_with_dashes($plugin_data['Name']);
     $plugin_dist_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
@@ -395,13 +417,9 @@ class RoboFile extends \Robo\Tasks {
     $dotenv->load();
   }
 
-  protected function loadWPFunctions() {
+  protected function getPluginVersion($file) {
-    $this->loadEnv();
+    $data = file_get_contents($file);
-    define('ABSPATH', getenv('WP_TEST_PATH') . '/');
+    preg_match('/^[ \t*]*Version:(.*)$/mi', $data, $m);
-    define('WPINC', 'wp-includes');
+    return !empty($m[1]) ? trim($m[1]) : false;
-    require_once(ABSPATH . WPINC . '/functions.php');
-    require_once(ABSPATH . WPINC . '/formatting.php');
-    require_once(ABSPATH . WPINC . '/plugin.php');
-    require_once(ABSPATH . 'wp-admin/includes/plugin.php');
   }
-}
+}

assets/css/src/admin-global.styl

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

@@ -24,5 +24,6 @@
 @require 'subscribers'
 
 @require 'pages'
+@require 'pages_custom'
 
 @require 'mp2migrator'

assets/css/src/common.styl

@@ -21,6 +21,9 @@ a:focus
 .mailpoet_spaced_block
   margin: 1em 0
 
+.mailpoet_centered
+  text-align: center
+
 // select 2
 .select2-container
   width: 25em !important

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/modal.styl

@@ -45,7 +45,6 @@ body.mailpoet_modal_opened
   position: absolute
   z-index: 25
   top: 48px
-  padding-bottom: 48px
   margin: 0
 
 .mailpoet_popup_wrapper
@@ -54,6 +53,7 @@ body.mailpoet_modal_opened
   position: relative
   width: 100%
   z-index: 0
+  height: 96%
 
 .mailpoet_overlay_hidden .mailpoet_popup_wrapper
   border: 1px solid #333
@@ -75,6 +75,7 @@ body.mailpoet_modal_opened
 
 .mailpoet_popup_body
   padding: 10px 10px 10px 10px
+  height: 92%
 
 // modal panel
 #mailpoet_modal_overlay.mailpoet_panel_overlay

assets/css/src/newsletter_editor/common.styl

@@ -179,6 +179,28 @@ select.mailpoet_font-size
   width: 100%
   box-sizing: border-box
 
+.tooltip-help-designer-subject-line div, .tooltip-help-designer-preheader div
+  z-index: 100001
+
+.tooltip-help-send-preview
+  position: absolute
+  right: 15px
+
+.tooltip-help-designer-ideal-width
+  color: #656565
+  text-transform: none
+  margin-left: 5px
+  font-weight: normal
+
+.tooltip-help-designer-styles
+  position: absolute
+  top: 40px
+
+.tooltip-help-designer-full-width .dashicons
+  line-height 34px
+.tooltip-help-designer-full-width span
+  line-height 1.4em
+
 .mailpoet_button_primary
   border-color: $button-primary-border-color
   background-color: $button-primary-background-color

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

@@ -62,3 +62,9 @@ $draggable-widget-z-index = 2
   background-color: $primary-active-color
   box-shadow(inset 1px 2px 1px $primary-inset-shadow-color)
   color: $white-color
+
+.mailpoet_droppable_block
+  cursor: move
+
+  &.mailpoet_ignore_drag
+    cursor: auto

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

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

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

@@ -23,12 +23,10 @@ $block-text-line-height = $text-line-height
     border: 1px solid $transparent-color
 
   &:hover > .mailpoet_block_highlight
-  &.mailpoet_highlight > .mailpoet_block_highlight
     border: 1px dashed $block-hover-highlight-color
-
+    
-
+  &.mailpoet_highlight > .mailpoet_block_highlight
-.mailpoet_block:last-child
+    border: 1px dashed $block-hover-highlight-color !important
-  margin-bottom: 0
 
 .mailpoet_content
   position: relative

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

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

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

@@ -18,6 +18,7 @@
 .mailpoet_settings_posts_display_options
 .mailpoet_settings_posts_selection
   animation-slide-open-downwards()
+  overflow-x: hidden
 
 .mailpoet_settings_posts_show_display_options,
 .mailpoet_settings_posts_show_post_selection
@@ -26,7 +27,12 @@
 
 .mailpoet_post_selection_container
   margin-top: 20px
-  margin-bottom: 20px
+  margin-bottom: 0
+
+.mailpoet_post_scroll_container
+  overflow-y: scroll
+  overflow-x: hidden
+  max-height: 400px
 
 .mailpoet_settings_posts_single_post
   border-radius(1px)
@@ -45,3 +51,6 @@
   .mailpoet_select_post_checkbox
     margin-left: 10px
     margin-right: 8px
+
+.mailpoet_post_selection_loading
+  color: #999

assets/css/src/newsletter_editor/libraryOverrides.styl

@@ -127,9 +127,6 @@ body
   background-color: $primary-background-color
   border: 1px solid $content-border-color
 
-#mailpoet_modal_close
-  display: none
-
 .wrap > .mailpoet_notice,
 .notice
 .update-nag

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

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

assets/css/src/pages.styl

@@ -2,6 +2,7 @@
 Based on /wp-admin/css/about.css of WP 4.7.
 This is to make MailPoet pages independent of the WordPress
 About page styles that may differ across WP versions.
+Please add custom styles to pages_custom.styl
 */
 
 .mailpoet-about-wrap

assets/css/src/pages_custom.styl

@@ -0,0 +1,38 @@
+/*
+Custom styles for MailPoet pages.
+*/
+
+.mailpoet-about-wrap
+
+  .videoWrapper
+    position: relative
+    padding-bottom: 56.25% /* 16:9 */
+    /*padding-top: 25px*/
+    height: 0
+
+    iframe
+      position: absolute
+      top: 0
+      left: 0
+      width: 100%
+      height: 100%
+
+
+  .mailpoet_video
+    border: 1px solid rgba(0, 0, 0, 0.1)
+
+  #mailpoet-changelog ul
+    list-style: disc
+    padding-left: 20px
+
+  h2.mailpoet-feature-top
+    margin: 50px auto
+
+  a.button.go-to-plugin
+    margin-top: 2em
+
+  p.top-space-triple
+    margin-top: 3em
+
+  p.mailpoet-top-text
+    margin-right: 0

assets/css/src/settings.styl

@@ -9,15 +9,25 @@
   // sending methods
   .mailpoet_sending_methods
     margin 25px 0 0 0
-    li
+    display flex
-      float left
+    flex-direction row
-      position relative
+    justify-content flex-start
-      padding 15px 15px 0 15px
+    > li
+      flex-grow 1
+      flex-shrink 1
+      display flex
+      flex-direction column
+      flex-basis 0
       margin 0 25px 25px 0
-      width 300px
-      height 300px
       border 1px solid #dedede
       background-color #fff
+      max-width 500px
+      .mailpoet_sending_method_description
+        padding: 25px
+        flex-grow 1
+        flex-shrink 0
+    > li:last-child
+      margin-right 0
     h3
       text-align center
       height 54px
@@ -25,12 +35,12 @@
     .mailpoet_description
       font-size 14px
     .mailpoet_status
+      display flex
+      flex-direction row
+      justify-content space-between
+      align-items center
       background-color #2f2f2f
       color #fff
-      position absolute
-      bottom 0
-      left 0
-      right 0
       text-overflow ellipsis
       padding 15px
       span
@@ -43,23 +53,29 @@
           visibility visible
       #mailpoet_mta_activate
         visibility hidden
-    .mailpoet_actions
-      bottom 15px
-      color #fff
-      padding 0
-      position absolute
-      right 15px
-      .button-secondary
-        margin 0 -6px -4px 0
 
-  // premium key
+  .tooltip.dashicons.dashicons-editor-help
-  .mailpoet_key
+    line-height: 1.4
-    &_valid
+
-      &::before
+  ul.sending-method-benefits
-        content '✔ '
+    list-style-type: none
-    &_invalid
+    margin-bottom: 2em
-      &::before
+    margin-top: 2em
-        content: '✗ '
+
+  .sending-free-plan-button
+    background: #FF5301
+    border-color: #e64c03
+    text-shadow: 0 -1px 1px #e64c03
+    box-shadow: 0 1px 0 #e64c03
+    margin: 10px 0
+    strong
+      text-transform: uppercase
+
+  .mailpoet_success_item::before
+    content '✔ '
+
+  .mailpoet_error_item::before
+    content '✗ '
 
   // responsive
   @media screen and (max-width: 782px)
@@ -67,8 +83,10 @@
       width auto
 
     .mailpoet_sending_methods
-      li
+      flex-flow: row wrap
-        float none
+      justify-content: space-around
-        width auto
+      > li
         margin-right 0
+        flex-basis auto
+
 

assets/fonts/mailpoet.svg

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

assets/js/src/admin.js

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

assets/js/src/ajax.js

@@ -1,74 +1,87 @@
-define('ajax', ['mailpoet', 'jquery', 'underscore'], function(MailPoet, jQuery, _) {
+function requestFailed(errorMessage, xhr) {
-  'use strict';
+  if (xhr.responseJSON) {
-  MailPoet.Ajax = {
+    return xhr.responseJSON;
-      version: 0.5,
+  }
-      options: {},
+  return {
-      defaults: {
+    errors: [
-        url: null,
+      {
-        api_version: null,
+        message: errorMessage.replace('%d', xhr.status)
-        endpoint: null,
+      }
-        action: null,
+    ]
-        token: null,
+  };
-        data: {}
+}
-      },
+
-      post: function(options) {
+define('ajax', ['mailpoet', 'jquery', 'underscore'], function (mp, jQuery, _) {
-        return this.request('post', options);
+  var MailPoet = mp;
-      },
+
-      init: function(options) {
+  MailPoet.Ajax = {
-        // merge options
+    version: 0.5,
-        this.options = jQuery.extend({}, this.defaults, options);
+    options: {},
-
+    defaults: {
-        // set default url
+      url: null,
-        if(this.options.url === null) {
+      api_version: null,
-          this.options.url = ajaxurl;
+      endpoint: null,
-        }
+      action: null,
-
+      token: null,
-        // set default token
+      data: {}
-        if(this.options.token === null) {
+    },
-          this.options.token = window.mailpoet_token;
+    post: function (options) {
-        }
+      return this.request('post', options);
-      },
+    },
-      getParams: function() {
+    init: function (options) {
-        return {
+      // merge options
-          action: 'mailpoet',
+      this.options = jQuery.extend({}, this.defaults, options);
-          api_version: this.options.api_version,
+
-          token: this.options.token,
+      // set default url
-          endpoint: this.options.endpoint,
+      if (this.options.url === null) {
-          method: this.options.action,
+        this.options.url = window.ajaxurl;
-          data: this.options.data || {}
+      }
-        }
+
-      },
+      // set default token
-      request: function(method, options) {
+      if (this.options.token === null) {
-        // set options
+        this.options.token = window.mailpoet_token;
-        this.init(options);
+      }
-
+    },
-        // set request params
+    getParams: function () {
-        var params = this.getParams();
+      return {
-        var deferred = jQuery.Deferred();
+        action: 'mailpoet',
-
+        api_version: this.options.api_version,
-        // remove null values from the data object
+        token: this.options.token,
-        if (_.isObject(params.data)) {
+        endpoint: this.options.endpoint,
-          params.data = _.pick(params.data, function(value) {
+        method: this.options.action,
-            return (value !== null)
+        data: this.options.data || {}
-          })
+      };
-        }
+    },
-
+    request: function (method, options) {
-        // ajax request
+      var params;
-        deferred = jQuery.post(
+      var deferred;
-          this.options.url,
+      // set options
-          params,
+      this.init(options);
-          null,
+
-          'json'
+      // set request params
-        ).then(function(data) {
+      params = this.getParams();
-          return data;
+
-        }, function(xhr) {
+      // remove null values from the data object
-          return xhr.responseJSON;
+      if (_.isObject(params.data)) {
-        });
+        params.data = _.pick(params.data, function (value) {
-
+          return (value !== null);
-        // clear options
+        });
-        this.options = {};
+      }
-
+
-        return deferred;
+      // ajax request
-      }
+      deferred = jQuery.post(
-  };
+          this.options.url,
-});
+          params,
+          null,
+          'json'
+        ).then(function (data) {
+          return data;
+        }, _.partial(requestFailed, MailPoet.I18n.t('ajaxFailedErrorMessage')));
+
+        // clear options
+      this.options = {};
+
+      return deferred;
+    }
+  };
+});

assets/js/src/analytics_event.js

@@ -17,14 +17,15 @@
  */
 var eventsCache = [];
 
-function track(name, data){
+function track(name, data) {
-  if (typeof window.mixpanel.track !== "function") {
+  if (typeof window.mixpanel.track !== 'function') {
     window.mixpanel.init(window.mixpanelTrackingId);
   }
   window.mixpanel.track(name, data);
 }
 
-function exportMixpanel(MailPoet) {
+function exportMixpanel(mp) {
+  var MailPoet = mp;
   MailPoet.forceTrackEvent = track;
 
   if (window.mailpoet_analytics_enabled) {
@@ -37,31 +38,32 @@ function exportMixpanel(MailPoet) {
 function trackCachedEvents() {
   eventsCache.map(function (event) {
     if (window.mailpoet_analytics_enabled || event.forced) {
-      window.mixpanel.track(event.name, event.data)
+      window.mixpanel.track(event.name, event.data);
     }
   });
 }
 
-function initializeMixpanelWhenLoaded() {
-  if (typeof window.mixpanel === "object") {
-    exportMixpanel(MailPoet);
-    trackCachedEvents();
-  } else {
-    setTimeout(initializeMixpanelWhenLoaded, 100);
-  }
-}
-
 function cacheEvent(forced, name, data) {
   eventsCache.push({
     name: name,
     data: data,
-    forced: forced,
+    forced: forced
   });
 }
 
 define(
   ['mailpoet', 'underscore'],
-  function(MailPoet, _) {
+  function (mp, _) {
+    var MailPoet = mp;
+
+    function initializeMixpanelWhenLoaded() {
+      if (typeof window.mixpanel === 'object') {
+        exportMixpanel(MailPoet);
+        trackCachedEvents();
+      } else {
+        setTimeout(initializeMixpanelWhenLoaded, 100);
+      }
+    }
 
     MailPoet.trackEvent = _.partial(cacheEvent, false);
     MailPoet.forceTrackEvent = _.partial(cacheEvent, true);

assets/js/src/date.js

@@ -3,164 +3,172 @@ define('date',
     'mailpoet',
     'jquery',
     'moment'
-  ], function(
+  ], function (
-    MailPoet,
+    mp,
     jQuery,
     Moment
 ) {
-  'use strict';
+    'use strict';
 
-  MailPoet.Date = {
+    var MailPoet = mp;
-    version: 0.1,
+
-    options: {},
+    MailPoet.Date = {
-    defaults: {
+      version: 0.1,
-      offset: 0,
+      options: {},
-      format: 'F, d Y H:i:s'
+      defaults: {
-    },
+        offset: 0,
-    init: function(options) {
+        format: 'F, d Y H:i:s'
-      options = options || {};
+      },
+      init: function (opts) {
+        var options = opts || {};
 
       // set UTC offset
-      if (
+        if (
         options.offset === undefined
         && window.mailpoet_date_offset !== undefined
       ) {
-        options.offset = window.mailpoet_date_offset;
+          options.offset = window.mailpoet_date_offset;
-      }
+        }
       // set date format
-      if (
+        if (
         options.format === undefined
         && window.mailpoet_date_format !== undefined
       ) {
-        options.format = window.mailpoet_date_format;
+          options.format = window.mailpoet_date_format;
-      }
-      // merge options
-      this.options = jQuery.extend({}, this.defaults, options);
-
-      return this;
-    },
-    format: function(date, options) {
-      options = options || {};
-      this.init(options);
-
-      var date = Moment(date, this.convertFormat(options.parseFormat));
-      if (options.offset === 0) date = date.utc();
-      return date.format(this.convertFormat(this.options.format));
-    },
-    toDate: function(date, options) {
-      options = options || {};
-      this.init(options);
-
-      return Moment(date, this.convertFormat(options.parseFormat)).toDate();
-    },
-    short: function(date) {
-      return this.format(date, {
-        format: 'F, j Y'
-      });
-    },
-    full: function(date) {
-      return this.format(date, {
-        format: 'F, j Y H:i:s'
-      });
-    },
-    time: function(date) {
-      return this.format(date, {
-        format: 'H:i:s'
-      });
-    },
-    convertFormat: function(format) {
-      var format_mappings = {
-        date: {
-          d: 'DD',
-          D: 'ddd',
-          j: 'D',
-          l: 'dddd',
-          N: 'E',
-          S: 'o',
-          w: 'e',
-          z: 'DDD',
-          W: 'W',
-          F: 'MMMM',
-          m: 'MM',
-          M: 'MMM',
-          n: 'M',
-          t: '', // no equivalent
-          L: '', // no equivalent
-          o: 'YYYY',
-          Y: 'YYYY',
-          y: 'YY',
-          a: 'a',
-          A: 'A',
-          B: '', // no equivalent
-          g: 'h',
-          G: 'H',
-          h: 'hh',
-          H: 'HH',
-          i: 'mm',
-          s: 'ss',
-          u: 'SSS',
-          e: 'zz', // deprecated since version 1.6.0 of moment.js
-          I: '', // no equivalent
-          O: '', // no equivalent
-          P: '', // no equivalent
-          T: '', // no equivalent
-          Z: '', // no equivalent
-          c: '', // no equivalent
-          r: '', // no equivalent
-          U: 'X'
-        },
-        strftime: {
-          a: 'ddd',
-          A: 'dddd',
-          b: 'MMM',
-          B: 'MMMM',
-          d: 'DD',
-          e: 'D',
-          F: 'YYYY-MM-DD',
-          H: 'HH',
-          I: 'hh',
-          j: 'DDDD',
-          k: 'H',
-          l: 'h',
-          m: 'MM',
-          M: 'mm',
-          p: 'A',
-          S: 'ss',
-          u: 'E',
-          w: 'd',
-          W: 'WW',
-          y: 'YY',
-          Y: 'YYYY',
-          z: 'ZZ',
-          Z: 'z'
         }
-      };
+      // merge options
+        this.options = jQuery.extend({}, this.defaults, options);
 
-      if (!format || format.length <= 0) return format;
+        return this;
+      },
+      format: function (date, opts) {
+        var options = opts || {};
+        var momentDate;
+        this.init(options);
 
-      var replacements = format_mappings['date'];
+        momentDate = Moment(date, this.convertFormat(options.parseFormat));
+        if (options.offset === 0) momentDate = momentDate.utc();
+        return momentDate.format(this.convertFormat(this.options.format));
+      },
+      toDate: function (date, opts) {
+        var options = opts || {};
+        this.init(options);
 
-      var convertedFormat = [];
+        return Moment(date, this.convertFormat(options.parseFormat)).toDate();
-      var escapeToken = false;
+      },
+      short: function (date) {
+        return this.format(date, {
+          format: 'F, j Y'
+        });
+      },
+      full: function (date) {
+        return this.format(date, {
+          format: 'F, j Y H:i:s'
+        });
+      },
+      time: function (date) {
+        return this.format(date, {
+          format: 'H:i:s'
+        });
+      },
+      convertFormat: function (format) {
+        var replacements;
+        var convertedFormat;
+        var escapeToken;
+        var index;
+        var token;
+        var format_mappings = {
+          date: {
+            d: 'DD',
+            D: 'ddd',
+            j: 'D',
+            l: 'dddd',
+            N: 'E',
+            S: 'o',
+            w: 'e',
+            z: 'DDD',
+            W: 'W',
+            F: 'MMMM',
+            m: 'MM',
+            M: 'MMM',
+            n: 'M',
+            t: '', // no equivalent
+            L: '', // no equivalent
+            o: 'YYYY',
+            Y: 'YYYY',
+            y: 'YY',
+            a: 'a',
+            A: 'A',
+            B: '', // no equivalent
+            g: 'h',
+            G: 'H',
+            h: 'hh',
+            H: 'HH',
+            i: 'mm',
+            s: 'ss',
+            u: 'SSS',
+            e: 'zz', // deprecated since version 1.6.0 of moment.js
+            I: '', // no equivalent
+            O: '', // no equivalent
+            P: '', // no equivalent
+            T: '', // no equivalent
+            Z: '', // no equivalent
+            c: '', // no equivalent
+            r: '', // no equivalent
+            U: 'X'
+          },
+          strftime: {
+            a: 'ddd',
+            A: 'dddd',
+            b: 'MMM',
+            B: 'MMMM',
+            d: 'DD',
+            e: 'D',
+            F: 'YYYY-MM-DD',
+            H: 'HH',
+            I: 'hh',
+            j: 'DDDD',
+            k: 'H',
+            l: 'h',
+            m: 'MM',
+            M: 'mm',
+            p: 'A',
+            S: 'ss',
+            u: 'E',
+            w: 'd',
+            W: 'WW',
+            y: 'YY',
+            Y: 'YYYY',
+            z: 'ZZ',
+            Z: 'z'
+          }
+        };
 
-      for(var index = 0, token = ''; token = format.charAt(index); index++){
+        if (!format || format.length <= 0) return format;
-        if (escapeToken === true) {
+
-          convertedFormat.push('['+token+']');
+        replacements = format_mappings['date'];
-          escapeToken = false;
+        convertedFormat = [];
-        } else {
+        escapeToken = false;
-          if (token === '\\') {
+
-            // Slash escapes the next symbol to be treated as literal
+        for (index = 0, token = ''; format.charAt(index); index += 1) {
-            escapeToken = true;
+          token = format.charAt(index);
-            continue;
+          if (escapeToken === true) {
-          } else if (replacements[token] !== undefined) {
+            convertedFormat.push('[' + token + ']');
-            convertedFormat.push(replacements[token]);
+            escapeToken = false;
           } else {
-            convertedFormat.push('['+token+']');
+            if (token === '\\') {
+            // Slash escapes the next symbol to be treated as literal
+              escapeToken = true;
+              continue;
+            } else if (replacements[token] !== undefined) {
+              convertedFormat.push(replacements[token]);
+            } else {
+              convertedFormat.push('[' + token + ']');
+            }
           }
         }
-      }
 
-      return convertedFormat.join('');
+        return convertedFormat.join('');
-    }
+      }
-  };
+    };
-});
+  });

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

@@ -1,15 +1,15 @@
 define([
-  'react'
+  'react',
 ],
-function(
+(
   React
-) {
+) => {
   const FormFieldCheckbox = React.createClass({
-    onValueChange: function(e) {
+    onValueChange: function (e) {
       e.target.value = this.refs.checkbox.checked ? '1' : '0';
       return this.props.onValueChange(e);
     },
-    render: function() {
+    render: function () {
       if (this.props.field.values === undefined) {
         return false;
       }
@@ -20,15 +20,15 @@ function(
       const options = Object.keys(this.props.field.values).map(
         (value, index) => {
           return (
-            <p key={ 'checkbox-' + index }>
+            <p key={'checkbox-' + index}>
               <label>
                 <input
                   ref="checkbox"
                   type="checkbox"
                   value="1"
-                  checked={ isChecked }
+                  checked={isChecked}
-                  onChange={ this.onValueChange }
+                  onChange={this.onValueChange}
-                  name={ this.props.field.name }
+                  name={this.props.field.name}
                 />
                 { this.props.field.values[value] }
               </label>
@@ -42,8 +42,8 @@ function(
           { options }
         </div>
       );
-    }
+    },
   });
 
   return FormFieldCheckbox;
-});
+});

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

@@ -1,10 +1,10 @@
 define([
   'react',
   'moment',
-], function(
+], (
   React,
   Moment
-) {
+) => {
   class FormFieldDateYear extends React.Component {
     render() {
       const yearsRange = 100;
@@ -12,24 +12,24 @@ define([
 
       if (this.props.placeholder !== undefined) {
         years.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
       const currentYear = Moment().year();
-      for (let i = currentYear; i >= currentYear - yearsRange; i--) {
+      for (let i = currentYear; i >= currentYear - yearsRange; i -= 1) {
         years.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
          >{ i }</option>
         ));
       }
       return (
         <select
-          name={ `${this.props.name}[year]` }
+          name={`${this.props.name}[year]`}
-          value={ this.props.year }
+          value={this.props.year}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { years }
         </select>
@@ -43,23 +43,23 @@ define([
 
       if (this.props.placeholder !== undefined) {
         months.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
-      for (let i = 1; i <= 12; i++) {
+      for (let i = 1; i <= 12; i += 1) {
         months.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
          >{ this.props.monthNames[i - 1] }</option>
         ));
       }
       return (
         <select
-          name={ `${this.props.name}[month]` }
+          name={`${this.props.name}[month]`}
-          value={ this.props.month }
+          value={this.props.month}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { months }
         </select>
@@ -73,24 +73,24 @@ define([
 
       if (this.props.placeholder !== undefined) {
         days.push((
-          <option value="" key={ 0 }>{ this.props.placeholder }</option>
+          <option value="" key={0}>{ this.props.placeholder }</option>
         ));
       }
 
-      for (let i = 1; i <= 31; i++) {
+      for (let i = 1; i <= 31; i += 1) {
         days.push((
           <option
-            key={ i }
+            key={i}
-            value={ i }
+            value={i}
           >{ i }</option>
         ));
       }
 
       return (
         <select
-          name={ `${this.props.name}[day]` }
+          name={`${this.props.name}[day]`}
-          value={ this.props.day }
+          value={this.props.day}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
         >
           { days }
         </select>
@@ -104,13 +104,13 @@ define([
       this.state = {
         year: '',
         month: '',
-        day: ''
+        day: '',
-      }
+      };
     }
     componentDidMount() {
       this.extractDateParts();
     }
-    componentDidUpdate(prevProps, prevState) {
+    componentDidUpdate(prevProps) {
       if (
         (this.props.item !== undefined && prevProps.item !== undefined)
         && (this.props.item.id !== prevProps.item.id)
@@ -123,7 +123,7 @@ define([
         ? this.props.item[this.props.field.name].trim()
         : '';
 
-      if(value === '') {
+      if (value === '') {
         return;
       }
 
@@ -132,7 +132,7 @@ define([
       this.setState({
         year: dateTime.format('YYYY'),
         month: dateTime.format('M'),
-        day: dateTime.format('D')
+        day: dateTime.format('D'),
       });
     }
     formatValue() {
@@ -140,33 +140,33 @@ define([
 
       let value;
 
-      switch(dateType) {
+      switch (dateType) {
         case 'year_month_day':
           value = {
-            'year': this.state.year,
+            year: this.state.year,
-            'month': this.state.month,
+            month: this.state.month,
-            'day': this.state.day
+            day: this.state.day,
           };
-        break;
+          break;
 
         case 'year_month':
           value = {
-            'year': this.state.year,
+            year: this.state.year,
-            'month': this.state.month
+            month: this.state.month,
           };
-        break;
+          break;
 
         case 'month':
           value = {
-            'month': this.state.month
+            month: this.state.month,
           };
-        break;
+          break;
 
         case 'year':
           value = {
-            'year': this.state.year
+            year: this.state.year,
           };
-        break;
+          break;
       }
 
       return value;
@@ -181,16 +181,16 @@ define([
         field = matches[1];
         property = matches[2];
 
-        let value = ~~(e.target.value);
+        const value = ~~(e.target.value);
 
         this.setState({
-          [`${property}`]: value
+          [`${property}`]: value,
         }, () => {
           this.props.onValueChange({
             target: {
               name: field,
-              value: this.formatValue()
+              value: this.formatValue(),
-            }
+            },
           });
         });
       }
@@ -201,43 +201,40 @@ define([
       const dateType = this.props.field.params.date_type;
       const dateSelects = dateFormats[dateType][0].split('/');
 
-      const fields = dateSelects.map(type => {
+      const fields = dateSelects.map((type) => {
-        switch(type) {
+        switch (type) {
           case 'YYYY':
             return (<FormFieldDateYear
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'year' }
+              ref={'year'}
-              key={ 'year' }
+              key={'year'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              year={ this.state.year }
+              year={this.state.year}
-              placeholder={ this.props.field.year_placeholder }
+              placeholder={this.props.field.year_placeholder}
             />);
-          break;
 
           case 'MM':
             return (<FormFieldDateMonth
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'month' }
+              ref={'month'}
-              key={ 'month' }
+              key={'month'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              month={ this.state.month }
+              month={this.state.month}
-              monthNames={ monthNames }
+              monthNames={monthNames}
-              placeholder={ this.props.field.month_placeholder }
+              placeholder={this.props.field.month_placeholder}
             />);
-          break;
 
           case 'DD':
             return (<FormFieldDateDay
-              onValueChange={ this.onValueChange.bind(this) }
+              onValueChange={this.onValueChange.bind(this)}
-              ref={ 'day' }
+              ref={'day'}
-              key={ 'day' }
+              key={'day'}
-              name={ this.props.field.name }
+              name={this.props.field.name}
-              day={ this.state.day }
+              day={this.state.day}
-              placeholder={ this.props.field.day_placeholder }
+              placeholder={this.props.field.day_placeholder}
             />);
-          break;
         }
-       });
+      });
 
       return (
         <div>
@@ -245,7 +242,7 @@ define([
         </div>
       );
     }
-  };
+  }
 
   return FormFieldDate;
-});
+});

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

@@ -7,8 +7,9 @@ define([
   'form/fields/checkbox.jsx',
   'form/fields/selection.jsx',
   'form/fields/date.jsx',
+  'jquery',
 ],
-function(
+(
   React,
   FormFieldText,
   FormFieldTextarea,
@@ -16,91 +17,93 @@ function(
   FormFieldRadio,
   FormFieldCheckbox,
   FormFieldSelection,
-  FormFieldDate
+  FormFieldDate,
-) {
+  jQuery
-  var FormField = React.createClass({
+) => {
-    renderField: function(data, inline = false) {
+  const FormField = React.createClass({
-      var description = false;
+    renderField: function (data, inline = false) {
-      if(data.field.description) {
+      let description = false;
+      if (data.field.description) {
         description = (
           <p className="description">{ data.field.description }</p>
         );
       }
 
-      var field = false;
+      let field = false;
+      let dataField = data.field;
 
-      if(data.field['field'] !== undefined) {
+      if (data.field['field'] !== undefined) {
-        data.field = jQuery.merge(data.field, data.field.field);
+        dataField = jQuery.merge(dataField, data.field.field);
       }
 
-      switch(data.field.type) {
+      switch (dataField.type) {
         case 'text':
           field = (<FormFieldText {...data} />);
-        break;
+          break;
 
         case 'textarea':
           field = (<FormFieldTextarea {...data} />);
-        break;
+          break;
 
         case 'select':
           field = (<FormFieldSelect {...data} />);
-        break;
+          break;
 
         case 'radio':
           field = (<FormFieldRadio {...data} />);
-        break;
+          break;
 
         case 'checkbox':
           field = (<FormFieldCheckbox {...data} />);
-        break;
+          break;
 
         case 'selection':
           field = (<FormFieldSelection {...data} />);
-        break;
+          break;
 
         case 'date':
           field = (<FormFieldDate {...data} />);
-        break;
+          break;
 
         case 'reactComponent':
           field = (<data.field.component {...data} />);
-        break;
+          break;
       }
 
-      if(inline === true) {
+      if (inline === true) {
         return (
-          <span key={ 'field-' + (data.index || 0) }>
+          <span key={'field-' + (data.index || 0)}>
             { field }
             { description }
           </span>
         );
-      } else {
-        return (
-          <div key={ 'field-' + (data.index || 0) }>
-            { field }
-            { description }
-          </div>
-        );
       }
-    },
+      return (
-    render: function() {
+        <div key={'field-' + (data.index || 0)}>
-      var field = false;
+          { field }
+          { description }
+        </div>
+      );
 
-      if(this.props.field['fields'] !== undefined) {
+    },
-        field = this.props.field.fields.map(function(subfield, index) {
+    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
+            onValueChange: this.props.onValueChange || false,
           });
-        }.bind(this));
+        });
       } else {
         field = this.renderField(this.props);
       }
 
-      var tip = false;
+      let tip = false;
-      if(this.props.field.tip) {
+      if (this.props.field.tip) {
         tip = (
           <p className="description">{ this.props.field.tip }</p>
         );
@@ -110,7 +113,7 @@ function(
         <tr>
           <th scope="row">
             <label
-              htmlFor={ 'field_'+this.props.field.name }
+              htmlFor={'field_' + this.props.field.name}
             >
               { this.props.field.label }
               { tip }
@@ -121,7 +124,7 @@ function(
           </td>
         </tr>
       );
-    }
+    },
   });
 
   return FormField;

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

@@ -1,11 +1,11 @@
 define([
-  'react'
+  'react',
 ],
-function(
+(
   React
-) {
+) => {
   const FormFieldRadio = React.createClass({
-    render: function() {
+    render: function () {
       if (this.props.field.values === undefined) {
         return false;
       }
@@ -14,14 +14,14 @@ function(
       const options = Object.keys(this.props.field.values).map(
         (value, index) => {
           return (
-            <p key={ 'radio-' + index }>
+            <p key={'radio-' + index}>
               <label>
                 <input
                   type="radio"
-                  checked={ selected_value === value }
+                  checked={selected_value === value}
-                  value={ value }
+                  value={value}
-                  onChange={ this.props.onValueChange }
+                  onChange={this.props.onValueChange}
-                  name={ this.props.field.name } />
+                  name={this.props.field.name} />
                 { this.props.field.values[value] }
               </label>
             </p>
@@ -34,8 +34,8 @@ function(
           { options }
         </div>
       );
-    }
+    },
   });
 
   return FormFieldRadio;
-});
+});

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

@@ -1,5 +1,5 @@
-import React from 'react'
+import React from 'react';
-import _ from 'underscore'
+import _ from 'underscore';
 
 const FormFieldSelect = React.createClass({
   render() {
@@ -33,12 +33,12 @@ const FormFieldSelect = React.createClass({
         _.map(
           _.sortBy(
             _.pairs(this.props.field.values),
-            (item) => sortBy(item[0], item[1])
+            item => sortBy(item[0], item[1])
           ),
-          (item) => item[0]
+          item => item[0]
         );
     } else {
-      keys = Object.keys(this.props.field.values)
+      keys = Object.keys(this.props.field.values);
     }
 
     const options = keys.map(
@@ -50,8 +50,8 @@ const FormFieldSelect = React.createClass({
 
         return (
           <option
-            key={ 'option-' + index }
+            key={'option-' + index}
-            value={ value }>
+            value={value}>
             { this.props.field.values[value] }
           </option>
         );
@@ -60,17 +60,17 @@ const FormFieldSelect = React.createClass({
 
     return (
       <select
-        name={ this.props.field.name }
+        name={this.props.field.name}
-        id={ 'field_'+this.props.field.name }
+        id={'field_' + this.props.field.name}
-        value={ this.props.item[this.props.field.name] }
+        value={this.props.item[this.props.field.name]}
-        onChange={ this.props.onValueChange }
+        onChange={this.props.onValueChange}
         {...this.props.field.validation}
       >
         {placeholder}
         {options}
       </select>
     );
-  }
+  },
 });
 
 module.exports = FormFieldSelect;

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

@@ -2,80 +2,78 @@ define([
   'react',
   'react-dom',
   'jquery',
-  'select2'
+  'select2',
 ],
-function(
+(
   React,
   ReactDOM,
   jQuery
-) {
+) => {
-  var Selection = React.createClass({
+  const Selection = React.createClass({
-    getInitialState: function() {
+    getInitialState: function () {
       return {
         items: [],
-        select2: false
+        select2: false,
       };
     },
-    componentWillMount: function() {
+    componentWillMount: function () {
       this.loadCachedItems();
     },
-    allowMultipleValues: function() {
+    allowMultipleValues: function () {
       return (this.props.field.multiple === true);
     },
-    isSelect2Initialized: function() {
+    isSelect2Initialized: function () {
       return (this.state.select2 === true);
     },
-    componentDidMount: function() {
+    componentDidMount: function () {
-      if(this.allowMultipleValues()) {
+      if (this.allowMultipleValues()) {
         this.setupSelect2();
       }
     },
-    componentDidUpdate: function(prevProps, prevState) {
+    componentDidUpdate: function (prevProps) {
-      if(
+      if (
         (this.props.item !== undefined && prevProps.item !== undefined)
         && (this.props.item.id !== prevProps.item.id)
       ) {
-        jQuery('#'+this.refs.select.id)
+        jQuery('#' + this.refs.select.id)
           .val(this.getSelectedValues())
           .trigger('change');
       }
     },
-    componentWillUnmount: function() {
+    componentWillUnmount: function () {
-      if(this.allowMultipleValues()) {
+      if (this.allowMultipleValues()) {
         this.destroySelect2();
       }
     },
-    destroySelect2: function() {
+    destroySelect2: function () {
-      if(this.isSelect2Initialized()) {
+      if (this.isSelect2Initialized()) {
-        jQuery('#'+this.refs.select.id).select2('destroy');
+        jQuery('#' + this.refs.select.id).select2('destroy');
       }
     },
-    setupSelect2: function() {
+    setupSelect2: function () {
-      if(this.isSelect2Initialized()) {
+      if (this.isSelect2Initialized()) {
         return;
       }
 
-      var select2 = jQuery('#'+this.refs.select.id).select2({
+      const select2 = jQuery('#' + this.refs.select.id).select2({
         width: (this.props.width || ''),
-        templateResult: function(item) {
+        templateResult: function (item) {
-          if(item.element && item.element.selected) {
+          if (item.element && item.element.selected) {
             return null;
-          } else {
+          } else if (item.title) {
-            if(item.title) {
+            return item.title;
-              return item.title;
-            } else {
-              return item.text;
-            }
           }
-        }
+          return item.text;
+
+        },
       });
 
-      var hasRemoved = false;
+      let hasRemoved = false;
-      select2.on('select2:unselecting', function(e) {
+      select2.on('select2:unselecting', () => {
         hasRemoved = true;
       });
-      select2.on('select2:opening', function(e) {
+      select2.on('select2:opening', (e) => {
-        if(hasRemoved === true) {
+        if (hasRemoved === true) {
           hasRemoved = false;
           e.preventDefault();
         }
@@ -85,13 +83,13 @@ function(
 
       this.setState({ select2: true });
     },
-    getSelectedValues: function() {
+    getSelectedValues: function () {
-      if(this.props.field['selected'] !== undefined) {
+      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) {
+      } 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(function(item) {
+            return this.props.item[this.props.field.name].map((item) => {
               return item.id;
             });
           }
@@ -101,50 +99,51 @@ function(
       }
       return null;
     },
-    loadCachedItems: function() {
+    loadCachedItems: function () {
-      if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
+      if (typeof (window['mailpoet_' + this.props.field.endpoint]) !== 'undefined') {
-        var items = window['mailpoet_'+this.props.field.endpoint];
+        let items = window['mailpoet_' + this.props.field.endpoint];
 
 
-        if(this.props.field['filter'] !== undefined) {
+        if (this.props.field['filter'] !== undefined) {
           items = items.filter(this.props.field.filter);
         }
 
         this.setState({
-          items: items
+          items: items,
         });
       }
     },
-    handleChange: function(e) {
+    handleChange: function (e) {
-      if(this.props.onValueChange !== undefined) {
+      let value;
-        if(this.props.field.multiple) {
+      if (this.props.onValueChange !== undefined) {
-          value = jQuery('#'+this.refs.select.id).val();
+        if (this.props.field.multiple) {
+          value = jQuery('#' + this.refs.select.id).val();
         } else {
           value = e.target.value;
         }
-        var transformedValue = this.transformChangedValue(value);
+        const transformedValue = this.transformChangedValue(value);
         this.props.onValueChange({
-         target: {
+          target: {
             value: transformedValue,
-            name: this.props.field.name
+            name: this.props.field.name,
-          }
+          },
         });
       }
     },
-    getLabel: function(item) {
+    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) {
+    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) {
+    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;
@@ -152,24 +151,24 @@ function(
     // When it's impossible to represent the desired value in DOM,
     // this function may be used to transform the placeholder value into
     // desired value.
-    transformChangedValue: function(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;
+
     },
-    render: function() {
+    render: function () {
       const options = this.state.items.map((item, index) => {
-        let label = this.getLabel(item);
+        const label = this.getLabel(item);
-        let searchLabel = this.getSearchLabel(item);
+        const searchLabel = this.getSearchLabel(item);
-        let value = this.getValue(item);
+        const value = this.getValue(item);
 
         return (
           <option
-            key={ 'option-'+index }
+            key={'option-' + index}
-            value={ value }
+            value={value}
-            title={ searchLabel }
+            title={searchLabel}
           >
             { label }
           </option>
@@ -178,15 +177,16 @@ function(
 
       return (
         <select
-          id={ this.props.field.id || this.props.field.name }
+          id={this.props.field.id || this.props.field.name}
           ref="select"
-          data-placeholder={ this.props.field.placeholder }
+          disabled={this.props.field.disabled}
-          multiple={ this.props.field.multiple }
+          data-placeholder={this.props.field.placeholder}
-          defaultValue={ this.getSelectedValues() }
+          multiple={this.props.field.multiple}
+          defaultValue={this.getSelectedValues()}
           {...this.props.field.validation}
         >{ options }</select>
       );
-    }
+    },
   });
 
   return Selection;

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

@@ -1,4 +1,4 @@
-import React from 'react'
+import React from 'react';
 
 const FormFieldText = React.createClass({
   render() {
@@ -15,21 +15,21 @@ const FormFieldText = React.createClass({
           ? this.props.field.disabled(this.props.item)
           : false
         }
-        className={ (this.props.field.size) ? '' : 'regular-text' }
+        className={(this.props.field.size) ? '' : 'regular-text'}
         size={
           (this.props.field.size !== 'auto' && this.props.field.size > 0)
           ? this.props.field.size
           : false
         }
-        name={ this.props.field.name }
+        name={this.props.field.name}
-        id={ 'field_'+this.props.field.name }
+        id={'field_' + this.props.field.name}
-        value={ value }
+        value={value}
-        placeholder={ this.props.field.placeholder }
+        placeholder={this.props.field.placeholder}
-        onChange={ this.props.onValueChange }
+        onChange={this.props.onValueChange}
         {...this.props.field.validation}
       />
     );
-  }
+  },
 });
 
-module.exports = FormFieldText;
+module.exports = FormFieldText;

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

@@ -1,26 +1,26 @@
 define([
-  'react'
+  'react',
 ],
-function(
+(
   React
-) {
+) => {
-  var FormFieldTextarea = React.createClass({
+  const FormFieldTextarea = React.createClass({
-    render: function() {
+    render: function () {
       return (
         <textarea
           type="text"
           className="regular-text"
-          name={ this.props.field.name }
+          name={this.props.field.name}
-          id={ 'field_'+this.props.field.name }
+          id={'field_' + this.props.field.name}
-          value={ this.props.item[this.props.field.name] }
+          value={this.props.item[this.props.field.name]}
-          placeholder={ this.props.field.placeholder }
+          placeholder={this.props.field.placeholder}
-          defaultValue={ this.props.field.defaultValue }
+          defaultValue={this.props.field.defaultValue}
-          onChange={ this.props.onValueChange }
+          onChange={this.props.onValueChange}
           {...this.props.field.validation}
         />
       );
-    }
+    },
   });
 
   return FormFieldTextarea;
-});
+});

assets/js/src/form/form.jsx

@@ -4,54 +4,56 @@ define(
     'mailpoet',
     'classnames',
     'react-router',
-    'form/fields/field.jsx'
+    'form/fields/field.jsx',
+    'jquery',
   ],
-  function(
+  (
     React,
     MailPoet,
     classNames,
     Router,
-    FormField
+    FormField,
-  ) {
+    jQuery
+  ) => {
 
-    var Form = React.createClass({
+    const Form = React.createClass({
       contextTypes: {
-        router: React.PropTypes.object.isRequired
+        router: React.PropTypes.object.isRequired,
       },
-      getDefaultProps: function() {
+      getDefaultProps: function () {
         return {
           params: {},
         };
       },
-      getInitialState: function() {
+      getInitialState: function () {
         return {
           loading: false,
           errors: [],
-          item: {}
+          item: {},
         };
       },
-      getValues: function() {
+      getValues: function () {
         return this.props.item ? this.props.item : this.state.item;
       },
-      getErrors: function() {
+      getErrors: function () {
         return this.props.errors ? this.props.errors : this.state.errors;
       },
-      componentDidMount: function() {
+      componentDidMount: function () {
-        if(this.isMounted()) {
+        if (this.isMounted()) {
-          if(this.props.params.id !== undefined) {
+          if (this.props.params.id !== undefined) {
             this.loadItem(this.props.params.id);
           } else {
             this.setState({
-              item: jQuery('.mailpoet_form').serializeObject()
+              item: jQuery('.mailpoet_form').mailpoetSerializeObject(),
             });
           }
         }
       },
-      componentWillReceiveProps: function(props) {
+      componentWillReceiveProps: function (props) {
-        if(props.params.id === undefined) {
+        if (props.params.id === undefined) {
           this.setState({
             loading: false,
-            item: {}
+            item: {},
           });
           if (props.item === undefined) {
             this.refs.form.reset();
@@ -60,7 +62,7 @@ define(
           this.loadItem(props.params.id);
         }
       },
-      loadItem: function(id) {
+      loadItem: function (id) {
         this.setState({ loading: true });
 
         MailPoet.Ajax.post({
@@ -68,28 +70,28 @@ define(
           endpoint: this.props.endpoint,
           action: 'get',
           data: {
-            id: id
+            id: id,
-          }
+          },
         }).done((response) => {
           this.setState({
             loading: false,
-            item: response.data
+            item: response.data,
           });
-        }).fail((response) => {
+        }).fail(() => {
           this.setState({
             loading: false,
-            item: {}
+            item: {},
-          }, function() {
+          }, function () {
             this.context.router.push('/new');
           });
         });
       },
-      handleSubmit: function(e) {
+      handleSubmit: function (e) {
         e.preventDefault();
 
         // handle validation
-        if(this.props.isValid !== undefined) {
+        if (this.props.isValid !== undefined) {
-          if(this.props.isValid() === false) {
+          if (this.props.isValid() === false) {
             return;
           }
         }
@@ -97,18 +99,18 @@ define(
         this.setState({ loading: true });
 
         // only get values from displayed fields
-        var item = {};
+        const item = {};
-        this.props.fields.map(function(field) {
+        this.props.fields.map((field) => {
-          if(field['fields'] !== undefined) {
+          if (field['fields'] !== undefined) {
-            field.fields.map(function(subfield) {
+            field.fields.map((subfield) => {
               item[subfield.name] = this.state.item[subfield.name];
-            }.bind(this));
+            });
           } else {
             item[field.name] = this.state.item[field.name];
           }
-        }.bind(this));
+        });
         // set id if specified
-        if(this.props.params.id !== undefined) {
+        if (this.props.params.id !== undefined) {
           item.id = this.props.params.id;
         }
 
@@ -116,60 +118,61 @@ define(
           api_version: window.mailpoet_api_version,
           endpoint: this.props.endpoint,
           action: 'save',
-          data: item
+          data: item,
         }).always(() => {
           this.setState({ loading: false });
-        }).done((response) => {
+        }).done(() => {
-          if(this.props.onSuccess !== undefined) {
+          if (this.props.onSuccess !== undefined) {
             this.props.onSuccess();
           } else {
             this.context.router.push('/');
           }
 
-          if(this.props.params.id !== undefined) {
+          if (this.props.params.id !== undefined) {
             this.props.messages.onUpdate();
           } else {
             this.props.messages.onCreate();
           }
         }).fail((response) => {
-          if(response.errors.length > 0) {
+          if (response.errors.length > 0) {
             this.setState({ errors: response.errors });
           }
         });
       },
-      handleValueChange: function(e) {
+      handleValueChange: function (e) {
         if (this.props.onChange) {
           return this.props.onChange(e);
-        } else {
-          var item = this.state.item,
-            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() {
+      render: function () {
-        if(this.getErrors() !== undefined) {
+        let errors;
-          var errors = this.getErrors().map(function(error, index) {
+        if (this.getErrors() !== undefined) {
+          errors = this.getErrors().map((error, index) => {
             return (
-              <p key={ 'error-'+index } className="mailpoet_error">
+              <p key={'error-' + index} className="mailpoet_error">
                 { error.message }
               </p>
             );
           });
         }
 
-        var formClasses = classNames(
+        const formClasses = classNames(
           'mailpoet_form',
-          { 'mailpoet_form_loading': this.state.loading || this.props.loading }
+          { mailpoet_form_loading: this.state.loading || this.props.loading }
         );
 
-        var beforeFormContent = false;
+        let beforeFormContent = false;
-        var afterFormContent = false;
+        let afterFormContent = false;
 
         if (this.props.beforeFormContent !== undefined) {
           beforeFormContent = this.props.beforeFormContent(this.getValues());
@@ -179,18 +182,27 @@ define(
           afterFormContent = this.props.afterFormContent(this.getValues());
         }
 
-        var fields = this.props.fields.map(function(field, i) {
+        const fields = this.props.fields.map((field, i) => {
+          // Compose an onChange handler from the default and custom one
+          let onValueChange = this.handleValueChange;
+          if (field.onBeforeChange) {
+            onValueChange = (e) => {
+              field.onBeforeChange(e);
+              return this.handleValueChange(e);
+            };
+          }
+
           return (
             <FormField
-              field={ field }
+              field={field}
-              item={ this.getValues() }
+              item={this.getValues()}
-              onValueChange={ this.handleValueChange }
+              onValueChange={onValueChange}
-              key={ 'field-'+i } />
+              key={'field-' + i} />
           );
-        }.bind(this));
+        });
 
-        var actions = false;
+        let actions = false;
-        if(this.props.children) {
+        if (this.props.children) {
           actions = this.props.children;
         } else {
           actions = (
@@ -206,9 +218,9 @@ define(
           <div>
             { beforeFormContent }
             <form
-              id={ this.props.id }
+              id={this.props.id}
               ref="form"
-              className={ formClasses }
+              className={formClasses}
               onSubmit={
                 (this.props.onSubmit !== undefined)
                 ? this.props.onSubmit
@@ -228,7 +240,7 @@ define(
             { afterFormContent }
           </div>
         );
-      }
+      },
     });
 
     return Form;

assets/js/src/forms/forms.jsx

@@ -1,26 +1,26 @@
-import React from 'react'
+import React from 'react';
-import ReactDOM from 'react-dom'
+import ReactDOM from 'react-dom';
-import { Router, Route, IndexRoute, Link, useRouterHistory } from 'react-router'
+import { Router, Route, IndexRoute, useRouterHistory } from 'react-router';
-import { createHashHistory } from 'history'
+import { createHashHistory } from 'history';
-import FormList from 'forms/list.jsx'
+import FormList from './list.jsx';
 
 const history = useRouterHistory(createHashHistory)({ queryKey: false });
 
 const App = React.createClass({
   render() {
-    return this.props.children
+    return this.props.children;
-  }
+  },
 });
 
 const container = document.getElementById('forms_container');
 
-if(container) {
+if (container) {
   ReactDOM.render((
-    <Router history={ history }>
+    <Router history={history}>
-      <Route path="/" component={ App }>
+      <Route path="/" component={App}>
-        <IndexRoute component={ FormList } />
+        <IndexRoute component={FormList} />
-        <Route path="*" component={ FormList } />
+        <Route path="*" component={FormList} />
       </Route>
     </Router>
   ), container);
-}
+}

assets/js/src/forms/list.jsx

@@ -1,29 +1,28 @@
-import React from 'react'
+import React from 'react';
-import ReactDOM from 'react-dom'
+import classNames from 'classnames';
-import { Router, Link } from 'react-router'
+import MailPoet from 'mailpoet';
-import Listing from 'listing/listing.jsx'
+import jQuery from 'jquery';
-import classNames from 'classnames'
+import Listing from '../listing/listing.jsx';
-import MailPoet from 'mailpoet'
 
 const columns = [
   {
     name: 'name',
     label: MailPoet.I18n.t('formName'),
-    sortable: true
+    sortable: true,
   },
   {
     name: 'segments',
-    label: MailPoet.I18n.t('segments')
+    label: MailPoet.I18n.t('segments'),
   },
   {
     name: 'signups',
-    label: MailPoet.I18n.t('signups')
+    label: MailPoet.I18n.t('signups'),
   },
   {
     name: 'created_at',
     label: MailPoet.I18n.t('createdOn'),
-    sortable: true
+    sortable: true,
-  }
+  },
 ];
 
 const messages = {
@@ -71,38 +70,38 @@ const messages = {
       ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
-  }
+  },
 };
 
 const bulk_actions = [
   {
     name: 'trash',
     label: MailPoet.I18n.t('moveToTrash'),
-    onSuccess: messages.onTrash
+    onSuccess: messages.onTrash,
-  }
+  },
 ];
 
 const item_actions = [
   {
     name: 'edit',
     label: MailPoet.I18n.t('edit'),
-    link: function(item) {
+    link: function (item) {
       return (
-        <a href={ `admin.php?page=mailpoet-form-editor&id=${item.id}` }>{MailPoet.I18n.t('edit')}</a>
+        <a href={`admin.php?page=mailpoet-form-editor&id=${item.id}`}>{MailPoet.I18n.t('edit')}</a>
       );
-    }
+    },
   },
   {
     name: 'duplicate',
     label: MailPoet.I18n.t('duplicate'),
-    onClick: function(item, refresh) {
+    onClick: function (item, refresh) {
       return MailPoet.Ajax.post({
         api_version: window.mailpoet_api_version,
         endpoint: 'forms',
         action: 'duplicate',
         data: {
-          id: item.id
+          id: item.id,
-        }
+        },
       }).done((response) => {
         MailPoet.Notice.success(
           (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.data.name)
@@ -111,16 +110,16 @@ const item_actions = [
       }).fail((response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map(function(error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
             { scroll: true }
           );
         }
       });
-    }
+    },
   },
   {
-    name: 'trash'
+    name: 'trash',
-  }
+  },
 ];
 
 const FormList = React.createClass({
@@ -128,28 +127,28 @@ const FormList = React.createClass({
     MailPoet.Ajax.post({
       api_version: window.mailpoet_api_version,
       endpoint: 'forms',
-      action: 'create'
+      action: 'create',
     }).done((response) => {
-      window.location = mailpoet_form_edit_url + response.data.id;
+      window.location = window.mailpoet_form_edit_url + response.data.id;
     }).fail((response) => {
       if (response.errors.length > 0) {
         MailPoet.Notice.error(
-          response.errors.map(function(error) { return error.message; }),
+          response.errors.map((error) => { return error.message; }),
           { scroll: true }
         );
       }
     });
   },
   renderItem(form, actions) {
-    let row_classes = classNames(
+    const row_classes = classNames(
       'manage-column',
       'column-primary',
       'has-row-actions'
     );
 
-    let segments = mailpoet_segments.filter(function(segment) {
+    let segments = window.mailpoet_segments.filter((segment) => {
       return (jQuery.inArray(segment.id, form.segments) !== -1);
-    }).map(function(segment) {
+    }).map((segment) => {
       return segment.name;
     }).join(', ');
 
@@ -159,11 +158,11 @@ const FormList = React.createClass({
 
     return (
       <div>
-        <td className={ row_classes }>
+        <td className={row_classes}>
           <strong>
             <a
               className="row-title"
-              href={ `admin.php?page=mailpoet-form-editor&id=${form.id}` }
+              href={`admin.php?page=mailpoet-form-editor&id=${form.id}`}
             >{ form.name }</a>
           </strong>
           { actions }
@@ -187,25 +186,25 @@ const FormList = React.createClass({
           {MailPoet.I18n.t('pageTitle')} <a
             className="page-title-action"
             href="javascript:;"
-            onClick={ this.createForm }
+            onClick={this.createForm}
           >{MailPoet.I18n.t('new')}</a>
         </h1>
 
         <Listing
-          limit={ mailpoet_listing_per_page }
+          limit={window.mailpoet_listing_per_page}
-          location={ this.props.location }
+          location={this.props.location}
-          params={ this.props.params }
+          params={this.props.params}
-          messages={ messages }
+          messages={messages}
-          search={ false }
+          search={false}
           endpoint="forms"
-          onRenderItem={ this.renderItem }
+          onRenderItem={this.renderItem}
-          columns={ columns }
+          columns={columns}
-          bulk_actions={ bulk_actions }
+          bulk_actions={bulk_actions}
-          item_actions={ item_actions }
+          item_actions={item_actions}
         />
       </div>
     );
-  }
+  },
 });
 
 module.exports = FormList;

assets/js/src/handlebars_helpers.js

@@ -1,117 +1,119 @@
-define('handlebars_helpers', ['handlebars'], function(Handlebars) {
+define('handlebars_helpers', ['handlebars'], function (Handlebars) {
   // Handlebars helpers
-  Handlebars.registerHelper('concat', function() {
+  Handlebars.registerHelper('concat', function () {
-      var size = (arguments.length - 1),
+    var size = (arguments.length - 1);
-          output = '';
+    var output = '';
-      for(var i = 0; i < size; i++) {
+    var i;
-          output += arguments[i];
+    for (i = 0; i < size; i++) {
-      };
+      output += arguments[i];
-      return output;
+    }
+    return output;
   });
 
-  Handlebars.registerHelper('number_format', function(value, block) {
+  Handlebars.registerHelper('number_format', function (value) {
-      return Number(value).toLocaleString();
+    return Number(value).toLocaleString();
   });
-  Handlebars.registerHelper('date_format', function(timestamp, block) {
+  Handlebars.registerHelper('date_format', function (timestamp, block) {
-    if(window.moment) {
+    var f;
-          if(timestamp === undefined || isNaN(timestamp) || timestamp <= 0) {
+    if (window.moment) {
-              return;
+      if (timestamp === undefined || isNaN(timestamp) || timestamp <= 0) {
-          }
+        return;
+      }
 
-          // set date format
+      // set date format
-          var f = block.hash.format || "MMM Do, YYYY";
+      f = block.hash.format || 'MMM Do, YYYY';
-          // check if we passed a timestamp
+      // check if we passed a timestamp
-          if(parseInt(timestamp, 10) == timestamp) {
+      if (parseInt(timestamp, 10) == timestamp) {
-              return moment.unix(timestamp).format(f);
+        return window.moment.unix(timestamp).format(f);
-          } else {
+      } else {
-              return moment.utc(timestamp).format(f);
+        return window.moment.utc(timestamp).format(f);
-          }
+      }
     } else {
       return timestamp;
-    };
+    }
   });
 
-  Handlebars.registerHelper('cycle', function(value, block) {
+  Handlebars.registerHelper('cycle', function (value, block) {
     var values = value.split(' ');
     return values[block.data.index % (values.length + 1)];
   });
 
   Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
-      switch (operator) {
+    switch (operator) {
-          case '==':
+      case '==':
-              return (v1 == v2) ? options.fn(this) : options.inverse(this);
+        return (v1 == v2) ? options.fn(this) : options.inverse(this);
-          case '===':
+      case '===':
-              return (v1 === v2) ? options.fn(this) : options.inverse(this);
+        return (v1 === v2) ? options.fn(this) : options.inverse(this);
-          case '!=':
+      case '!=':
-              return (v1 != v2) ? options.fn(this) : options.inverse(this);
+        return (v1 != v2) ? options.fn(this) : options.inverse(this);
-          case '!==':
+      case '!==':
-              return (v1 !== v2) ? options.fn(this) : options.inverse(this);
+        return (v1 !== v2) ? options.fn(this) : options.inverse(this);
-          case '<':
+      case '<':
-              return (v1 < v2) ? options.fn(this) : options.inverse(this);
+        return (v1 < v2) ? options.fn(this) : options.inverse(this);
-          case '<=':
+      case '<=':
-              return (v1 <= v2) ? options.fn(this) : options.inverse(this);
+        return (v1 <= v2) ? options.fn(this) : options.inverse(this);
-          case '>':
+      case '>':
-              return (v1 > v2) ? options.fn(this) : options.inverse(this);
+        return (v1 > v2) ? options.fn(this) : options.inverse(this);
-          case '>=':
+      case '>=':
-              return (v1 >= v2) ? options.fn(this) : options.inverse(this);
+        return (v1 >= v2) ? options.fn(this) : options.inverse(this);
-          case '&&':
+      case '&&':
-              return (v1 && v2) ? options.fn(this) : options.inverse(this);
+        return (v1 && v2) ? options.fn(this) : options.inverse(this);
-          case '||':
+      case '||':
-              return (v1 || v2) ? options.fn(this) : options.inverse(this);
+        return (v1 || v2) ? options.fn(this) : options.inverse(this);
-          case 'in':
+      case 'in':
-              var values = v2.split(',');
+        return (v2.indexOf(v1) !== -1) ? options.fn(this) : options.inverse(this);
-              return (v2.indexOf(v1) !== -1) ? options.fn(this) : options.inverse(this);
+      default:
-          default:
+        return options.inverse(this);
-              return options.inverse(this);
+    }
-      }
   });
 
-  Handlebars.registerHelper('nl2br', function(value, block) {
+  Handlebars.registerHelper('nl2br', function (value) {
-      return value.gsub("\n", "<br />");
+    return value.gsub('\n', '<br />');
   });
 
-  Handlebars.registerHelper('json_encode', function(value, block) {
+  Handlebars.registerHelper('json_encode', function (value) {
-      return JSON.stringify(value);
+    return JSON.stringify(value);
   });
 
-  Handlebars.registerHelper('json_decode', function(value, block) {
+  Handlebars.registerHelper('json_decode', function (value) {
-      return JSON.parse(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;
+    var url = window.location.protocol + '//' + window.location.host + window.location.pathname;
 
-      return url + value;
+    return url + value;
   });
-  Handlebars.registerHelper('emailFromMailto', function(value) {
+  Handlebars.registerHelper('emailFromMailto', function (value) {
-      var mailtoMatchingRegex = /^mailto\:/i;
+    var mailtoMatchingRegex = /^mailto\:/i;
-      if (typeof value === 'string' && value.match(mailtoMatchingRegex)) {
+    if (typeof value === 'string' && value.match(mailtoMatchingRegex)) {
-          return value.replace(mailtoMatchingRegex, '');
+      return value.replace(mailtoMatchingRegex, '');
-      } else {
+    } else {
-          return value;
+      return value;
-      }
+    }
   });
-  Handlebars.registerHelper('lookup', function(obj, field, options) {
+  Handlebars.registerHelper('lookup', function (obj, field) {
-      return obj && obj[field];
+    return obj && obj[field];
   });
 
 
-  Handlebars.registerHelper('rsa_key', function(value, block) {
+  Handlebars.registerHelper('rsa_key', function (value) {
-      // extract all lines into an array
+    var lines;
-      if(value === undefined) return '';
+    // extract all lines into an array
+    if (value === undefined) return '';
 
-      var lines = value.trim().split("\n");
+    lines = value.trim().split('\n');
 
       // remove header & footer
-      lines.shift();
+    lines.shift();
-      lines.pop();
+    lines.pop();
 
       // return concatenated lines
-      return lines.join('');
+    return lines.join('');
   });
 
-  Handlebars.registerHelper('trim', function(value, block) {
+  Handlebars.registerHelper('trim', function (value) {
-      if(value === null || value === undefined) return '';
+    if (value === null || value === undefined) return '';
-      return value.trim();
+    return value.trim();
   });
 
   /**
@@ -125,32 +127,33 @@ define('handlebars_helpers', ['handlebars'], function(Handlebars) {
    * @return {String}          The truncated string.
    */
   Handlebars.registerHelper('ellipsis', function (str, limit, append) {
-      if (append === undefined) {
+    var strAppend = append;
-          append = '';
+    var sanitized = str.replace(/(<([^>]+)>)/g, '');
-      }
+    if (strAppend === undefined) {
-      var sanitized = str.replace(/(<([^>]+)>)/g, '');
+      strAppend = '';
-      if (sanitized.length > limit) {
+    }
-          return sanitized.substr(0, limit - append.length) + append;
+    if (sanitized.length > limit) {
-      } else {
+      return sanitized.substr(0, limit - strAppend.length) + strAppend;
-          return sanitized;
+    } else {
-      }
+      return sanitized;
+    }
   });
 
   Handlebars.registerHelper('getNumber', function (string) {
-      return parseInt(string, 10);
+    return parseInt(string, 10);
   });
 
-  Handlebars.registerHelper('fontWithFallback', function(font) {
+  Handlebars.registerHelper('fontWithFallback', function (font) {
-    switch(font) {
+    switch (font) {
       case 'Arial': return new Handlebars.SafeString("Arial, 'Helvetica Neue', Helvetica, sans-serif");
       case 'Comic Sans MS': return new Handlebars.SafeString("'Comic Sans MS', 'Marker Felt-Thin', Arial, sans-serif");
       case 'Courier New': return new Handlebars.SafeString("'Courier New', Courier, 'Lucida Sans Typewriter', 'Lucida Typewriter', monospace");
       case 'Georgia': return new Handlebars.SafeString("Georgia, Times, 'Times New Roman', serif");
       case 'Lucida': return new Handlebars.SafeString("'Lucida Sans Unicode', 'Lucida Grande', sans-serif");
-      case 'Tahoma': return new Handlebars.SafeString("Tahoma, Verdana, Segoe, sans-serif");
+      case 'Tahoma': return new Handlebars.SafeString('Tahoma, Verdana, Segoe, sans-serif');
       case 'Times New Roman': return new Handlebars.SafeString("'Times New Roman', Times, Baskerville, Georgia, serif");
       case 'Trebuchet MS': return new Handlebars.SafeString("'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif");
-      case 'Verdana': return new Handlebars.SafeString("Verdana, Geneva, sans-serif");
+      case 'Verdana': return new Handlebars.SafeString('Verdana, Geneva, sans-serif');
       default: return font;
     }
   });

assets/js/src/help-tooltip.js

@@ -0,0 +1,22 @@
+define('helpTooltip', ['mailpoet', 'react', 'react-dom', 'help-tooltip.jsx'],
+  function (mp, React, ReactDOM, TooltipComponent) {
+    'use strict';
+
+    var MailPoet = mp;
+
+    MailPoet.helpTooltip = {
+      show: function (domContainerNode, opts) {
+
+        ReactDOM.render(React.createElement(
+          TooltipComponent, {
+            tooltip: opts.tooltip,
+            tooltipId: opts.tooltipId,
+            place: opts.place
+          }
+        ), domContainerNode);
+      }
+    };
+
+  }
+);
+

assets/js/src/help-tooltip.jsx

@@ -0,0 +1,63 @@
+import React from 'react';
+import ReactTooltip from 'react-tooltip';
+import ReactHtmlParser from 'react-html-parser';
+
+function Tooltip(props) {
+  let tooltipId = props.tooltipId;
+  let tooltip = props.tooltip;
+  // tooltip ID must be unique, defaults to tooltip text
+  if (!props.tooltipId && typeof props.tooltip === 'string') {
+    tooltipId = props.tooltip;
+  }
+
+  if (typeof props.tooltip === 'string') {
+    tooltip = (<span
+      style={{
+        pointerEvents: 'all',
+        maxWidth: '400',
+        display: 'inline-block',
+      }}
+    >
+      {ReactHtmlParser(props.tooltip)}
+    </span>);
+  }
+
+  return (
+    <span className={props.className}>
+      <span
+        style={{
+          cursor: 'pointer',
+        }}
+        className="tooltip dashicons dashicons-editor-help"
+        data-event="click"
+        data-tip
+        data-for={tooltipId}
+      >
+      </span>
+      <ReactTooltip
+        globalEventOff="click"
+        multiline={true}
+        id={tooltipId}
+        efect="solid"
+        place={props.place}
+        >
+        {tooltip}
+      </ReactTooltip>
+    </span>
+  );
+}
+
+Tooltip.propTypes = {
+  tooltipId: React.PropTypes.string,
+  tooltip: React.PropTypes.node.isRequired,
+  place: React.PropTypes.string,
+  className: React.PropTypes.string,
+};
+
+Tooltip.defaultProps = {
+  tooltipId: undefined,
+  place: undefined,
+  className: undefined,
+};
+
+module.exports = Tooltip;

assets/js/src/help/help.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+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 SystemInfo from 'help/system_info.jsx';
+
+const history = useRouterHistory(createHashHistory)({ queryKey: false });
+
+const App = React.createClass({
+  render() {
+    return this.props.children;
+  },
+});
+
+const container = document.getElementById('help_container');
+
+if (container) {
+
+  ReactDOM.render((
+    <Router history={history}>
+      <Route path="/" component={App}>
+        <IndexRedirect to="knowledgeBase" />
+        {/* Pages */}
+        <Route path="knowledgeBase(/)**" params={{ tab: 'knowledgeBase' }} component={KnowledgeBase} />
+        <Route path="systemInfo(/)**" params={{ tab: 'systemInfo' }} component={SystemInfo} />
+      </Route>
+    </Router>
+  ), container);
+
+}

assets/js/src/help/knowledge_base.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import MailPoet from 'mailpoet';
+
+import Tabs from './tabs.jsx';
+
+function KnowledgeBase() {
+
+  return (
+    <div>
+
+      <Tabs tab="knowledgeBase" />
+
+      <p>{MailPoet.I18n.t('knowledgeBaseIntro')}</p>
+      <ul>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/116-common-problems">Common Problems</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/165-newsletters">Newsletters</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/156-migration-questions">Migration Questions</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/149-sending-methods">Sending Methods</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/139-subscription-forms">Subscription Forms</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/114-getting-started">Getting Started</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/123-newsletter-designer">Newsletter Designer</a></li>
+        <li><a target="_blank" href="http://beta.docs.mailpoet.com/category/121-subscribers-and-lists">Subscribers and Lists</a></li>
+      </ul>
+      <a target="_blank" href="http://beta.docs.mailpoet.com/" className="button button-primary">{MailPoet.I18n.t('knowledgeBaseButton')}</a>
+    </div>
+  );
+}
+
+module.exports = KnowledgeBase;

assets/js/src/help/system_info.jsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import MailPoet from 'mailpoet';
+import _ from 'underscore';
+
+import Tabs from './tabs.jsx';
+
+function handleFocus(event) {
+  event.target.select();
+}
+
+function printData(data) {
+  if (_.isObject(data)) {
+    const printableData = Object.keys(data).map((key) => {
+      return `${key}: ${data[key]}`;
+    });
+
+    return (<textarea
+      readOnly={true}
+      onFocus={handleFocus}
+      value={printableData.join('\n')}
+      style={{
+        width: '100%',
+        height: '400px',
+      }}
+    />);
+  }
+  return (<p>{MailPoet.I18n.t('systemInfoDataError')}</p>);
+
+}
+
+function KnowledgeBase() {
+  const data = window.help_scout_data;
+  return (
+    <div>
+
+      <Tabs tab="systemInfo" />
+
+      <div className="mailpoet_notice notice inline notice-success" style={{ marginTop: '1em' }}>
+        <p>{MailPoet.I18n.t('systemInfoIntro')}</p>
+      </div>
+
+      {printData(data)}
+    </div>
+  );
+}
+
+module.exports = KnowledgeBase;

assets/js/src/help/tabs.jsx

@@ -0,0 +1,46 @@
+import React from 'react';
+import { Link } from 'react-router';
+import classNames from 'classnames';
+import MailPoet from 'mailpoet';
+
+const tabs = [
+  {
+    name: 'knowledgeBase',
+    label: MailPoet.I18n.t('tabKnowledgeBaseTitle'),
+    link: '/knowledgeBase',
+  },
+  {
+    name: 'systemInfo',
+    label: MailPoet.I18n.t('tabSystemInfoTitle'),
+    link: '/systemInfo',
+  },
+];
+
+function Tabs(props) {
+
+  const tabLinks = tabs.map((tab, index) => {
+    const tabClasses = classNames(
+      'nav-tab',
+      { 'nav-tab-active': (props.tab === tab.name) }
+    );
+
+    return (
+      <Link
+        key={'tab-' + index}
+        className={tabClasses}
+        to={tab.link}
+      >{ tab.label }</Link>
+    );
+  });
+
+  return (
+    <h2 className="nav-tab-wrapper">
+      { tabLinks }
+    </h2>
+  );
+}
+
+Tabs.propTypes = { tab: React.PropTypes.string };
+Tabs.defaultProps = { tab: 'knowledgeBase' };
+
+module.exports = Tabs;

assets/js/src/helpscout.js

@@ -1,3 +0,0 @@
-define([], function() {
-  !function(e,o,n){window.HSCW=o,window.HS=n,n.beacon=n.beacon||{};var t=n.beacon;t.userConfig={},t.readyQueue=[],t.config=function(e){this.userConfig=e},t.ready=function(e){this.readyQueue.push(e)},o.config={docs:{enabled:!0,baseUrl:"//mailpoet3.helpscoutdocs.com/"},contact:{enabled:!0,formId:"aa21ca80-a4f5-11e6-91aa-0a5fecc78a4d"}};var r=e.getElementsByTagName("script")[0],c=e.createElement("script");c.type="text/javascript",c.async=!0,c.src="https://djtflbt20bdde.cloudfront.net/",r.parentNode.insertBefore(c,r)}(document,window.HSCW||{},window.HS||{});
-});

assets/js/src/i18n.js

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

assets/js/src/iframe.js

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

assets/js/src/jquery.serialize_object.js

@@ -2,9 +2,10 @@ define(
   [
     'jquery'
   ],
-  function(
+  function (
-    $
+    jQuery
   ) {
+    var $ = jQuery;
     // Combination of jQuery.deparam and jQuery.serializeObject by Ben Alman.
     /*!
      * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
@@ -22,31 +23,31 @@ define(
      * Dual licensed under the MIT and GPL licenses.
      * http://benalman.com/about/license/
      */
-    $.fn.serializeObject = function(coerce) {
+    $.fn.mailpoetSerializeObject = function (coerce) {
-      var obj = {},
+      var obj = {};
-        coerce_types = { 'true': !0, 'false': !1, 'null': null };
+      var coerce_types = { true: !0, false: !1, null: null };
 
       // Iterate over all name=value pairs.
-      $.each( this.serializeArray(), function(j,v){
+      $.each(this.serializeArray(), function (j, v) {
-        var key = v.name,
+        var key = v.name;
-          val = v.value,
+        var val = v.value;
-          cur = obj,
+        var cur = obj;
-          i = 0,
+        var i = 0;
 
-          // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+        // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
-          // into its component parts.
+        // into its component parts.
-          keys = key.split( '][' ),
+        var keys = key.split('][');
-          keys_last = keys.length - 1;
+        var keys_last = 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[keys_last])) {
           // Remove the trailing ] from the last keys part.
-          keys[ keys_last ] = keys[ keys_last ].replace( /\]$/, '' );
+          keys[keys_last] = keys[keys_last].replace(/\]$/, '');
 
           // Split first keys part into two parts on the [ and add them back onto
           // the beginning of the keys array.
-          keys = keys.shift().split('[').concat( keys );
+          keys = keys.shift().split('[').concat(keys);
 
           keys_last = keys.length - 1;
         } else {
@@ -55,14 +56,14 @@ define(
         }
 
         // Coerce values.
-        if ( coerce ) {
+        if (coerce) {
-          val = val && !isNaN(val)            ? +val              // number
+          val = val && !isNaN(val) ? +val              // number
-            : val === 'undefined'             ? undefined         // undefined
+            : val === 'undefined' ? undefined         // undefined
             : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
             : val;                                                // string
         }
 
-        if ( keys_last ) {
+        if (keys_last) {
           // 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
@@ -72,25 +73,26 @@ 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 <= keys_last; i++) {
             key = keys[i] === '' ? cur.length : keys[i];
-            cur = cur[key] = i < keys_last
+            cur[key] = i < keys_last
-              ? cur[key] || ( keys[i+1] && isNaN( keys[i+1] ) ? {} : [] )
+              ? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
               : val;
+            cur = cur[key];
           }
 
         } else {
           // Simple key, even simpler rules, since only scalars and shallow
           // arrays are allowed.
 
-          if ( $.isArray( obj[key] ) ) {
+          if ($.isArray(obj[key])) {
             // val is already an array, so push on the next value.
-            obj[key].push( val );
+            obj[key].push(val);
 
-          } else if ( obj[key] !== undefined ) {
+          } else if (obj[key] !== undefined) {
             // val isn't an array, but since a second value has been specified,
             // convert val into an array.
-            obj[key] = [ obj[key], val ];
+            obj[key] = [obj[key], val];
 
           } else {
             // val is a scalar.
@@ -104,4 +106,4 @@ define(
 
     return $;
   }
-);
+);

assets/js/src/listing/bulk_actions.jsx

@@ -1,84 +1,84 @@
 define([
   'react',
-  'mailpoet'
+  'mailpoet',
 ],
-function(
+(
   React,
   MailPoet
-) {
+) => {
-  var ListingBulkActions = React.createClass({
+  const ListingBulkActions = React.createClass({
-    getInitialState: function() {
+    getInitialState: function () {
       return {
         action: false,
-        extra: false
+        extra: false,
-      }
+      };
     },
-    handleChangeAction: function(e) {
+    handleChangeAction: function (e) {
       this.setState({
         action: e.target.value,
-        extra: false
+        extra: false,
-      }, function() {
+      }, () => {
-        var action = this.getSelectedAction();
+        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)
+            extra: action.onSelect(e),
           });
         }
-      }.bind(this));
+      });
     },
-    handleApplyAction: function(e) {
+    handleApplyAction: function (e) {
       e.preventDefault();
 
-      var action = this.getSelectedAction();
+      const action = this.getSelectedAction();
 
-      if(action === null) {
+      if (action === null) {
         return;
       }
 
-      var selected_ids = (this.props.selection !== 'all')
+      const selected_ids = (this.props.selection !== 'all')
         ? this.props.selected_ids
         : [];
 
-      var data = (action['getData'] !== undefined)
+      const data = (action['getData'] !== undefined)
         ? action.getData()
         : {};
 
       data.action = this.state.action;
 
-      var onSuccess = function() {};
+      let onSuccess = function () {};
-      if(action['onSuccess'] !== undefined) {
+      if (action['onSuccess'] !== undefined) {
         onSuccess = action.onSuccess;
       }
 
-      if(data.action) {
+      if (data.action) {
         const promise = this.props.onBulkAction(selected_ids, data);
         if (promise !== false) {
           promise.then(onSuccess);
-        };
+        }
       }
 
       this.setState({
         action: false,
-        extra: false
+        extra: false,
       });
     },
-    getSelectedAction: function() {
+    getSelectedAction: function () {
-      var selected_action = this.refs.action.value;
+      const selected_action = this.refs.action.value;
-      if(selected_action.length > 0) {
+      if (selected_action.length > 0) {
-        var action = this.props.bulk_actions.filter(function(action) {
+        const action = this.props.bulk_actions.filter((action) => {
           return (action.name === selected_action);
         });
 
-        if(action.length > 0) {
+        if (action.length > 0) {
           return action[0];
         }
       }
       return null;
     },
-    render: function() {
+    render: function () {
-      if(this.props.bulk_actions.length === 0) {
+      if (this.props.bulk_actions.length === 0) {
         return null;
       }
 
@@ -93,29 +93,29 @@ function(
           <select
             name="bulk_actions"
             ref="action"
-            value={ this.state.action }
+            value={this.state.action}
             onChange={this.handleChangeAction}
           >
             <option value="">{MailPoet.I18n.t('bulkActions')}</option>
-            { this.props.bulk_actions.map(function(action, index) {
+            { this.props.bulk_actions.map((action, index) => {
               return (
                 <option
-                  value={ action.name }
+                  value={action.name}
-                  key={ 'action-' + index }
+                  key={'action-' + index}
                 >{ action.label }</option>
               );
-            }.bind(this)) }
+            }) }
           </select>
           <input
-            onClick={ this.handleApplyAction }
+            onClick={this.handleApplyAction}
             type="submit"
             defaultValue={MailPoet.I18n.t('apply')}
             className="button action" />
 
-            { this.state.extra }
+          { this.state.extra }
         </div>
       );
-    }
+    },
   });
 
   return ListingBulkActions;

assets/js/src/listing/filters.jsx

@@ -1,27 +1,30 @@
 define([
   'react',
   'jquery',
-  'mailpoet'
+  'mailpoet',
 ],
-function(
+(
   React,
   jQuery,
   MailPoet
-) {
+) => {
-  var ListingFilters = React.createClass({
+  const ListingFilters = React.createClass({
-    handleFilterAction: function() {
+    handleFilterAction: function () {
-      let filters = {};
+      const filters = {};
       this.getAvailableFilters().map((filter, i) => {
-        filters[this.refs['filter-'+i].name] = this.refs['filter-'+i].value
+        filters[this.refs['filter-' + i].name] = this.refs['filter-' + i].value;
       });
+      if (this.props.onBeforeSelectFilter) {
+        this.props.onBeforeSelectFilter(filters);
+      }
       return this.props.onSelectFilter(filters);
     },
-    handleEmptyTrash: function() {
+    handleEmptyTrash: function () {
       return this.props.onEmptyTrash();
     },
-    getAvailableFilters: function() {
+    getAvailableFilters: function () {
-      let filters = this.props.filters;
+      const filters = this.props.filters;
-      return Object.keys(filters).filter(function(filter) {
+      return Object.keys(filters).filter((filter) => {
         return !(
           filters[filter].length === 0
           || (
@@ -31,39 +34,39 @@ function(
         );
       });
     },
-    componentDidUpdate: function() {
+    componentDidUpdate: function () {
       const selected_filters = this.props.filter;
-      const available_filters = this.getAvailableFilters().map(
+      this.getAvailableFilters().map(
-        function(filter, i) {
+        (filter, i) => {
           if (selected_filters[filter] !== undefined && selected_filters[filter]) {
-            jQuery(this.refs['filter-'+i])
+            jQuery(this.refs['filter-' + i])
               .val(selected_filters[filter])
               .trigger('change');
           }
-        }.bind(this)
+        }
-      );
+        );
     },
-    render: function() {
+    render: function () {
       const filters = this.props.filters;
       const available_filters = this.getAvailableFilters()
-        .map(function(filter, i) {
+        .map((filter, i) => {
           return (
             <select
-              ref={ `filter-${i}` }
+              ref={`filter-${i}`}
-              key={ `filter-${i}` }
+              key={`filter-${i}`}
-              name={ filter }
+              name={filter}
             >
-            { filters[filter].map(function(option, j) {
+              { filters[filter].map((option, j) => {
-              return (
+                return (
-                <option
+                  <option
-                  value={ option.value }
+                    value={option.value}
-                  key={ 'filter-option-' + j }
+                    key={'filter-option-' + j}
                 >{ option.label }</option>
-              );
+                );
-            }.bind(this)) }
+              }) }
             </select>
           );
-      }.bind(this));
+        });
 
       let button;
 
@@ -71,7 +74,7 @@ function(
         button = (
           <input
             id="post-query-submit"
-            onClick={ this.handleFilterAction }
+            onClick={this.handleFilterAction}
             type="submit"
             defaultValue={MailPoet.I18n.t('filter')}
             className="button" />
@@ -82,7 +85,7 @@ function(
       if (this.props.group === 'trash') {
         empty_trash = (
           <input
-            onClick={ this.handleEmptyTrash }
+            onClick={this.handleEmptyTrash}
             type="submit"
             value={MailPoet.I18n.t('emptyTrash')}
             className="button"
@@ -97,7 +100,7 @@ function(
           { empty_trash }
         </div>
       );
-    }
+    },
   });
 
   return ListingFilters;

assets/js/src/listing/groups.jsx

@@ -1,40 +1,40 @@
-define(['react', 'classnames'], function(React, classNames) {
+define(['react', 'classnames'], (React, classNames) => {
 
-    var ListingGroups = React.createClass({
+  const ListingGroups = React.createClass({
-      handleSelect: function(group) {
+    handleSelect: function (group) {
-        return this.props.onSelectGroup(group);
+      return this.props.onSelectGroup(group);
-      },
+    },
-      render: function() {
+    render: function () {
-        var groups = this.props.groups.map(function(group, index) {
+      const groups = this.props.groups.map((group, index) => {
-          if(group.name === 'trash' && group.count === 0) {
+        if (group.name === 'trash' && group.count === 0) {
-            return false;
+          return false;
-          }
+        }
 
-          var classes = classNames(
+        const classes = classNames(
-            { 'current' : (group.name === this.props.group) }
+            { current: (group.name === this.props.group) }
           );
 
-          return (
-            <li key={index}>
-              {(index > 0) ? ' |' : ''}
-              <a
-                href="javascript:;"
-                className={classes}
-                onClick={this.handleSelect.bind(this, group.name)} >
-                {group.label} <span className="count">({ group.count.toLocaleString() })</span>
-              </a>
-            </li>
-          );
-        }.bind(this));
-
         return (
-          <ul className="subsubsub">
+          <li key={index}>
-            { groups }
+            {(index > 0) ? ' |' : ''}
-          </ul>
+            <a
+              href="javascript:;"
+              className={classes}
+              onClick={this.handleSelect.bind(this, group.name)} >
+              {group.label} <span className="count">({ group.count.toLocaleString() })</span>
+            </a>
+          </li>
         );
-      }
+      });
-    });
 
-    return ListingGroups;
+      return (
-  }
+        <ul className="subsubsub">
-);
+          { groups }
+        </ul>
+      );
+    },
+  });
+
+  return ListingGroups;
+}
+);

assets/js/src/listing/header.jsx

@@ -1,31 +1,32 @@
-import MailPoet from 'mailpoet'
+import MailPoet from 'mailpoet';
-import React from 'react'
+import React from 'react';
-import classNames from 'classnames'
+import classNames from 'classnames';
 
 const ListingHeader = React.createClass({
-  handleSelectItems: function() {
+  handleSelectItems: function () {
     return this.props.onSelectItems(
       this.refs.toggle.checked
     );
   },
-  render: function() {
+  render: function () {
-    const columns = this.props.columns.map(function(column, index) {
+    const columns = this.props.columns.map((column, index) => {
-      column.is_primary = (index === 0);
+      const renderColumn = column;
-      column.sorted = (this.props.sort_by === column.name)
+      renderColumn.is_primary = (index === 0);
+      renderColumn.sorted = (this.props.sort_by === column.name)
         ? this.props.sort_order
         : 'desc';
       return (
         <ListingColumn
           onSort={this.props.onSort}
           sort_by={this.props.sort_by}
-          key={ 'column-' + index }
+          key={'column-' + index}
-          column={column} />
+          column={renderColumn} />
       );
-    }.bind(this));
+    });
 
     let checkbox;
 
-    if(this.props.is_selectable === true) {
+    if (this.props.is_selectable === true) {
       checkbox = (
         <th
           className="manage-column column-cb check-column">
@@ -36,8 +37,8 @@ const ListingHeader = React.createClass({
             type="checkbox"
             name="select_all"
             ref="toggle"
-            checked={ this.props.selection }
+            checked={this.props.selection}
-            onChange={ this.handleSelectItems } />
+            onChange={this.handleSelectItems} />
         </th>
       );
     }
@@ -48,28 +49,28 @@ const ListingHeader = React.createClass({
         {columns}
       </tr>
     );
-  }
+  },
 });
 
 const ListingColumn = React.createClass({
-  handleSort: function() {
+  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);
   },
-  render: function() {
+  render: function () {
     const classes = classNames(
       'manage-column',
       { 'column-primary': this.props.column.is_primary },
-      { 'sortable': this.props.column.sortable },
+      { sortable: this.props.column.sortable },
       this.props.column.sorted,
-      { 'sorted': (this.props.sort_by === this.props.column.name) }
+      { sorted: (this.props.sort_by === this.props.column.name) }
     );
     let label;
 
-    if(this.props.column.sortable === true) {
+    if (this.props.column.sortable === true) {
       label = (
-        <a onClick={ this.handleSort }>
+        <a onClick={this.handleSort}>
           <span>{ this.props.column.label }</span>
           <span className="sorting-indicator"></span>
         </a>
@@ -79,13 +80,13 @@ const ListingColumn = React.createClass({
     }
     return (
       <th
-        className={ classes }
+        className={classes}
-        id={this.props.column.name }
+        id={this.props.column.name}
         scope="col"
-        width={ this.props.column.width || null }
+        width={this.props.column.width || null}
       >{label}</th>
     );
-  }
+  },
 });
 
-module.exports = ListingHeader;
+module.exports = ListingHeader;

assets/js/src/listing/listing.jsx

@@ -1,23 +1,23 @@
-import MailPoet from 'mailpoet'
+import MailPoet from 'mailpoet';
-import jQuery from 'jquery'
+import jQuery from 'jquery';
-import React from 'react'
+import React from 'react';
-import _ from 'underscore'
+import _ from 'underscore';
-import { Router, Link } from 'react-router'
+import { Link } from 'react-router';
-import classNames from 'classnames'
+import classNames from 'classnames';
-import ListingBulkActions from 'listing/bulk_actions.jsx'
+import ListingBulkActions from 'listing/bulk_actions.jsx';
-import ListingHeader from 'listing/header.jsx'
+import ListingHeader from 'listing/header.jsx';
-import ListingPages from 'listing/pages.jsx'
+import ListingPages from 'listing/pages.jsx';
-import ListingSearch from 'listing/search.jsx'
+import ListingSearch from 'listing/search.jsx';
-import ListingGroups from 'listing/groups.jsx'
+import ListingGroups from 'listing/groups.jsx';
-import ListingFilters from 'listing/filters.jsx'
+import ListingFilters from 'listing/filters.jsx';
 
 const ListingItem = React.createClass({
-  getInitialState: function() {
+  getInitialState: function () {
     return {
-      expanded: false
+      expanded: false,
     };
   },
-  handleSelectItem: function(e) {
+  handleSelectItem: function (e) {
     this.props.onSelectItem(
       parseInt(e.target.value, 10),
       e.target.checked
@@ -25,20 +25,20 @@ const ListingItem = React.createClass({
 
     return !e.target.checked;
   },
-  handleRestoreItem: function(id) {
+  handleRestoreItem: function (id) {
     this.props.onRestoreItem(id);
   },
-  handleTrashItem: function(id) {
+  handleTrashItem: function (id) {
     this.props.onTrashItem(id);
   },
-  handleDeleteItem: function(id) {
+  handleDeleteItem: function (id) {
     this.props.onDeleteItem(id);
   },
-  handleToggleItem: function(id) {
+  handleToggleItem: function () {
     this.setState({ expanded: !this.state.expanded });
   },
-  render: function() {
+  render: function () {
-    var checkbox = false;
+    let checkbox = false;
 
     if (this.props.is_selectable === true) {
       checkbox = (
@@ -48,12 +48,12 @@ const ListingItem = React.createClass({
           }</label>
           <input
             type="checkbox"
-            value={ this.props.item.id }
+            value={this.props.item.id}
             checked={
               this.props.item.selected || this.props.selection === 'all'
             }
-            onChange={ this.handleSelectItem }
+            onChange={this.handleSelectItem}
-            disabled={ this.props.selection === 'all' } />
+            disabled={this.props.selection === 'all'} />
         </th>
       );
     }
@@ -63,7 +63,7 @@ const ListingItem = React.createClass({
 
     if (custom_actions.length > 0) {
       let is_first = true;
-      item_actions = custom_actions.map(function(action, index) {
+      item_actions = custom_actions.map((action, index) => {
         if (action.display !== undefined) {
           if (action.display(this.props.item) === false) {
             return;
@@ -74,14 +74,14 @@ const ListingItem = React.createClass({
 
         if (action.name === 'trash') {
           custom_action = (
-            <span key={ 'action-'+index } className="trash">
+            <span key={'action-' + index} className="trash">
               {(!is_first) ? ' | ' : ''}
               <a
                 href="javascript:;"
-                onClick={ this.handleTrashItem.bind(
+                onClick={this.handleTrashItem.bind(
                   null,
                   this.props.item.id
-                ) }>
+                )}>
                 {MailPoet.I18n.t('moveToTrash')}
               </a>
             </span>
@@ -89,8 +89,8 @@ const ListingItem = React.createClass({
         } else if (action.refresh) {
           custom_action = (
             <span
-              onClick={ this.props.onRefreshItems }
+              onClick={this.props.onRefreshItems}
-              key={ 'action-'+index } className={ action.name }>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
@@ -98,7 +98,7 @@ const ListingItem = React.createClass({
         } else if (action.link) {
           custom_action = (
             <span
-              key={ 'action-'+index } className={ action.name }>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               { action.link(this.props.item) }
             </span>
@@ -106,7 +106,7 @@ const ListingItem = React.createClass({
         } else {
           custom_action = (
             <span
-              key={ 'action-'+index } className={ action.name }>
+              key={'action-' + index} className={action.name}>
               {(!is_first) ? ' | ' : ''}
               <a href="javascript:;" onClick={
                 (action.onClick !== undefined)
@@ -125,11 +125,11 @@ const ListingItem = React.createClass({
         }
 
         return custom_action;
-      }.bind(this));
+      });
     } else {
       item_actions = (
         <span className="edit">
-          <Link to={ `/edit/${ this.props.item.id }` }>{MailPoet.I18n.t('edit')}</Link>
+          <Link to={`/edit/${this.props.item.id}`}>{MailPoet.I18n.t('edit')}</Link>
         </span>
       );
     }
@@ -137,13 +137,13 @@ const ListingItem = React.createClass({
     let actions;
 
     if (this.props.group === 'trash') {
-       actions = (
+      actions = (
         <div>
           <div className="row-actions">
             <span>
               <a
                 href="javascript:;"
-                onClick={ this.handleRestoreItem.bind(
+                onClick={this.handleRestoreItem.bind(
                   null,
                   this.props.item.id
                 )}
@@ -154,7 +154,7 @@ const ListingItem = React.createClass({
               <a
                 className="submitdelete"
                 href="javascript:;"
-                onClick={ this.handleDeleteItem.bind(
+                onClick={this.handleDeleteItem.bind(
                   null,
                   this.props.item.id
                 )}
@@ -162,7 +162,7 @@ const ListingItem = React.createClass({
             </span>
           </div>
           <button
-            onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
+            onClick={this.handleToggleItem.bind(null, this.props.item.id)}
             className="toggle-row" type="button">
             <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
           </button>
@@ -175,7 +175,7 @@ const ListingItem = React.createClass({
             { item_actions }
           </div>
           <button
-            onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
+            onClick={this.handleToggleItem.bind(null, this.props.item.id)}
             className="toggle-row" type="button">
             <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
           </button>
@@ -186,17 +186,17 @@ const ListingItem = React.createClass({
     const row_classes = classNames({ 'is-expanded': this.state.expanded });
 
     return (
-      <tr className={ row_classes }>
+      <tr className={row_classes}>
         { checkbox }
         { this.props.onRenderItem(this.props.item, actions) }
       </tr>
     );
-  }
+  },
 });
 
 
 const ListingItems = React.createClass({
-  render: function() {
+  render: function () {
     if (this.props.items.length === 0) {
       let message;
       if (this.props.loading === true) {
@@ -223,24 +223,24 @@ const ListingItems = React.createClass({
           </tr>
         </tbody>
       );
-    } else {
+    }
-      const select_all_classes = classNames(
+    const select_all_classes = classNames(
         'mailpoet_select_all',
-        { 'mailpoet_hidden': (
+      { mailpoet_hidden: (
             this.props.selection === false
             || (this.props.count <= this.props.limit)
-          )
+          ),
-        }
+      }
       );
 
-      return (
+    return (
-        <tbody>
+      <tbody>
-          <tr className={ select_all_classes }>
+        <tr className={select_all_classes}>
-            <td colSpan={
+          <td colSpan={
                 this.props.columns.length
                 + (this.props.is_selectable ? 1 : 0)
               }>
-              {
+            {
                 (this.props.selection !== 'all')
                 ? MailPoet.I18n.t('selectAllLabel')
                 : MailPoet.I18n.t('selectedAllLabel').replace(
@@ -249,48 +249,49 @@ const ListingItems = React.createClass({
                 )
               }
               &nbsp;
-              <a
+            <a
-                onClick={ this.props.onSelectAll }
+              onClick={this.props.onSelectAll}
-                href="javascript:;">{
+              href="javascript:;">{
                   (this.props.selection !== 'all')
                   ? MailPoet.I18n.t('selectAllLink')
                   : MailPoet.I18n.t('clearSelection')
                 }</a>
-            </td>
+          </td>
-          </tr>
+        </tr>
 
-          {this.props.items.map(function(item, index) {
+        {this.props.items.map((item, index) => {
-            item.id = parseInt(item.id, 10);
+          const renderItem = item;
-            item.selected = (this.props.selected_ids.indexOf(item.id) !== -1);
+          renderItem.id = parseInt(item.id, 10);
+          renderItem.selected = (this.props.selected_ids.indexOf(renderItem.id) !== -1);
 
-            return (
+          return (
-              <ListingItem
+            <ListingItem
-                columns={ this.props.columns }
+              columns={this.props.columns}
-                onSelectItem={ this.props.onSelectItem }
+              onSelectItem={this.props.onSelectItem}
-                onRenderItem={ this.props.onRenderItem }
+              onRenderItem={this.props.onRenderItem}
-                onDeleteItem={ this.props.onDeleteItem }
+              onDeleteItem={this.props.onDeleteItem}
-                onRestoreItem={ this.props.onRestoreItem }
+              onRestoreItem={this.props.onRestoreItem}
-                onTrashItem={ this.props.onTrashItem }
+              onTrashItem={this.props.onTrashItem}
-                onRefreshItems={ this.props.onRefreshItems }
+              onRefreshItems={this.props.onRefreshItems}
-                selection={ this.props.selection }
+              selection={this.props.selection}
-                is_selectable={ this.props.is_selectable }
+              is_selectable={this.props.is_selectable}
-                item_actions={ this.props.item_actions }
+              item_actions={this.props.item_actions}
-                group={ this.props.group }
+              group={this.props.group}
-                key={ `item-${item.id}-${index}` }
+              key={`item-${renderItem.id}-${index}`}
-                item={ item } />
+              item={renderItem} />
-            );
+          );
-          }.bind(this))}
+        })}
-        </tbody>
+      </tbody>
-      );
+    );
-    }
+
-  }
+  },
 });
 
 const Listing = React.createClass({
   contextTypes: {
-    router: React.PropTypes.object.isRequired
+    router: React.PropTypes.object.isRequired,
   },
-  getInitialState: function() {
+  getInitialState: function () {
     return {
       loading: false,
       search: '',
@@ -306,31 +307,30 @@ const Listing = React.createClass({
       filter: {},
       selected_ids: [],
       selection: false,
-      meta: {}
+      meta: {},
     };
   },
-  getParam: function(param) {
+  getParam: function (param) {
     const regex = /(.*)\[(.*)\]/;
     const matches = regex.exec(param);
     return [matches[1], matches[2]];
   },
-  initWithParams: function(params) {
+  initWithParams: function (params) {
-    let state = this.getInitialState();
+    const state = this.getInitialState();
      // check for url params
     if (params.splat) {
-      params.splat.split('/').map(param => {
+      params.splat.split('/').map((param) => {
-        let [key, value] = this.getParam(param);
+        const [key, value] = this.getParam(param);
-        switch(key) {
+        const filters = {};
+        switch (key) {
           case 'filter':
-            let filters = {};
+            value.split('&').map((pair) => {
-            value.split('&').map(function(pair) {
+              const [k, v] = pair.split('=');
-                let [k, v] = pair.split('=')
+              filters[k] = v;
-                filters[k] = v
+            });
-              }
-            );
 
             state.filter = filters;
-          break;
+            break;
           default:
             state[key] = value;
         }
@@ -352,13 +352,13 @@ const Listing = React.createClass({
       state.sort_order = this.props.sort_order;
     }
 
-    this.setState(state, function() {
+    this.setState(state, () => {
       this.getItems();
-    }.bind(this));
+    });
   },
-  getParams: function() {
+  getParams: function () {
     // get all route parameters (without the "splat")
-    let params = _.omit(this.props.params, 'splat');
+    const params = _.omit(this.props.params, 'splat');
     // TODO:
     // find a way to set the "type" in the routes definition
     // so that it appears in `this.props.params`
@@ -367,10 +367,10 @@ const Listing = React.createClass({
     }
     return params;
   },
-  setParams: function() {
+  setParams: function () {
     if (this.props.location) {
-      let params = Object.keys(this.state)
+      const params = Object.keys(this.state)
-        .filter(key => {
+        .filter((key) => {
           return (
             [
               'group',
@@ -378,74 +378,75 @@ const Listing = React.createClass({
               'search',
               'page',
               'sort_by',
-              'sort_order'
+              'sort_order',
             ].indexOf(key) !== -1
-          )
+          );
         })
-        .map(key => {
+        .map((key) => {
           let value = this.state[key];
           if (value === Object(value)) {
-            value = jQuery.param(value)
+            value = jQuery.param(value);
           } else if (value === Boolean(value)) {
-            value = value.toString()
+            value = value.toString();
           }
 
           if (value !== '' && value !== null) {
-            return `${key}[${value}]`
+            return `${key}[${value}]`;
           }
         })
-        .filter(key => { return (key !== undefined) })
+        .filter((key) => { return (key !== undefined); })
         .join('/');
 
       // set url
-      let url = this.getUrlWithParams(params);
+      const url = this.getUrlWithParams(params);
 
       if (this.props.location.pathname !== url) {
         this.context.router.push(`${url}`);
       }
     }
   },
-  getUrlWithParams: function(params) {
+  getUrlWithParams: function (params) {
     let base_url = (this.props.base_url !== undefined)
       ? this.props.base_url
       : null;
 
     if (base_url !== null) {
       base_url = this.setBaseUrlParams(base_url);
-      return `/${ base_url }/${ params }`;
+      return `/${base_url}/${params}`;
-    } else {
-      return `/${ params }`;
     }
+    return `/${params}`;
+
   },
-  setBaseUrlParams: function(base_url) {
+  setBaseUrlParams: function (base_url) {
-    if (base_url.indexOf(':') !== -1) {
+    let ret = base_url;
+    if (ret.indexOf(':') !== -1) {
       const params = this.getParams();
       Object.keys(params).map((key) => {
-        if (base_url.indexOf(':'+key) !== -1) {
+        if (ret.indexOf(':' + key) !== -1) {
-          base_url = base_url.replace(':'+key, params[key]);
+          ret = ret.replace(':' + key, params[key]);
         }
       });
     }
 
-    return base_url;
+    return ret;
   },
-  componentDidMount: function() {
+  componentDidMount: function () {
     if (this.isMounted()) {
       const params = this.props.params || {};
       this.initWithParams(params);
 
       if (this.props.auto_refresh) {
-        jQuery(document).on('heartbeat-tick.mailpoet', function(e, data) {
+        jQuery(document).on('heartbeat-tick.mailpoet', () => {
           this.getItems();
-        }.bind(this));
+        });
       }
     }
   },
-  componentWillReceiveProps: function(nextProps) {
+  componentWillReceiveProps: function (nextProps) {
     const params = nextProps.params || {};
     this.initWithParams(params);
   },
-  getItems: function() {
+  getItems: function () {
     if (this.isMounted()) {
       this.setState({ loading: true });
 
@@ -463,8 +464,8 @@ const Listing = React.createClass({
           filter: this.state.filter,
           search: this.state.search,
           sort_by: this.state.sort_by,
-          sort_order: this.state.sort_order
+          sort_order: this.state.sort_order,
-        }
+        },
       }).always(() => {
         this.setState({ loading: false });
       }).done((response) => {
@@ -473,7 +474,7 @@ const Listing = React.createClass({
           filters: response.meta.filters || {},
           groups: response.meta.groups || [],
           count: response.meta.count || 0,
-          meta: _.omit(response.meta, ['filters', 'groups', 'count'])
+          meta: _.omit(response.meta, ['filters', 'groups', 'count']),
         }, () => {
           // if viewing an empty trash
           if (this.state.group === 'trash' && response.meta.count === 0) {
@@ -489,17 +490,17 @@ const Listing = React.createClass({
       }).fail((response) => {
         if (response.errors.length > 0) {
           MailPoet.Notice.error(
-            response.errors.map(function(error) { return error.message; }),
+            response.errors.map((error) => { return error.message; }),
             { scroll: true }
           );
         }
       });
     }
   },
-  handleRestoreItem: function(id) {
+  handleRestoreItem: function (id) {
     this.setState({
       loading: true,
-      page: 1
+      page: 1,
     });
 
     MailPoet.Ajax.post({
@@ -507,8 +508,8 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'restore',
       data: {
-        id: id
+        id: id,
-      }
+      },
     }).done((response) => {
       if (
         this.props.messages !== undefined
@@ -519,15 +520,15 @@ const Listing = React.createClass({
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map(function(error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
         { scroll: true }
       );
     });
   },
-  handleTrashItem: function(id) {
+  handleTrashItem: function (id) {
     this.setState({
       loading: true,
-      page: 1
+      page: 1,
     });
 
     MailPoet.Ajax.post({
@@ -535,8 +536,8 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'trash',
       data: {
-        id: id
+        id: id,
-      }
+      },
     }).done((response) => {
       if (
         this.props.messages !== undefined
@@ -547,15 +548,15 @@ const Listing = React.createClass({
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map(function(error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
         { scroll: true }
       );
     });
   },
-  handleDeleteItem: function(id) {
+  handleDeleteItem: function (id) {
     this.setState({
       loading: true,
-      page: 1
+      page: 1,
     });
 
     MailPoet.Ajax.post({
@@ -563,8 +564,8 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'delete',
       data: {
-        id: id
+        id: id,
-      }
+      },
     }).done((response) => {
       if (
         this.props.messages !== undefined
@@ -575,15 +576,15 @@ const Listing = React.createClass({
       this.getItems();
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map(function(error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
         { scroll: true }
       );
     });
   },
-  handleEmptyTrash: function() {
+  handleEmptyTrash: function () {
     return this.handleBulkAction('all', {
       action: 'delete',
-      group: 'trash'
+      group: 'trash',
     }).done((response) => {
       MailPoet.Notice.success(
         MailPoet.I18n.t('permanentlyDeleted').replace('%d', response.meta.count)
@@ -592,12 +593,12 @@ const Listing = React.createClass({
       this.handleGroup('all');
     }).fail((response) => {
       MailPoet.Notice.error(
-        response.errors.map(function(error) { return error.message; }),
+        response.errors.map((error) => { return error.message; }),
         { scroll: true }
       );
     });
   },
-  handleBulkAction: function(selected_ids, params) {
+  handleBulkAction: function (selected_ids, params) {
     if (
       this.state.selection === false
       && this.state.selected_ids.length === 0
@@ -608,15 +609,15 @@ const Listing = React.createClass({
 
     this.setState({ loading: true });
 
-    var data = params || {};
+    const data = params || {};
     data.listing = {
       params: this.getParams(),
       offset: 0,
       limit: 0,
       filter: this.state.filter,
       group: this.state.group,
-      search: this.state.search
+      search: this.state.search,
-    }
+    };
     if (selected_ids !== 'all') {
       data.listing.selection = selected_ids;
     }
@@ -625,35 +626,42 @@ const Listing = React.createClass({
       api_version: window.mailpoet_api_version,
       endpoint: this.props.endpoint,
       action: 'bulkAction',
-      data: data
+      data: data,
     }).done(() => {
       this.getItems();
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map((error) => { return error.message; }),
+          { scroll: true }
+        );
+      }
     });
   },
-  handleSearch: function(search) {
+  handleSearch: function (search) {
     this.setState({
       search: search,
       page: 1,
       selection: false,
-      selected_ids: []
+      selected_ids: [],
-    }, function() {
+    }, () => {
       this.setParams();
-    }.bind(this));
+    });
   },
-  handleSort: function(sort_by, sort_order = 'asc') {
+  handleSort: function (sort_by, sort_order = 'asc') {
     this.setState({
       sort_by: sort_by,
       sort_order: (sort_order === 'asc') ? 'asc' : 'desc',
-    }, function() {
+    }, () => {
       this.setParams();
-    }.bind(this));
+    });
   },
-  handleSelectItem: function(id, is_checked) {
+  handleSelectItem: function (id, is_checked) {
-    var selected_ids = this.state.selected_ids,
+    let selected_ids = this.state.selected_ids;
-        selection = false;
+    let selection = false;
 
     if (is_checked) {
-      selected_ids = jQuery.merge(selected_ids, [ id ]);
+      selected_ids = jQuery.merge(selected_ids, [id]);
       // check whether all items on the page are selected
       if (
         jQuery('tbody .check-column :checkbox:not(:checked)').length === 0
@@ -666,48 +674,48 @@ const Listing = React.createClass({
 
     this.setState({
       selection: selection,
-      selected_ids: selected_ids
+      selected_ids: selected_ids,
     });
   },
-  handleSelectItems: function(is_checked) {
+  handleSelectItems: function (is_checked) {
     if (is_checked === false) {
       this.clearSelection();
     } else {
-      var selected_ids = this.state.items.map(function(item) {
+      const selected_ids = this.state.items.map((item) => {
         return ~~item.id;
       });
 
       this.setState({
         selected_ids: selected_ids,
-        selection: 'page'
+        selection: 'page',
       });
     }
   },
-  handleSelectAll: function() {
+  handleSelectAll: function () {
     if (this.state.selection === 'all') {
       this.clearSelection();
     } else {
       this.setState({
         selection: 'all',
-        selected_ids: []
+        selected_ids: [],
       });
     }
   },
-  clearSelection: function() {
+  clearSelection: function () {
     this.setState({
       selection: false,
-      selected_ids: []
+      selected_ids: [],
     });
   },
-  handleFilter: function(filters) {
+  handleFilter: function (filters) {
     this.setState({
       filter: filters,
-      page: 1
+      page: 1,
-    }, function() {
+    }, () => {
       this.setParams();
-    }.bind(this));
+    });
   },
-  handleGroup: function(group) {
+  handleGroup: function (group) {
     // reset search
     jQuery('#search_input').val('');
 
@@ -715,35 +723,35 @@ const Listing = React.createClass({
       group: group,
       filter: {},
       search: '',
-      page: 1
+      page: 1,
-    }, function() {
+    }, () => {
       this.setParams();
-    }.bind(this));
+    });
   },
-  handleSetPage: function(page) {
+  handleSetPage: function (page) {
     this.setState({
       page: page,
       selection: false,
-      selected_ids: []
+      selected_ids: [],
-    }, function() {
+    }, () => {
       this.setParams();
-    }.bind(this));
+    });
   },
-  handleRenderItem: function(item, actions) {
+  handleRenderItem: function (item, actions) {
     const render = this.props.onRenderItem(item, actions, this.state.meta);
     return render.props.children;
   },
-  handleRefreshItems: function() {
+  handleRefreshItems: function () {
     this.getItems();
   },
-  render: function() {
+  render: function () {
     const items = this.state.items;
     const sort_by = this.state.sort_by;
     const sort_order = this.state.sort_order;
 
     // columns
     let columns = this.props.columns || [];
-    columns = columns.filter(function(column) {
+    columns = columns.filter((column) => {
       return (column.display === undefined || !!(column.display) === true);
     });
 
@@ -755,13 +763,13 @@ const Listing = React.createClass({
         {
           name: 'restore',
           label: MailPoet.I18n.t('restore'),
-          onSuccess: this.props.messages.onRestore
+          onSuccess: this.props.messages.onRestore,
         },
         {
           name: 'delete',
           label: MailPoet.I18n.t('deletePermanently'),
-          onSuccess: this.props.messages.onDelete
+          onSuccess: this.props.messages.onDelete,
-        }
+        },
       ];
     }
 
@@ -774,14 +782,14 @@ const Listing = React.createClass({
       'widefat',
       'fixed',
       'striped',
-      { 'mailpoet_listing_loading': this.state.loading }
+      { mailpoet_listing_loading: this.state.loading }
     );
 
     // search
     let search = (
       <ListingSearch
-        onSearch={ this.handleSearch }
+        onSearch={this.handleSearch}
-        search={ this.state.search }
+        search={this.state.search}
       />
     );
     if (this.props.search === false) {
@@ -791,9 +799,9 @@ const Listing = React.createClass({
     // groups
     let groups = (
       <ListingGroups
-        groups={ this.state.groups }
+        groups={this.state.groups}
-        group={ this.state.group }
+        group={this.state.group}
-        onSelectGroup={ this.handleGroup }
+        onSelectGroup={this.handleGroup}
       />
     );
     if (this.props.groups === false) {
@@ -812,84 +820,85 @@ const Listing = React.createClass({
         { search }
         <div className="tablenav top clearfix">
           <ListingBulkActions
-            count={ this.state.count }
+            count={this.state.count}
-            bulk_actions={ bulk_actions }
+            bulk_actions={bulk_actions}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            onBulkAction={ this.handleBulkAction } />
+            onBulkAction={this.handleBulkAction} />
           <ListingFilters
-            filters={ this.state.filters }
+            filters={this.state.filters}
-            filter={ this.state.filter }
+            filter={this.state.filter}
-            group={ this.state.group }
+            group={this.state.group}
-            onSelectFilter={ this.handleFilter }
+            onBeforeSelectFilter={this.props.onBeforeSelectFilter || null}
-            onEmptyTrash={ this.handleEmptyTrash }
+            onSelectFilter={this.handleFilter}
+            onEmptyTrash={this.handleEmptyTrash}
           />
           <ListingPages
-            count={ this.state.count }
+            count={this.state.count}
-            page={ this.state.page }
+            page={this.state.page}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            onSetPage={ this.handleSetPage } />
+            onSetPage={this.handleSetPage} />
         </div>
-        <table className={ table_classes }>
+        <table className={table_classes}>
           <thead>
             <ListingHeader
-              onSort={ this.handleSort }
+              onSort={this.handleSort}
-              onSelectItems={ this.handleSelectItems }
+              onSelectItems={this.handleSelectItems}
-              selection={ this.state.selection }
+              selection={this.state.selection}
-              sort_by={ sort_by }
+              sort_by={sort_by}
-              sort_order={ sort_order }
+              sort_order={sort_order}
-              columns={ columns }
+              columns={columns}
-              is_selectable={ bulk_actions.length > 0 } />
+              is_selectable={bulk_actions.length > 0} />
           </thead>
 
           <ListingItems
-            onRenderItem={ this.handleRenderItem }
+            onRenderItem={this.handleRenderItem}
-            onDeleteItem={ this.handleDeleteItem }
+            onDeleteItem={this.handleDeleteItem}
-            onRestoreItem={ this.handleRestoreItem }
+            onRestoreItem={this.handleRestoreItem}
-            onTrashItem={ this.handleTrashItem }
+            onTrashItem={this.handleTrashItem}
-            onRefreshItems={ this.handleRefreshItems }
+            onRefreshItems={this.handleRefreshItems}
-            columns={ columns }
+            columns={columns}
-            is_selectable={ bulk_actions.length > 0 }
+            is_selectable={bulk_actions.length > 0}
-            onSelectItem={ this.handleSelectItem }
+            onSelectItem={this.handleSelectItem}
-            onSelectAll={ this.handleSelectAll }
+            onSelectAll={this.handleSelectAll}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            loading={ this.state.loading }
+            loading={this.state.loading}
-            group={ this.state.group }
+            group={this.state.group}
-            count={ this.state.count }
+            count={this.state.count}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            item_actions={ item_actions }
+            item_actions={item_actions}
-            messages={ messages }
+            messages={messages}
-            items={ items } />
+            items={items} />
 
           <tfoot>
             <ListingHeader
-              onSort={ this.handleSort }
+              onSort={this.handleSort}
-              onSelectItems={ this.handleSelectItems }
+              onSelectItems={this.handleSelectItems}
-              selection={ this.state.selection }
+              selection={this.state.selection}
-              sort_by={ sort_by }
+              sort_by={sort_by}
-              sort_order={ sort_order }
+              sort_order={sort_order}
-              columns={ columns }
+              columns={columns}
-              is_selectable={ bulk_actions.length > 0 } />
+              is_selectable={bulk_actions.length > 0} />
           </tfoot>
 
         </table>
         <div className="tablenav bottom">
           <ListingBulkActions
-            count={ this.state.count }
+            count={this.state.count}
-            bulk_actions={ bulk_actions }
+            bulk_actions={bulk_actions}
-            selection={ this.state.selection }
+            selection={this.state.selection}
-            selected_ids={ this.state.selected_ids }
+            selected_ids={this.state.selected_ids}
-            onBulkAction={ this.handleBulkAction } />
+            onBulkAction={this.handleBulkAction} />
           <ListingPages
-            count={ this.state.count }
+            count={this.state.count}
-            page={ this.state.page }
+            page={this.state.page}
-            limit={ this.state.limit }
+            limit={this.state.limit}
-            onSetPage={ this.handleSetPage } />
+            onSetPage={this.handleSetPage} />
         </div>
       </div>
     );
-  }
+  },
 });
 
 module.exports = Listing;

assets/js/src/listing/pages.jsx

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

assets/js/src/listing/search.jsx

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

assets/js/src/mailpoet.js

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

assets/js/src/mp2migrator.js

@@ -1,5 +1,7 @@
-define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
+define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
   'use strict';
+
+  var MailPoet = mp;
   MailPoet.MP2Migrator = {
 
     fatal_error: '',
@@ -10,7 +12,7 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
       clearTimeout(MailPoet.MP2Migrator.displayLogs_timeout);
       clearTimeout(MailPoet.MP2Migrator.updateProgressbar_timeout);
       clearTimeout(MailPoet.MP2Migrator.update_wordpress_info_timeout);
-      setTimeout(MailPoet.MP2Migrator.updateDisplay, 1000)
+      setTimeout(MailPoet.MP2Migrator.updateDisplay, 1000);
     },
 
     stopLogger: function () {
@@ -24,25 +26,26 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
 
     displayLogs: function () {
       jQuery.ajax({
-        url: mailpoet_mp2_migrator.log_file_url,
+        url: window.mailpoet_mp2_migrator.log_file_url,
         cache: false
       }).done(function (result) {
-        jQuery("#logger").html('');
+        jQuery('#logger').html('');
-        result.split("\n").forEach(function (row) {
+        result.split('\n').forEach(function (resultRow) {
-          if(row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === MailPoet.I18n.t('import_stopped_by_user')) {
+          var row = resultRow;
+          if (row.substr(0, 7) === '[ERROR]' || row.substr(0, 9) === '[WARNING]' || row === MailPoet.I18n.t('import_stopped_by_user')) {
             row = '<span class="error_msg">' + row + '</span>'; // Mark the errors in red
           }
           // Test if the import is complete
-          else if(row === MailPoet.I18n.t('import_complete')) {
+          else if (row === MailPoet.I18n.t('import_complete')) {
             jQuery('#import-actions').hide();
             jQuery('#upgrade-completed').show();
           }
-          jQuery("#logger").append(row + "<br />\n");
+          jQuery('#logger').append(row + '<br />\n');
 
         });
-        jQuery("#logger").append('<span class="error_msg">' + MailPoet.MP2Migrator.fatal_error + '</span>' + "<br />\n");
+        jQuery('#logger').append('<span class="error_msg">' + MailPoet.MP2Migrator.fatal_error + '</span>' + '<br />\n');
       }).always(function () {
-        if(MailPoet.MP2Migrator.is_logging) {
+        if (MailPoet.MP2Migrator.is_logging) {
           MailPoet.MP2Migrator.displayLogs_timeout = setTimeout(MailPoet.MP2Migrator.displayLogs, 1000);
         }
       });
@@ -50,21 +53,23 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
 
     updateProgressbar: function () {
       jQuery.ajax({
-        url: mailpoet_mp2_migrator.progress_url,
+        url: window.mailpoet_mp2_migrator.progress_url,
         cache: false,
         dataType: 'json'
       }).always(function (result) {
         // Move the progress bar
         var progress = 0;
-        if((result.total !== undefined) && (Number(result.total) !== 0)) {
+        if ((result.total !== undefined) && (Number(result.total) !== 0)) {
           progress = Math.round(Number(result.current) / Number(result.total) * 100);
         }
         jQuery('#progressbar').progressbar('option', 'value', progress);
         jQuery('#progresslabel').html(progress + '%');
-        if(Number(result.current !== 0)) {
+        if (Number(result.current) !== 0) {
           jQuery('#skip-import').hide();
+          jQuery('#progressbar').show();
+          jQuery('#logger-container').show();
         }
-        if(MailPoet.MP2Migrator.is_logging) {
+        if (MailPoet.MP2Migrator.is_logging) {
           MailPoet.MP2Migrator.updateProgressbar_timeout = setTimeout(MailPoet.MP2Migrator.updateProgressbar, 1000);
         }
       });
@@ -95,16 +100,16 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
         MailPoet.MP2Migrator.updateDisplay(); // Get the latest information after the import was stopped
         MailPoet.MP2Migrator.reactivateImportButton();
       }).done(function (response) {
-        if(response) {
+        if (response) {
           MailPoet.MP2Migrator.fatal_error = response.data;
         }
       }).fail(function (response) {
-        if(response.errors.length > 0) {
+        if (response.errors.length > 0) {
           MailPoet.Notice.error(
             response.errors.map(function (error) {
               return error.message;
             }),
-            {scroll: true}
+            { scroll: true }
           );
         }
       });
@@ -129,6 +134,15 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
         jQuery('#stop-import').removeAttr('disabled'); // Enable the button
         MailPoet.MP2Migrator.reactivateImportButton();
         MailPoet.MP2Migrator.updateDisplay(); // Get the latest information after the import was stopped
+      }).fail(function (response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function (error) {
+              return error.message;
+            }),
+            { scroll: true }
+          );
+        }
       });
       MailPoet.MP2Migrator.stopLogger();
       return false;
@@ -143,6 +157,15 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
         }
       }).done(function () {
         MailPoet.MP2Migrator.gotoWelcomePage();
+      }).fail(function (response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function (error) {
+              return error.message;
+            }),
+            { scroll: true }
+          );
+        }
       });
       return false;
     },
@@ -153,33 +176,33 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
     }
 
   };
-  
+
   /**
    * Actions to run when the DOM is ready
    */
   jQuery(function () {
-    jQuery('#progressbar').progressbar({value: 0});
+    jQuery('#progressbar').progressbar({ value: 0 });
 
     // Import button
-    jQuery('#import').click(function() {
+    jQuery('#import').click(function () {
       MailPoet.MP2Migrator.startImport();
     });
-      
+
     // Stop import button
-    jQuery('#stop-import').click(function() {
+    jQuery('#stop-import').click(function () {
       MailPoet.MP2Migrator.stopImport();
     });
 
     // Skip import link
-    jQuery('#skip-import').click(function() {
+    jQuery('#skip-import').click(function () {
       MailPoet.MP2Migrator.skipImport();
     });
 
     // Go to welcome page
-    jQuery('#goto-welcome').click(function() {
+    jQuery('#goto-welcome').click(function () {
       MailPoet.MP2Migrator.gotoWelcomePage();
     });
-    
+
     // Update the display
     MailPoet.MP2Migrator.updateDisplay();
   });

assets/js/src/newsletter_editor/App.js

@@ -1,12 +1,9 @@
 define([
-    'backbone',
+  'backbone',
-    'backbone.marionette',
+  'backbone.marionette',
-    'backbone.radio',
+  'backbone.radio'
-    'jquery',
+], function (Backbone, Marionette, BackboneRadio) {
-    'underscore',
+  var Radio = BackboneRadio;
-    'handlebars',
-    'handlebars_helpers'
-  ], function(Backbone, Marionette, Radio, jQuery, _, Handlebars) {
 
   var AppView = Marionette.View.extend({
     el: '#mailpoet_editor',
@@ -15,20 +12,22 @@ define([
       contentRegion: '#mailpoet_editor_content',
       sidebarRegion: '#mailpoet_editor_sidebar',
       bottomRegion: '#mailpoet_editor_bottom',
-      headingRegion: '#mailpoet_editor_heading',
+      headingRegion: '#mailpoet_editor_heading'
-    },
+    }
   });
 
   var EditorApplication = Marionette.Application.extend({
     region: '#mailpoet_editor',
 
-    onStart: function() {
+    onStart: function () {
       this._appView = new AppView();
       this.showView(this._appView);
     },
 
-    getChannel: function(channel) {
+    getChannel: function (channel) {
-      if (channel === undefined) channel = 'global';
+      if (channel === undefined) {
+        return Radio.channel('global');
+      }
       return Radio.channel(channel);
     }
   });

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

@@ -5,11 +5,11 @@
  * For more check: http://marionettejs.com/docs/marionette.behaviors.html#behaviorslookup
  */
 define([
-    'backbone.marionette'
+  'backbone.marionette'
-  ], function(Marionette) {
+], function (BackboneMarionette) {
-
+  var Marionette = BackboneMarionette;
   var BehaviorsLookup = {};
-  Marionette.Behaviors.behaviorsLookup = function() {
+  Marionette.Behaviors.behaviorsLookup = function () {
     return BehaviorsLookup;
   };
 

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

@@ -4,23 +4,44 @@
  * Adds a color picker integration with the view
  */
 define([
-    'backbone.marionette',
+  'backbone.marionette',
-    'newsletter_editor/behaviors/BehaviorsLookup',
+  'newsletter_editor/behaviors/BehaviorsLookup',
-    'mailpoet',
+  'mailpoet',
-    'spectrum'
+  'spectrum'
-  ], function(Marionette, BehaviorsLookup, MailPoet, Spectrum) {
+], function (Marionette, BehaviorsLookup, MailPoet) {
+  var BL = BehaviorsLookup;
 
-  BehaviorsLookup.ColorPickerBehavior = Marionette.Behavior.extend({
+  BL.ColorPickerBehavior = Marionette.Behavior.extend({
-    onRender: function() {
+    onRender: function () {
-      this.view.$('.mailpoet_color').spectrum({
+      var that = this;
-        clickoutFiresChange: true,
+      var preferredFormat = 'hex6';
-        showInput: true,
+      this.view.$('.mailpoet_color').each(function () {
-        showInitial: true,
+        var $input = that.view.$(this);
-        preferredFormat: "hex6",
+        var updateColorInput = function (color) {
-        allowEmpty: true,
+          if (color && color.getAlpha() > 0) {
-        chooseText: MailPoet.I18n.t('selectColor'),
+            $input.val(color.toString(preferredFormat));
-        cancelText: MailPoet.I18n.t('cancelColorSelection')
+          } else {
+            $input.val('');
+          }
+          $input.trigger('change');
+        };
+        $input.spectrum({
+          clickoutFiresChange: true,
+          showInput: true,
+          showInitial: true,
+          showPalette: true,
+          showSelectionPalette: true,
+          palette: [],
+          localStorageKey: 'newsletter_editor.spectrum.palette',
+          preferredFormat: preferredFormat,
+          allowEmpty: true,
+          chooseText: MailPoet.I18n.t('selectColor'),
+          cancelText: MailPoet.I18n.t('cancelColorSelection'),
+          change: updateColorInput,
+          move: updateColorInput,
+          hide: updateColorInput
+        });
       });
-    },
+    }
   });
 });

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

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

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

@@ -5,14 +5,15 @@
  * Part of the drag&drop behavior.
  */
 define([
-    'backbone.marionette',
+  'backbone.marionette',
-    'underscore',
+  'underscore',
-    'jquery',
+  'jquery',
-    'newsletter_editor/behaviors/BehaviorsLookup',
+  'newsletter_editor/behaviors/BehaviorsLookup',
-    'interact'
+  'interact'
-  ], function(Marionette, _, jQuery, BehaviorsLookup, interact) {
+], function (Marionette, _, jQuery, BehaviorsLookup, interact) {
+  var BL = BehaviorsLookup;
 
-  BehaviorsLookup.DraggableBehavior = Marionette.Behavior.extend({
+  BL.DraggableBehavior = Marionette.Behavior.extend({
     defaults: {
       cloneOriginal: false,
       hideOriginal: false,
@@ -23,22 +24,22 @@ define([
        *
        * @return Backbone.Model A model that will be passed to the receiver
        */
-      getDropModel: function() {
+      getDropModel: function () {
         throw "Missing 'drop' function for DraggableBehavior";
       },
 
-      onDrop: function(model, view) {},
+      onDrop: function () {},
-      testAttachToInstance: function(model, view) { return true; },
+      testAttachToInstance: function () { return true; }
     },
-    onRender: function() {
+    onRender: function () {
-      var that = this,
+      var that = this;
-          interactable;
+      var interactable;
 
       // Give instances more control over whether Draggable should be applied
       if (!this.options.testAttachToInstance(this.view.model, this.view)) return;
 
       interactable = interact(this.$el.get(0), {
-          ignoreFrom: this.options.ignoreSelector,
+        ignoreFrom: this.options.ignoreSelector
       }).draggable({
         // allow dragging of multple elements at the same time
         max: Infinity,
@@ -46,17 +47,21 @@ define([
         // Scroll when dragging near edges of a window
         autoScroll: true,
 
-        onstart: function(event) {
+        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,
+            tempClone = (_.isFunction(that.options.onDragSubstituteBy)) ? that.options.onDragSubstituteBy(that) : undefined;
-              // Or use a clone
+            // Or use a clone
-              clone = tempClone ? tempClone : event.target.cloneNode(true),
+            clone = tempClone || event.target.cloneNode(true);
-
+            jQuery(event.target);
-              $original = jQuery(event.target),
+            $clone = jQuery(clone);
-              $clone = jQuery(clone),
-              centerXOffset, centerYOffset, parentOffset;
 
             $clone.addClass('mailpoet_droppable_active');
             $clone.css('position', 'absolute');
@@ -69,7 +74,7 @@ define([
             // Accurate dimensions can only be taken after insertion to document
             centerXOffset = $clone.width() / 2;
             centerYOffset = $clone.height() / 2;
-            $clone.css('top',  event.pageY - centerYOffset);
+            $clone.css('top', event.pageY - centerYOffset);
             $clone.css('left', event.pageX - centerXOffset);
 
             event.interaction.element = clone;
@@ -83,15 +88,14 @@ define([
         },
         // call this function on every dragmove event
         onmove: function (event) {
-          var target = event.target,
+          var target = event.target;
-            // keep the dragged position in the data-x/data-y attributes
+          // keep the dragged position in the data-x/data-y attributes
-            x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
+          var x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx;
-            y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+          var y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
 
           // translate the element
-          target.style.webkitTransform =
+          target.style.transform = 'translate(' + x + 'px, ' + y + 'px)';
-          target.style.transform =
+          target.style.webkitTransform = target.style.transform;
-            'translate(' + x + 'px, ' + y + 'px)';
 
           // update the posiion attributes
           target.setAttribute('data-x', x);
@@ -99,7 +103,8 @@ define([
         },
         onend: function (event) {
           var target = event.target;
-          target.style.webkitTransform = target.style.transform = '';
+          target.style.transform = '';
+          target.style.webkitTransform = target.style.transform;
           target.removeAttribute('data-x');
           target.removeAttribute('data-y');
           jQuery(event.interaction.element).addClass('mailpoet_droppable_active');
@@ -111,9 +116,10 @@ define([
               that.view.$el.removeClass('mailpoet_hidden');
             }
           }
-        },
+        }
       })
       .preventDefault('auto')
+      .styleCursor(false)
       .actionChecker(function (pointer, event, action) {
         // Disable dragging with right click
         if (event.button !== 0) {
@@ -128,7 +134,8 @@ define([
       } else {
         interactable.getDropModel = this.view.getDropFunc();
       }
-      interactable.onDrop = function(options) {
+      interactable.onDrop = function (opts) {
+        var options = opts;
         if (_.isObject(options)) {
           // Inject Draggable behavior if possible
           options.dragBehavior = that;
@@ -136,6 +143,6 @@ define([
         // Delegate to view's event handler
         that.options.onDrop.apply(that, [options]);
       };
-    },
+    }
   });
 });

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

@@ -0,0 +1,26 @@
+/**
+ * Highlight Container Behavior
+ *
+ * Highlights a container block when hovering over its tools
+ */
+define([
+  'backbone.marionette',
+  'newsletter_editor/behaviors/BehaviorsLookup'
+], function (Marionette, BehaviorsLookup) {
+  var BL = BehaviorsLookup;
+
+  BL.HighlightContainerBehavior = Marionette.Behavior.extend({
+    events: {
+      'mouseenter @ui.tools': 'enableHighlight',
+      'mouseleave @ui.tools': 'disableHighlight'
+    },
+    enableHighlight: function () {
+      this.$el.addClass('mailpoet_highlight');
+    },
+    disableHighlight: function () {
+      if (!this.view._isBeingEdited) {
+        this.$el.removeClass('mailpoet_highlight');
+      }
+    }
+  });
+});

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

@@ -4,20 +4,23 @@
  * Highlights a block that is being edited
  */
 define([
-    'backbone.marionette',
+  'backbone.marionette',
-    'newsletter_editor/behaviors/BehaviorsLookup',
+  'newsletter_editor/behaviors/BehaviorsLookup'
-  ], function(Marionette, BehaviorsLookup) {
+], function (Marionette, BehaviorsLookup) {
+  var BL = BehaviorsLookup;
 
-  BehaviorsLookup.HighlightEditingBehavior = Marionette.Behavior.extend({
+  BL.HighlightEditingBehavior = Marionette.Behavior.extend({
     modelEvents: {
-      'startEditing': 'enableHighlight',
+      startEditing: 'enableHighlight',
-      'stopEditing': 'disableHighlight',
+      stopEditing: 'disableHighlight'
     },
-    enableHighlight: function() {
+    enableHighlight: function () {
+      this.view._isBeingEdited = true;
       this.$el.addClass('mailpoet_highlight');
     },
-    disableHighlight: function() {
+    disableHighlight: function () {
+      this.view._isBeingEdited = false;
       this.$el.removeClass('mailpoet_highlight');
-    },
+    }
   });
 });

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

@@ -4,65 +4,71 @@
  * Allows resizing elements within a block
  */
 define([
-    'backbone.marionette',
+  'backbone.marionette',
-    'newsletter_editor/behaviors/BehaviorsLookup',
+  'newsletter_editor/behaviors/BehaviorsLookup',
-    'interact'
+  'interact'
-  ], function(Marionette, BehaviorsLookup, interact) {
+], function (Marionette, BehaviorsLookup, interact) {
+  var BL = BehaviorsLookup;
 
-  BehaviorsLookup.ResizableBehavior = Marionette.Behavior.extend({
+  BL.ResizableBehavior = Marionette.Behavior.extend({
     defaults: {
       elementSelector: null,
       resizeHandleSelector: true, // true will use edges of the element itself
-      transformationFunction: function(y) { return y; },
+      transformationFunction: function (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));
+        var newLength = currentLength + this.options.transformationFunction(event.dy);
+        newLength = Math.min(this.options.maxLength, Math.max(this.options.minLength, newLength));
+        this.view.model.set(this.options.modelField, newLength + 'px');
+      }
     },
     events: {
-      "mouseenter": 'showResizeHandle',
+      mouseenter: 'showResizeHandle',
-      "mouseleave": 'hideResizeHandle',
+      mouseleave: 'hideResizeHandle'
     },
-    onRender: function() {
+    onRender: function () {
       this.attachResize();
 
       if (this.isBeingResized !== true) {
         this.hideResizeHandle();
       }
     },
-    attachResize: function() {
+    attachResize: function () {
-      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0),
+      var domElement = (this.options.elementSelector === null) ? this.view.$el.get(0) : this.view.$(this.options.elementSelector).get(0);
-          that = this;
+      var that = this;
       interact(domElement).resizable({
-        //axis: 'y',
+        // axis: 'y',
         edges: {
           top: false,
           left: false,
           right: false,
-          bottom: (typeof this.options.resizeHandleSelector === 'string') ? this.view.$(this.options.resizeHandleSelector).get(0) : this.options.resizeHandleSelector,
+          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 currentLength = parseFloat(that.view.model.get(that.options.modelField)),
+        var onResize = that.options.onResize.bind(that);
-          newLength = currentLength + that.options.transformationFunction(event.dy);
+        return onResize(event);
-
+      })
-        if (newLength < that.options.minLength) newLength = that.options.minLength;
+      .on('resizeend', function () {
-
-        that.view.model.set(that.options.modelField, newLength + 'px');
-      }).on('resizeend', function(event) {
         that.isBeingResized = null;
         that.$el.removeClass('mailpoet_resize_active');
       });
     },
-    showResizeHandle: function() {
+    showResizeHandle: function () {
       if (typeof this.options.resizeHandleSelector === 'string') {
         this.view.$(this.options.resizeHandleSelector).removeClass('mailpoet_hidden');
       }
     },
-    hideResizeHandle: function() {
+    hideResizeHandle: function () {
       if (typeof this.options.resizeHandleSelector === 'string') {
         this.view.$(this.options.resizeHandleSelector).addClass('mailpoet_hidden');
       }
-    },
+    }
   });
 });

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

@@ -4,28 +4,29 @@
  * Opens up settings of a BlockView if contents are clicked upon
  */
 define([
-    'backbone.marionette',
+  'backbone.marionette',
-    'jquery',
+  'jquery',
-    'newsletter_editor/behaviors/BehaviorsLookup',
+  'newsletter_editor/behaviors/BehaviorsLookup'
-  ], function(Marionette, jQuery, BehaviorsLookup) {
+], function (Marionette, jQuery, BehaviorsLookup) {
+  var BL = BehaviorsLookup;
 
-  BehaviorsLookup.ShowSettingsBehavior = Marionette.Behavior.extend({
+  BL.ShowSettingsBehavior = Marionette.Behavior.extend({
     defaults: {
-      ignoreFrom: '', // selector
+      ignoreFrom: '' // selector
     },
     events: {
-      'click .mailpoet_content': 'showSettings',
+      'click .mailpoet_content': 'showSettings'
     },
-    showSettings: function(event) {
+    showSettings: function (event) {
-      if(!this.isIgnoredElement(event.target)) {
+      if (!this.isIgnoredElement(event.target)) {
         this.view.triggerMethod('showSettings');
       }
     },
-    isIgnoredElement: function(element) {
+    isIgnoredElement: function (element) {
       return this.options.ignoreFrom
         && this.options.ignoreFrom.length > 0
         && jQuery(element).is(this.options.ignoreFrom);
-    },
+    }
   });
 });