siteUtils => getFolders; Use for() instead of forEach()

Auditors: @NejcZdovc
brave · Jul 11, 2017 · 8d2f527 · 8d2f527
1 parent 21e2b13
commit 8d2f527
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/js/state/siteUtil.js b/js/state/siteUtil.js
@@ -752,26 +752,30 @@ module.exports.getFolder = function (sites, folderId) {
 module.exports.getFolders = function (sites, folderId, parentId, labelPrefix) {
   parentId = parentId || 0
   let folders = []
-  sites
+  const results = sites
     .filter(site => {
       return (site.get('parentFolderId', 0) === parentId && module.exports.isFolder(site))
     })
     .toList()
     .sort(module.exports.siteSort)
-    .forEach((site) => {
-      if (site.get('folderId') === folderId) {
-        return
-      }
 
-      const label = (labelPrefix || '') + (site.get('customTitle') || site.get('title'))
-      folders.push({
-        folderId: site.get('folderId'),
-        parentFolderId: site.get('parentFolderId'),
-        label
-      })
-      const subsites = module.exports.getFolders(sites, folderId, site.get('folderId'), (label || '') + ' / ')
-      folders = folders.concat(subsites)
+  const resultSize = results.size
+  for (let i = 0; i < resultSize; i++) {
+    const site = results.get(i)
+    if (site.get('folderId') === folderId) {
+      continue
+    }
+
+    const label = (labelPrefix || '') + (site.get('customTitle') || site.get('title'))
+    folders.push({
+      folderId: site.get('folderId'),
+      parentFolderId: site.get('parentFolderId'),
+      label
     })
+    const subsites = module.exports.getFolders(sites, folderId, site.get('folderId'), (label || '') + ' / ')
+    folders = folders.concat(subsites)
+  }
+
   return folders
 }