Merge branch 'MAGETWO-71425' of github.com:magento-trigger/magento2ce into MAGETWO-71425

Author: kieuphan2406

app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js

@@ -7,9 +7,15 @@ define([
     'jquery',
     'underscore'
 ], function ($, _) {
+    'use strict';
+
     var ConditionsDataNormalizer = new Class.create();
 
     ConditionsDataNormalizer.prototype = {
+
+        /**
+         * Initializes component.
+         */
         initialize: function () {
             this.patterns = {
                 validate: /^[a-z0-9_-][a-z0-9_-]*(?:\[(?:\d*|[a-z0-9_-]+)\])*$/i,
@@ -46,13 +52,13 @@ define([
          *
          */
         normalize: function normalize(value) {
-            var _this = this;
+            var el, _this = this;
 
             this.pushes = {};
             this.data = {};
 
             _.each(value, function (e, i) {
-                var el = {};
+                el = {};
                 el[i] = e;
 
                 _this._addPair({
@@ -64,20 +70,33 @@ define([
             return this.data;
         },
 
+        /**
+         * @param {Object} base
+         * @param {String} key
+         * @param {String} value
+         * @return {Object}
+         * @private
+         */
         _build: function build(base, key, value) {
             base[key] = value;
 
             return base;
         },
 
+        /**
+         * @param {Object} root
+         * @param {String} value
+         * @return {*}
+         * @private
+         */
         _makeObject: function makeObject(root, value) {
             var keys = root.match(this.patterns.key),
-                k; // nest, nest, ..., nest
+                k, idx; // nest, nest, ..., nest
 
             while ((k = keys.pop()) !== undefined) {
                 // foo[]
                 if (this.patterns.push.test(k)) {
-                    var idx = this._incrementPush(root.replace(/\[\]$/, ''));
+                    idx = this._incrementPush(root.replace(/\[\]$/, ''));
                     value = this._build([], idx, value);
                 } // foo[n]
                 else if (this.patterns.fixed.test(k)) {
@@ -91,6 +110,11 @@ define([
             return value;
         },
 
+        /**
+         * @param {String} key
+         * @return {Number}
+         * @private
+         */
         _incrementPush: function incrementPush(key) {
             if (this.pushes[key] === undefined) {
                 this.pushes[key] = 0;
@@ -99,10 +123,20 @@ define([
             return this.pushes[key]++;
         },
 
+        /**
+         * @param {Object} pair
+         * @return {Object}
+         * @private
+         */
         _addPair: function addPair(pair) {
-            if (!this.patterns.validate.test(pair.name)) return this;
             var obj = this._makeObject(pair.name, pair.value);
+
+            if (!this.patterns.validate.test(pair.name)) {
+                return this;
+            }
+
             this.data = $.extend(true, this.data, obj);
+
             return this;
         }
     };