MAGETWO-67341: Merge branch 'MAGETWO-67342' of github.com:magento-fol…

…ks/magento2ce into MAGETWO-67341-PR-9062

Conflicts:
	package.json.sample

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -239,7 +239,6 @@ define([
 
         switch (optionType) {
             case 'radio':
-
             case 'select-one':
 
                 if (optionType === 'radio' && !element.is(':checked')) {

app/code/Magento/Catalog/view/base/web/js/price-box.js

@@ -38,9 +38,9 @@ define([
          * Widget creating.
          */
         _create: function createPriceBox() {
-            this.cache = {};
             var box = this.element;
 
+            this.cache = {};
             this._setDefaultsFromPriceConfig();
             this._setDefaultsFromDataSet();
 

app/code/Magento/Catalog/view/base/web/js/price-options.js

@@ -43,7 +43,6 @@ define([
 
         switch (optionType) {
             case 'text':
-
             case 'textarea':
                 changes[optionHash] = optionValue ? optionConfig.prices : {};
                 break;

app/code/Magento/Dhl/view/frontend/web/js/model/shipping-rates-validator.js

@@ -32,7 +32,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/Fedex/view/frontend/web/js/model/shipping-rates-validator.js

@@ -32,7 +32,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/OfflineShipping/view/frontend/web/js/model/shipping-rates-validator/flatrate.js

@@ -31,7 +31,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/OfflineShipping/view/frontend/web/js/model/shipping-rates-validator/freeshipping.js

@@ -31,7 +31,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/OfflineShipping/view/frontend/web/js/model/shipping-rates-validator/tablerate.js

@@ -38,7 +38,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

@@ -41,9 +41,11 @@ define([
          * @param {jQuery} element - Comment holder
          */
         (function lookup(element) {
+            var iframeHostName;
+
             // prevent cross origin iframe content reading
             if ($(element).prop('tagName') === 'IFRAME') {
-                var iframeHostName = $('<a>').prop('href', $(element).prop('src'))
+                iframeHostName = $('<a>').prop('href', $(element).prop('src'))
                                              .prop('hostname');
 
                 if (window.location.hostname !== iframeHostName) {

app/code/Magento/Theme/view/frontend/web/menu.js

@@ -157,7 +157,7 @@ define([
         //mainNav();
 
         //run navigation with delays
-        mainNav('nav', {
+        window.mainNav('nav', {
             'show_delay': '100',
             'hide_delay': '100'
         });

app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js

@@ -118,7 +118,7 @@ define([
                 component: node.component
             });
             loaded.resolve(node, constr);
-        }, function (err) {
+        }, function () {
             consoleLogger.error('componentLoadingFail', {
                 component: node.component
             });

app/code/Magento/Ui/view/base/web/js/form/components/button.js

@@ -10,8 +10,9 @@ define([
     'uiElement',
     'uiRegistry',
     'uiLayout',
-    'mageUtils'
-], function (Element, registry, layout, utils) {
+    'mageUtils',
+    'underscore'
+], function (Element, registry, layout, utils, _) {
     'use strict';
 
     return Element.extend({

app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js

@@ -3,8 +3,9 @@
  * See COPYING.txt for license details.
  */
 define([
-    './column'
-], function (Column) {
+    './column',
+    'underscore'
+], function (Column, _) {
     'use strict';
 
     return Column.extend({
@@ -78,14 +79,14 @@ define([
         flatOptions: function (options) {
             var self = this;
 
-            return options.reduce(function (options, option) {
+            return options.reduce(function (opts, option) {
                 if (_.isArray(option.value)) {
-                    options = options.concat(self.flatOptions(option.value));
+                    opts = opts.concat(self.flatOptions(option.value));
                 } else {
-                    options.push(option);
+                    opts.push(option);
                 }
 
-                return options;
+                return opts;
             }, []);
         },
 

app/code/Magento/Ui/view/base/web/js/grid/columns/select.js

@@ -13,8 +13,6 @@ define([
     'use strict';
 
     return Column.extend({
-
-        /*eslint-disable eqeqeq*/
         /**
          * Retrieves label associated with a provided value.
          *
@@ -57,17 +55,15 @@ define([
         flatOptions: function (options) {
             var self = this;
 
-            return options.reduce(function (options, option) {
+            return options.reduce(function (opts, option) {
                 if (_.isArray(option.value)) {
-                    options = options.concat(self.flatOptions(option.value));
+                    opts = opts.concat(self.flatOptions(option.value));
                 } else {
-                    options.push(option);
+                    opts.push(option);
                 }
 
-                return options;
+                return opts;
             }, []);
         }
-
-        /*eslint-enable eqeqeq*/
     });
 });

app/code/Magento/Ui/view/base/web/js/lib/core/events.js

@@ -2,6 +2,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* global WeakMap, Map*/
 define([
     'ko',
     'underscore',
@@ -34,7 +36,7 @@ define([
      *
      * @param {Object} obj - Key in the events weakmap.
      * @param {String} ns - Callback namespace.
-     * @param {Fucntion} callback - Event callback.
+     * @param {Function} callback - Event callback.
      * @param {String} name - Name of the event.
      */
     function addHandler(obj, ns, callback, name) {
@@ -96,6 +98,7 @@ define([
          * Calls callback when name event is triggered.
          * @param  {String}   events
          * @param  {Function} callback
+         * @param  {Function} ns
          * @return {Object} reference to this
          */
         on: function (events, callback, ns) {

app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/* global WeakMap */
 define([
     'ko',
     'underscore',
@@ -87,6 +88,7 @@ define([
      * Returns node's first sibling of 'element' type within the common component scope
      *
      * @param {HTMLElement} node
+     * @param {*} data
      * @returns {HTMLElement}
      */
     function getElement(node, data) {
@@ -111,6 +113,8 @@ define([
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'applyBindings' method.
+         * @param {Object} ctx
+         * @param {HTMLElement} node - Original 'applyBindings' method.
          */
         applyBindings: function (orig, ctx, node) {
             var result = orig(),
@@ -136,6 +140,7 @@ define([
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'cleanNode' method.
+         * @param {HTMLElement} node - Original 'cleanNode' method.
          */
         cleanNode: function (orig, node) {
             var result = orig(),

app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js

@@ -66,7 +66,7 @@ define([
                         component: bindingContext.$data.name
                     });
                     source.nodes(rendered);
-                }).fail(function (err) {
+                }).fail(function () {
                     consoleLogger.error('templateLoadingFail', {
                         template: templateId,
                         component: bindingContext.$data.name

app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js

@@ -34,11 +34,11 @@ define([], function () {
             promise.state() === 'pending' ?
                 this.logger[levels.failed](messages.failed, config.data) :
                 this.logger[levels.loaded](messages.loaded, config.data);
-        }.bind(this), wait)
+        }.bind(this), wait);
     };
 
     /**
-     * Method that creats object of messages
+     * Method that creates object of messages
      * @param {String} requested - log message that showing that request for class is started
      * @param {String} loaded - log message that show when requested class is loaded
      * @param {String} failded - log message that show when requested class is failed
@@ -49,11 +49,11 @@ define([], function () {
             requested: requested || '',
             loaded: loaded || '',
             failed: failded || ''
-        }
+        };
     };
 
     /**
-     * Method that creats object of log levels
+     * Method that creates object of log levels
      * @param {String} requested - log message that showing that request for class is started
      * @param {String} loaded - log message that show when requested class is loaded
      * @param {String} failded - log message that show when requested class is failed
@@ -64,7 +64,7 @@ define([], function () {
             requested: requested || 'info',
             loaded: loaded || 'info',
             failed: failded || 'warn'
-        }
+        };
     };
 
     return LogUtils;

app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js

@@ -6,6 +6,7 @@
 /**
  * @api
  */
+/* global WeakMap */
 define([
     'jquery',
     'underscore',

app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/* global WeakMap */
 define([
     'es6-collections'
 ], function () {

app/code/Magento/Ups/view/frontend/web/js/model/shipping-rates-validator.js

@@ -31,7 +31,7 @@ define([
                 }
             });
 
-            return !Boolean(this.validationErrors.length);
+            return !this.validationErrors.length;
         }
     };
 });

app/code/Magento/Usps/view/frontend/web/js/model/shipping-rates-validator.js

@@ -33,7 +33,7 @@ define([
                 }
             });
 
-            if (!Boolean(this.validationErrors.length)) {
+            if (!this.validationErrors.length) {
                 if (address['country_id'] == checkoutConfig.originCountryCode) { //eslint-disable-line eqeqeq
                     return !utils.isEmpty(address.postcode);
                 }

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/* eslint-disable max-nested-callbacks */
 define([
     'Magento_Ui/js/grid/columns/expandable'
 ], function (Expandable) {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/logger/logger.test.js

@@ -138,7 +138,7 @@ define([
             it('removes previously applied filter criteria', function () {
                 var logger = createLogger(),
                     criteria = function () {
-                        return false
+                        return false;
                     };
 
                 spyOn(entryHandler, 'show');

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/* eslint-disable max-nested-callbacks */
 define([
     'Magento_Ui/js/timeline/timeline'
 ], function (Timeline) {

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-magento

@@ -8,7 +8,6 @@
         "node": true
     },
     "rules": {
-        "consistent-return": 2,
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
         "lines-around-comment": [
@@ -74,7 +73,7 @@
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": 2,
-        "strict": 2,
+        "strict": ["error", "function"],
         "use-isnan": 2,
         "valid-typeof": 2,
         "vars-on-top": 2

dev/tools/grunt/tasks/static.js

@@ -20,13 +20,15 @@ module.exports = function (grunt) {
         var currentTarget = target || 'test',
             file = grunt.option('file'),
             tasks = [
+                'continue:on',
                 'eslint:' + currentTarget,
-                'jscs:' + currentTarget
+                'jscs:' + currentTarget,
+                'continue:off',
+                'continue:fail-on-warning'
             ];
 
         setConfig('eslint', currentTarget, cvf.getFiles(file));
         setConfig('jscs', currentTarget, cvf.getFiles(file));
-        grunt.option('force', true);
         grunt.task.run(tasks);
 
         if (!grunt.option('file')) {