Merge pull request #113 from ilyabirman/issue-112

[#112] Ошибка в ИЕ11
NikolayRys · Dec 28, 2016 · 90001ab · 90001ab
2 parents 53be731 + 3e21032
commit 90001ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/source/dom.js b/source/dom.js
@@ -76,7 +76,7 @@ export const find = (selector, node) => (node || document).querySelector(selecto
  * @param {Node} [node]
  * @returns {Node[]}
  */
-export const findAll = (selector, node) => [...(node || document).querySelectorAll(selector)];
+export const findAll = (selector, node) => Array.prototype.slice.call((node || document).querySelectorAll(selector));
 /**
  * Open the popup
  *

diff --git a/source/utils.js b/source/utils.js
@@ -23,17 +23,17 @@ export const each = (object, callback) => {
 export const toArray = (arrayLike) => Array.prototype.slice.call(arrayLike);
 
 /**
- * Merge given dictionaries (objects) into one object
+ * Merge given dictionaries (objects) into one object.
+ * Iterates across the arguments.
  *
- * @param {...Object} object
  * @returns {Object}
  */
-export const merge = (...args) => { // eslint-disable-line no-unused-vars
+export const merge = function () {
     const result = {};
-    const argsArr = [...args];
+    const args = Array.prototype.slice.call(arguments); // eslint-disable-line no-undef
 
-    for (let i = 0; i < argsArr.length; i++) {
-        const arg = argsArr[i];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
 
         if (arg) {
             for (const key in arg) {