Merge remote-tracking branch 'origin/develop' into develop

candela97 · Aug 4, 2019 · d4ac943 · d4ac943
2 parents 9dd4a59 + 8ffdfea
commit d4ac943
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/background/background.js b/js/background/background.js
@@ -421,8 +421,8 @@ class SteamCommunity extends Api {
             result = await SteamCommunity.getEndpoint(`/inventory/${login.steamId}/753/${contextId}`, thisParams);
             if (result && result.success) {
                 if (!data) data = { "assets": [], "descriptions": [] };
-                data.assets = data.assets.concat(result.assets);
-                data.descriptions = data.descriptions.concat(result.descriptions);
+                if (result.assets) data.assets = data.assets.concat(result.assets);
+                if (result.descriptions) data.descriptions = data.descriptions.concat();
             }
             last_assetid = result.last_assetid;
         } while (result.more_items);

diff --git a/js/content/store.js b/js/content/store.js
@@ -32,7 +32,7 @@ class Customizer {
         let elements;
 
         if (typeof targets === "string") {
-            elements = document.querySelectorAll(targets);
+            elements = Array.from(document.querySelectorAll(targets));
         } else if (targets instanceof NodeList) {
             elements = Array.from(targets);
         } else {