Merge remote-tracking branch 'origin/MAGETWO-44563' into PR

Author: Volodymyr Zaets

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

@@ -2,6 +2,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'underscore',
     'mageUtils',
@@ -13,11 +14,11 @@ define([
      * @constructor
      */
     function Events(storage) {
-        this.id = 0,
+        this.id = 0;
 
-        this.requests   = new Map();
-        this.map        = {};
-        this.storage    = storage;
+        this.requests = new Map();
+        this.map = {};
+        this.storage = storage;
 
         _.bindAll(this, '_resolve', '_clear');
     }
@@ -28,7 +29,7 @@ define([
         /**
          * Tries to resolve dependencies affected by the scpecified element.
          * @param {String} elem - Elements' name.
-         * @returns {events} Chainable.
+         * @returns {Object} Chainable.
          */
         resolve: function (elem) {
             var pending = this.map[elem];
@@ -44,17 +45,16 @@ define([
 
         /**
          * Creates a new request for the specified set
-                of elements in case some of them wasn't registered yeat.
-                Otherwise triggers callback immediately.
+         *      of elements in case some of them wasn't registered yeat.
+         *      Otherwise triggers callback immediately.
          * @param {Array} elems - Requested elements.
-         * @param {Function} callback -
-                Callback that will be triggered as soon as
-                all of the elements will be registered.
+         * @param {Object} callback - that will be triggered as soon as
+         *      all of the elements will be registered.
          * @returns {events} Chainable.
          */
         wait: function (elems, callback) {
             var storage = this.storage,
-                map     = this.map;
+                map = this.map;
 
             if (storage.has(elems)) {
                 return callback.apply(null, storage.get(elems));
@@ -79,9 +79,9 @@ define([
          * @returns {Boolean} Whether specified request was successfully resolved.
          */
         _resolve: function (id) {
-            var request     = this.requests.get(id),
-                elems       = request.deps,
-                storage     = this.storage,
+            var request = this.requests.get(id),
+                elems = request.deps,
+                storage = this.storage,
                 isResolved;
 
             isResolved = storage.has(elems);
@@ -99,8 +99,8 @@ define([
          * @param {Number} id - Id of request.
          */
         _clear: function (id) {
-            var map     = this.map,
-                elems   = this.requests.get(id).deps;
+            var map = this.map,
+                elems = this.requests.get(id).deps;
 
             elems.forEach(function (elem) {
                 utils.remove(map[elem], id);

lib/web/mage/utils/compare.js

@@ -66,7 +66,8 @@ define([
     }
 
     /**
-     *
+     * @param {String} prefix
+     * @param {String} part
      */
     function getPath(prefix, part) {
         return prefix ? prefix + '.' + part : part;
@@ -84,7 +85,7 @@ define([
     }
 
     /**
-     *
+     * @param {Array} changes
      */
     function getContainers(changes) {
         var containers  = {},
@@ -108,7 +109,11 @@ define([
     }
 
     /**
-     *
+     * @param {String} path
+     * @param {String} name
+     * @param {String} type
+     * @param {String} newValue
+     * @param {String} oldValue
      */
     function addChange(path, name, type, newValue, oldValue) {
         var data;
@@ -130,7 +135,11 @@ define([
     }
 
     /**
-     *
+     * @param {String} ns
+     * @param {String} name
+     * @param {String} type
+     * @param {String} iterator
+     * @param {String} placeholder
      */
     function setAll(ns, name, type, iterator, placeholder) {
         var key;
@@ -156,7 +165,10 @@ define([
 
     /*eslint-disable max-depth*/
     /**
-     *
+     * @param {Object} old
+     * @param {Object} current
+     * @param {String} ns
+     * @param {String} name
      */
     function compare(old, current, ns, name) {
         var key,

package.json

@@ -21,9 +21,9 @@
         "grunt-contrib-jasmine": "^0.8.1",
         "grunt-contrib-less": "^0.12.0",
         "grunt-contrib-watch": "^0.6.1",
-        "grunt-eslint": "^17.0.0",
+        "grunt-eslint": "17.3.1",
         "grunt-exec": "^0.4.6",
-        "grunt-jscs": "^2.1.0",
+        "grunt-jscs": "2.2.0",
         "grunt-replace": "^0.9.2",
         "grunt-styledocco": "^0.1.4",
         "grunt-template-jasmine-requirejs": "^0.2.3",