Skip to content

Commit 7b1d1b6

Browse files
committed
Removed mageMenu widget dependency
1 parent a24105d commit 7b1d1b6

File tree

2 files changed

+12
-33
lines changed

2 files changed

+12
-33
lines changed

app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ define([
1919
menuContainer: '[data-action="navigation"] > ul'
2020
},
2121

22-
/** @inheritdoc */
23-
_init: function () {
24-
var menu,
25-
originalInit = this._super.bind(this);
26-
27-
// render breadcrumbs after navigation menu is loaded.
28-
menu = $(this.options.menuContainer).data('mageMenu');
29-
30-
if (typeof menu === 'undefined') {
31-
$(this.options.menuContainer).on('menucreate', function () {
32-
originalInit();
33-
});
34-
} else {
35-
this._super();
36-
}
37-
},
38-
3922
/** @inheritdoc */
4023
_render: function () {
4124
this._appendCatalogCrumbs();
@@ -88,14 +71,10 @@ define([
8871
* @private
8972
*/
9073
_getCategoryCrumb: function (menuItem) {
91-
var categoryId = /(\d+)/i.exec(menuItem.attr('id'))[0],
92-
categoryName = menuItem.text(),
93-
categoryUrl = menuItem.attr('href');
94-
9574
return {
96-
'name': 'category' + categoryId,
97-
'label': categoryName,
98-
'link': categoryUrl,
75+
'name': 'category',
76+
'label': menuItem.text(),
77+
'link': menuItem.attr('href'),
9978
'title': ''
10079
};
10180
},

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define([
1818
'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push'])
1919
},
2020
defaultContext = require.s.contexts._,
21-
menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a></li>')[0],
21+
menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html">Cat1</a></li>')[0],
2222

2323
/**
2424
* Create context object.
@@ -112,14 +112,14 @@ define([
112112
});
113113

114114
it('Check _getCategoryCrumb call', function () {
115-
var item = $('<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>');
115+
var item = $('<a href="http://localhost.com/cat1.html">Cat1</a>');
116116

117117
expect(widget).toBeDefined();
118118
expect(widget).toEqual(jasmine.any(Function));
119119
expect(widget.prototype._getCategoryCrumb).toBeDefined();
120120
expect(widget.prototype._getCategoryCrumb(item)).toEqual(jasmine.objectContaining(
121121
{
122-
'name': 'category3',
122+
'name': 'category',
123123
'label': 'Cat1',
124124
'link': 'http://localhost.com/cat1.html'
125125
}
@@ -228,7 +228,7 @@ define([
228228
expect(result.length).toBe(1);
229229
expect(result[0]).toEqual(jasmine.objectContaining(
230230
{
231-
'name': 'category3',
231+
'name': 'category',
232232
'label': 'Cat1',
233233
'link': 'http://localhost.com/cat1.html'
234234
}
@@ -239,10 +239,10 @@ define([
239239
var result,
240240
menuItems = $(
241241
'<li class="level0 nav-1">' +
242-
'<a href="http://localhost.com/cat1.html" id="ui-id-3">cat1</a>' +
242+
'<a href="http://localhost.com/cat1.html">cat1</a>' +
243243
'<ul>' +
244244
'<li class="level1 nav-1-1">' +
245-
'<a href="http://localhost.com/cat1/cat21.html" id="ui-id-9">cat21</a>' +
245+
'<a href="http://localhost.com/cat1/cat21.html">cat21</a>' +
246246
'</li>' +
247247
'</ul>' +
248248
'</li>'
@@ -258,14 +258,14 @@ define([
258258

259259
context = createContext(widget.prototype);
260260
getParentMenuHandler = widget.prototype._getParentMenuItem.bind(context);
261-
result = getParentMenuHandler($('#ui-id-9'));
261+
result = getParentMenuHandler($('[href="http://localhost.com/cat1/cat21.html"]'));
262262

263263
expect(result).toBeDefined();
264264
expect(result.length).toBe(1);
265265
expect(result[0].tagName.toLowerCase()).toEqual('a');
266-
expect(result.attr('id')).toEqual('ui-id-3');
266+
expect(result.attr('href')).toEqual('http://localhost.com/cat1.html');
267267

268-
result = getParentMenuHandler($('#ui-id-3'));
268+
result = getParentMenuHandler($('[href="http://localhost.com/cat1.html"]'));
269269

270270
expect(result).toBeNull();
271271
});

0 commit comments

Comments
 (0)