MAGETWO-49796: Catalog top nav, CSS class not set to active when using Varnish

 - fix code style errors

Author: NadiyaS

lib/web/mage/menu.js

@@ -134,34 +134,35 @@ define([
          * If menu item has parent categories, sets 'has-active' class to all af them.
          *
          * @param {String} url - possible category URL
-         * @returns {boolean} - true if active category was founded by provided URL, otherwise return false
+         * @returns {Boolean} - true if active category was founded by provided URL, otherwise return false
          * @private
          */
         _setActiveMenuForCategory: function (url) {
             var activeCategoryLink = this.element.find('a[href="' + url + '"]'),
                 classes,
                 classNav;
 
-            if (activeCategoryLink && activeCategoryLink.hasClass('ui-corner-all')) {
+            if (!activeCategoryLink || !activeCategoryLink.hasClass('ui-corner-all')) {
 
-                if (!activeCategoryLink.parent().hasClass('active')) {
-                    activeCategoryLink.parent().addClass('active');
-                    classes = activeCategoryLink.parent().attr('class');
-                    classNav = classes.match(/(nav\-)[0-9]+(\-[0-9]+)+/gi);
+                //category was not found by provided URL
+                return false;
+            } else if (!activeCategoryLink.parent().hasClass('active')) {
+                activeCategoryLink.parent().addClass('active');
+                classes = activeCategoryLink.parent().attr('class');
+                classNav = classes.match(/(nav\-)[0-9]+(\-[0-9]+)+/gi);
 
-                    if (classNav) {
-                        this._setActiveParent(classNav[0]);
-                    }
+                if (classNav) {
+                    this._setActiveParent(classNav[0]);
                 }
-                return true;
             }
-            return false;
+
+            return true;
         },
 
         /**
          * Sets 'has-active' CSS class to all parent categories which have part of provided class in childClassName
          *
-         * @example:
+         * @example
          *  childClassName - 'nav-1-2-3'
          *  CSS class 'has-active' will be added to categories have 'nav-1-2' and 'nav-1' classes
          *
@@ -187,7 +188,7 @@ define([
          * Tries to retrieve category URL from current URL and mark this category as active
          * @see _setActiveMenuForCategory(url)
          *
-         * @example:
+         * @example
          *  currentUrl - http://magento.com/category1/category12/product.html,
          *  category URLs has extensions .phtml - http://magento.com/category1.phtml
          *  method sets active category which has URL http://magento.com/category1/category12.phtml