Skip to content

Commit 55b9238

Browse files
vsn4ikvsn4ik
committed
Remove for-of
1 parent 1c0b0ab commit 55b9238

7 files changed

+23
-83
lines changed

‎dist/js/bootstrap-submenu.js

+6-35
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,9 @@
2727
$(this.element).off('keydown.bs.dropdown.data-api');
2828
this.menuElement.addEventListener('keydown', this.itemKeydown.bind(this));
2929
var dropdownItemNodeList = this.menuElement.querySelectorAll('.dropdown-item');
30-
31-
for (var _iterator = dropdownItemNodeList, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
32-
var _ref;
33-
34-
if (_isArray) {
35-
if (_i >= _iterator.length) break;
36-
_ref = _iterator[_i++];
37-
} else {
38-
_i = _iterator.next();
39-
if (_i.done) break;
40-
_ref = _i.value;
41-
}
42-
43-
var element = _ref;
44-
element.addEventListener('keydown', this.handleKeydownDropdownItem.bind(this));
45-
}
46-
30+
Array.from(dropdownItemNodeList).forEach(function (element) {
31+
element.addEventListener('keydown', _this.handleKeydownDropdownItem.bind(_this));
32+
});
4733
$(this.menuElement).on('keydown', '.dropdown-submenu > .dropdown-item', this.handleKeydownSubmenuDropdownItem.bind(this));
4834
$(this.menuElement).on('click', '.dropdown-submenu > .dropdown-item', this.handleClickSubmenuDropdownItem.bind(this));
4935
$(this.element).on('hidden.bs.dropdown', function () {
@@ -87,9 +73,7 @@
8773
event.preventDefault();
8874
event.stopPropagation();
8975
var itemNodeList = this.element.querySelectorAll('.show > .dropdown-item:not(:disabled):not(.disabled), .show > .dropdown > .dropdown-item');
90-
var index = Array.from(itemNodeList).findIndex(function (element) {
91-
return element === event.target;
92-
});
76+
var index = Array.from(itemNodeList).indexOf(event.target);
9377

9478
if (event.keyCode === 38 && index !== 0) {
9579
index--;
@@ -113,22 +97,9 @@
11397

11498
_proto.close = function close(menuElement) {
11599
var menuNodeList = menuElement.querySelectorAll('.dropdown-menu.show');
116-
117-
for (var _iterator2 = menuNodeList, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
118-
var _ref2;
119-
120-
if (_isArray2) {
121-
if (_i2 >= _iterator2.length) break;
122-
_ref2 = _iterator2[_i2++];
123-
} else {
124-
_i2 = _iterator2.next();
125-
if (_i2.done) break;
126-
_ref2 = _i2.value;
127-
}
128-
129-
var element = _ref2;
100+
Array.from(menuNodeList).forEach(function (element) {
130101
element.classList.remove('show');
131-
}
102+
});
132103
};
133104

134105
return DropdownSubmenu;

‎dist/js/bootstrap-submenu.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ cdn:
2525
js: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.js"
2626

2727
fa:
28-
css: "https://use.fontawesome.com/releases/v5.0.13/css/all.css"
28+
css: "https://use.fontawesome.com/releases/v5.1.0/css/all.css"

‎docs/dist/js/bootstrap-submenu.js

+6-35
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,9 @@
2727
$(this.element).off('keydown.bs.dropdown.data-api');
2828
this.menuElement.addEventListener('keydown', this.itemKeydown.bind(this));
2929
var dropdownItemNodeList = this.menuElement.querySelectorAll('.dropdown-item');
30-
31-
for (var _iterator = dropdownItemNodeList, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
32-
var _ref;
33-
34-
if (_isArray) {
35-
if (_i >= _iterator.length) break;
36-
_ref = _iterator[_i++];
37-
} else {
38-
_i = _iterator.next();
39-
if (_i.done) break;
40-
_ref = _i.value;
41-
}
42-
43-
var element = _ref;
44-
element.addEventListener('keydown', this.handleKeydownDropdownItem.bind(this));
45-
}
46-
30+
Array.from(dropdownItemNodeList).forEach(function (element) {
31+
element.addEventListener('keydown', _this.handleKeydownDropdownItem.bind(_this));
32+
});
4733
$(this.menuElement).on('keydown', '.dropdown-submenu > .dropdown-item', this.handleKeydownSubmenuDropdownItem.bind(this));
4834
$(this.menuElement).on('click', '.dropdown-submenu > .dropdown-item', this.handleClickSubmenuDropdownItem.bind(this));
4935
$(this.element).on('hidden.bs.dropdown', function () {
@@ -87,9 +73,7 @@
8773
event.preventDefault();
8874
event.stopPropagation();
8975
var itemNodeList = this.element.querySelectorAll('.show > .dropdown-item:not(:disabled):not(.disabled), .show > .dropdown > .dropdown-item');
90-
var index = Array.from(itemNodeList).findIndex(function (element) {
91-
return element === event.target;
92-
});
76+
var index = Array.from(itemNodeList).indexOf(event.target);
9377

9478
if (event.keyCode === 38 && index !== 0) {
9579
index--;
@@ -113,22 +97,9 @@
11397

11498
_proto.close = function close(menuElement) {
11599
var menuNodeList = menuElement.querySelectorAll('.dropdown-menu.show');
116-
117-
for (var _iterator2 = menuNodeList, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
118-
var _ref2;
119-
120-
if (_isArray2) {
121-
if (_i2 >= _iterator2.length) break;
122-
_ref2 = _iterator2[_i2++];
123-
} else {
124-
_i2 = _iterator2.next();
125-
if (_i2.done) break;
126-
_ref2 = _i2.value;
127-
}
128-
129-
var element = _ref2;
100+
Array.from(menuNodeList).forEach(function (element) {
130101
element.classList.remove('show');
131-
}
102+
});
132103
};
133104

134105
return DropdownSubmenu;

‎docs/dist/js/bootstrap-submenu.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/bootstrap-submenu.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
const dropdownItemNodeList = this.menuElement.querySelectorAll('.dropdown-item');
2727

28-
for (const element of dropdownItemNodeList) {
28+
Array.from(dropdownItemNodeList).forEach((element) => {
2929
element.addEventListener('keydown', this.handleKeydownDropdownItem.bind(this));
30-
}
30+
});
3131

3232
$(this.menuElement).on('keydown', '.dropdown-submenu > .dropdown-item', this.handleKeydownSubmenuDropdownItem.bind(this));
3333
$(this.menuElement).on('click', '.dropdown-submenu > .dropdown-item', this.handleClickSubmenuDropdownItem.bind(this));
@@ -77,9 +77,7 @@
7777

7878
const itemNodeList = this.element.querySelectorAll('.show > .dropdown-item:not(:disabled):not(.disabled), .show > .dropdown > .dropdown-item');
7979

80-
let index = Array.from(itemNodeList).findIndex((element) => {
81-
return element === event.target;
82-
});
80+
let index = Array.from(itemNodeList).indexOf(event.target);
8381

8482
if (event.keyCode === 38 && index !== 0) {
8583
index--;
@@ -106,9 +104,9 @@
106104
close(menuElement) {
107105
const menuNodeList = menuElement.querySelectorAll('.dropdown-menu.show');
108106

109-
for (const element of menuNodeList) {
107+
Array.from(menuNodeList).forEach((element) => {
110108
element.classList.remove('show');
111-
}
109+
});
112110
}
113111
}
114112

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"release-zip": "cd dist/ && zip -r9 $npm_package_name-$npm_package_version-dist.zip * && mv $npm_package_name-$npm_package_version-dist.zip .."
3333
},
3434
"devDependencies": {
35-
"@babel/cli": "7.0.0-beta.51",
36-
"@babel/core": "7.0.0-beta.51",
37-
"@babel/preset-env": "7.0.0-beta.51",
35+
"@babel/cli": "7.0.0-beta.52",
36+
"@babel/core": "7.0.0-beta.52",
37+
"@babel/preset-env": "7.0.0-beta.52",
3838
"clean-css-cli": "4.1.11",
3939
"uglify-js": "3.4.1"
4040
}

0 commit comments

Comments
 (0)