Skip to content

Commit b3c2779

Browse files
author
Denys Rul
committed
MAGETWO-33932: Add ability to initialize modules by selector
- Remove unnecessary logic
1 parent 06f47a8 commit b3c2779

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

lib/web/mage/apply/main.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ define([
99
], function (_, $, processScripts) {
1010
'use strict';
1111

12-
var dataAttr = 'data-mage-init';
12+
var dataAttr = 'data-mage-init',
13+
nodeSelector = '[' + dataAttr + ']';
1314

1415
/**
1516
* Initializes components assigned to a specfied element via data-* attribute.
@@ -38,17 +39,11 @@ define([
3839
* @returns {Array} An array of elements with 'data-mage-init' attribute.
3940
*/
4041
function getElems() {
41-
var body = document.body,
42-
elems;
42+
var elems;
4343

44-
elems = body.querySelectorAll('[' + dataAttr + ']');
45-
elems = _.toArray(elems);
44+
elems = document.querySelectorAll(nodeSelector);
4645

47-
if (body.hasAttribute(dataAttr)) {
48-
elems.unshift(body);
49-
}
50-
51-
return elems;
46+
return _.toArray(elems);
5247
}
5348

5449
/**

lib/web/mage/apply/scripts.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,19 @@ define([
4848
* @param {String} selector - Selector for the elements.
4949
*/
5050
function processElems(components, selector) {
51-
var setFn,
52-
elems;
51+
var elems,
52+
iterator;
5353

5454
if (selector === '*') {
5555
addVirtual(components);
56-
} else {
57-
elems = document.querySelectorAll(selector);
58-
setFn = setData.bind(null, components);
5956

60-
_.toArray(elems).forEach(setFn);
57+
return;
6158
}
59+
60+
elems = document.querySelectorAll(selector);
61+
iterator = setData.bind(null, components);
62+
63+
_.toArray(elems).forEach(iterator);
6264
}
6365

6466
/**

0 commit comments

Comments
 (0)