Removed mageMenu widget dependency

gelanivishal · May 24, 2018 · 7b1d1b6 · 7b1d1b6
1 parent a24105d
commit 7b1d1b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 33 deletions.
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
@@ -19,23 +19,6 @@ define([
                 menuContainer: '[data-action="navigation"] > ul'
             },
 
-            /** @inheritdoc */
-            _init: function () {
-                var menu,
-                    originalInit = this._super.bind(this);
-
-                // render breadcrumbs after navigation menu is loaded.
-                menu = $(this.options.menuContainer).data('mageMenu');
-
-                if (typeof menu === 'undefined') {
-                    $(this.options.menuContainer).on('menucreate', function () {
-                        originalInit();
-                    });
-                } else {
-                    this._super();
-                }
-            },
-
             /** @inheritdoc */
             _render: function () {
                 this._appendCatalogCrumbs();
@@ -88,14 +71,10 @@ define([
              * @private
              */
             _getCategoryCrumb: function (menuItem) {
-                var categoryId = /(\d+)/i.exec(menuItem.attr('id'))[0],
-                    categoryName = menuItem.text(),
-                    categoryUrl = menuItem.attr('href');
-
                 return {
-                    'name': 'category' + categoryId,
-                    'label': categoryName,
-                    'link': categoryUrl,
+                    'name': 'category',
+                    'label': menuItem.text(),
+                    'link': menuItem.attr('href'),
                     'title': ''
                 };
             },

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
@@ -18,7 +18,7 @@ define([
             'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push'])
         },
         defaultContext = require.s.contexts._,
-        menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a></li>')[0],
+        menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html">Cat1</a></li>')[0],
 
         /**
          * Create context object.
@@ -112,14 +112,14 @@ define([
             });
 
             it('Check _getCategoryCrumb call', function () {
-                var item = $('<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>');
+                var item = $('<a href="http://localhost.com/cat1.html">Cat1</a>');
 
                 expect(widget).toBeDefined();
                 expect(widget).toEqual(jasmine.any(Function));
                 expect(widget.prototype._getCategoryCrumb).toBeDefined();
                 expect(widget.prototype._getCategoryCrumb(item)).toEqual(jasmine.objectContaining(
                     {
-                        'name': 'category3',
+                        'name': 'category',
                         'label': 'Cat1',
                         'link': 'http://localhost.com/cat1.html'
                     }
@@ -228,7 +228,7 @@ define([
                 expect(result.length).toBe(1);
                 expect(result[0]).toEqual(jasmine.objectContaining(
                     {
-                        'name': 'category3',
+                        'name': 'category',
                         'label': 'Cat1',
                         'link': 'http://localhost.com/cat1.html'
                     }
@@ -239,10 +239,10 @@ define([
                 var result,
                     menuItems = $(
                         '<li class="level0 nav-1">' +
-                            '<a href="http://localhost.com/cat1.html" id="ui-id-3">cat1</a>' +
+                            '<a href="http://localhost.com/cat1.html">cat1</a>' +
                             '<ul>' +
                                 '<li class="level1 nav-1-1">' +
-                                    '<a href="http://localhost.com/cat1/cat21.html" id="ui-id-9">cat21</a>' +
+                                    '<a href="http://localhost.com/cat1/cat21.html">cat21</a>' +
                                 '</li>' +
                             '</ul>' +
                         '</li>'
@@ -258,14 +258,14 @@ define([
 
                 context = createContext(widget.prototype);
                 getParentMenuHandler = widget.prototype._getParentMenuItem.bind(context);
-                result = getParentMenuHandler($('#ui-id-9'));
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1/cat21.html"]'));
 
                 expect(result).toBeDefined();
                 expect(result.length).toBe(1);
                 expect(result[0].tagName.toLowerCase()).toEqual('a');
-                expect(result.attr('id')).toEqual('ui-id-3');
+                expect(result.attr('href')).toEqual('http://localhost.com/cat1.html');
 
-                result = getParentMenuHandler($('#ui-id-3'));
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1.html"]'));
 
                 expect(result).toBeNull();
             });