Skip to content

[Forwardport] Removed mageMenu widget dependency from breadcrumbs component #15178 #15478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2018
Merged

[Forwardport] Removed mageMenu widget dependency from breadcrumbs component #15178 #15478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b1d1b6
Removed mageMenu widget dependency
vovayatsyuk May 12, 2018
fd03f7c
Merge branch '2.3-develop' into 2.3-fix-breadcrumbs-without-mageMenu
vovayatsyuk May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,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();
Expand Down Expand Up @@ -89,14 +72,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': ''
};
},
Expand Down
18 changes: 9 additions & 9 deletions dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ define([
defaultContext = require.s.contexts._,
menuItem = $(
'<li class="level0 category-item">' +
'<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>' +
'<a href="http://localhost.com/cat1.html">Cat1</a>' +
'</li>'
)[0],

Expand Down Expand Up @@ -116,14 +116,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'
}
Expand Down Expand Up @@ -232,7 +232,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'
}
Expand All @@ -243,10 +243,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>'
Expand All @@ -262,14 +262,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();
});
Expand Down